Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/vm/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ def load_command_table(self, _):
g.custom_command('enable', 'enable_boot_diagnostics')
g.custom_command('get-boot-log', 'get_boot_log')

with self.command_group('vm diagnostics', compute_vm_sdk) as g:
with self.command_group('vm diagnostics') as g:
g.custom_command('set', 'set_diagnostics_extension')
g.custom_command('get-default-config', 'show_default_diagnostics_configuration')

Expand Down
28 changes: 14 additions & 14 deletions src/azure-cli/azure/cli/command_modules/vm/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -2291,30 +2291,30 @@ def get_boot_log(cmd, resource_group_name, vm_name):


# region VirtualMachines Diagnostics
def set_diagnostics_extension(
cmd, resource_group_name, vm_name, settings, protected_settings=None, version=None,
no_auto_upgrade=False):
client = _compute_client_factory(cmd.cli_ctx)
vm = client.virtual_machines.get(resource_group_name, vm_name, expand='instanceView')
# pylint: disable=no-member
is_linux_os = _is_linux_os(vm)
def set_diagnostics_extension(cmd, resource_group_name, vm_name, settings, protected_settings=None, version=None,
no_auto_upgrade=False):
from .aaz.latest.vm.extension import Delete as VmExtensionDelete
vm = get_instance_view(cmd, resource_group_name, vm_name)
is_linux_os = _is_linux_os_aaz(vm)
vm_extension_name = _LINUX_DIAG_EXT if is_linux_os else _WINDOWS_DIAG_EXT
if is_linux_os: # check incompatible version
exts = vm.instance_view.extensions or []
exts = vm.get('instanceView', {}).get('extensions', [])
major_ver = extension_mappings[_LINUX_DIAG_EXT]['version'].split('.', maxsplit=1)[0]
if next((e for e in exts if e.name == vm_extension_name and
not e.type_handler_version.startswith(major_ver + '.')), None):
if next((e for e in exts if e.get('name') == vm_extension_name and
not e.get('typeHandlerVersion', '').startswith(major_ver + '.')), None):
logger.warning('There is an incompatible version of diagnostics extension installed. '
'We will update it with a new version')
poller = client.virtual_machine_extensions.begin_delete(resource_group_name, vm_name, vm_extension_name)
poller = VmExtensionDelete(cli_ctx=cmd.cli_ctx)(command_args={
'resource_group': resource_group_name,
'vm_extension_name': vm_extension_name,
'vm_name': vm_name
})
LongRunningOperation(cmd.cli_ctx)(poller)

return set_extension(cmd, resource_group_name, vm_name, vm_extension_name,
extension_mappings[vm_extension_name]['publisher'],
version or extension_mappings[vm_extension_name]['version'],
settings,
protected_settings,
no_auto_upgrade)
settings, protected_settings, no_auto_upgrade)


def show_default_diagnostics_configuration(is_windows_os=False):
Expand Down
Loading