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 @@ -431,7 +431,7 @@ def load_command_table(self, _):
from .operations.vmss_vms import VMSSGetResiliencyView
self.command_table['vmss get-resiliency-view'] = VMSSGetResiliencyView(loader=self)

with self.command_group('vmss diagnostics', compute_vmss_sdk) as g:
with self.command_group('vmss diagnostics') as g:
g.custom_command('set', 'set_vmss_diagnostics_extension')
g.custom_command('get-default-config', 'show_default_diagnostics_configuration')

Expand Down
18 changes: 8 additions & 10 deletions src/azure-cli/azure/cli/command_modules/vm/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -5104,16 +5104,15 @@ def _output(self, *args, **kwargs):


# region VirtualMachineScaleSets Diagnostics
def set_vmss_diagnostics_extension(
cmd, resource_group_name, vmss_name, settings, protected_settings=None, version=None,
no_auto_upgrade=False):
client = _compute_client_factory(cmd.cli_ctx)
vmss = client.virtual_machine_scale_sets.get(resource_group_name, vmss_name)
def set_vmss_diagnostics_extension(cmd, resource_group_name, vmss_name, settings, protected_settings=None,
version=None, no_auto_upgrade=False):
from ._vm_utils import UpgradeMode
vmss = get_vmss_by_aaz(cmd, resource_group_name, vmss_name)
# pylint: disable=no-member
is_linux_os = _is_linux_os(vmss.virtual_machine_profile)
is_linux_os = _is_linux_os_aaz(vmss['virtualMachineProfile'])
vm_extension_name = _LINUX_DIAG_EXT if is_linux_os else _WINDOWS_DIAG_EXT
if is_linux_os and vmss.virtual_machine_profile.extension_profile: # check incompatibles
exts = vmss.virtual_machine_profile.extension_profile.extensions or []
if is_linux_os and vmss.get('virtualMachineProfile', {}).get('extensionProfile'): # check incompatibles
exts = vmss.get('virtualMachineProfile', {}).get('extensionProfile', {}).get('extensions', [])
major_ver = extension_mappings[_LINUX_DIAG_EXT]['version'].split('.', maxsplit=1)[0]
# For VMSS, we don't do auto-removal like VM because there is no reliable API to wait for
# the removal done before we can install the newer one
Expand All @@ -5133,8 +5132,7 @@ def set_vmss_diagnostics_extension(
no_auto_upgrade)

result = LongRunningOperation(cmd.cli_ctx)(poller)
UpgradeMode = cmd.get_models('UpgradeMode')
if vmss.upgrade_policy.mode == UpgradeMode.manual:
if vmss.get('upgradePolicy', {}).get('mode') == UpgradeMode.MANUAL.value:
poller2 = update_vmss_instances(cmd, resource_group_name, vmss_name, ['*'])
LongRunningOperation(cmd.cli_ctx)(poller2)
return result
Expand Down
Loading