Skip to content

[Compute] Fix #34063: az vmss update: Clear the stale zone placement filter when switching filters #34064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WhaleTech (ryo-whaletech) wants to merge 1 commit into
base: dev
Choose a base branch
from
+34 −1
Open

[Compute] Fix #34063: az vmss update: Clear the stale zone placement filter when switching filters #34064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions src/azure-cli/azure/cli/command_modules/vm/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5150,9 +5150,11 @@ def _output(self, *args, **kwargs):

if include_zones is not None:
vmss["placement"]["include_zones"] = include_zones
vmss["placement"].pop("exclude_zones", None)

if exclude_zones is not None:
vmss["placement"]["exclude_zones"] = exclude_zones
vmss["placement"].pop("include_zones", None)

from .operations.vmss import VMSSCreate
return VMSSCreate(cli_ctx=cmd.cli_ctx)(command_args=vmss)
Expand Down
33 changes: 32 additions & 1 deletion src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_custom_vm_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
_get_extension_instance_name,
get_boot_log)
from azure.cli.command_modules.vm.custom import \
(attach_unmanaged_data_disk, detach_unmanaged_data_disk, get_vmss_instance_view)
(attach_unmanaged_data_disk, detach_unmanaged_data_disk, get_vmss_instance_view, update_vmss)

from azure.cli.core import AzCommandsLoader
from azure.cli.core.commands import AzCliCommand
Expand Down Expand Up @@ -166,6 +166,37 @@ def test_get_extension_instance_name_when_type_none(self):
# assert
self.assertEqual(result, 'extension-name')

@mock.patch('azure.cli.command_modules.vm.operations.vmss.VMSSCreate')
def test_update_vmss_switches_zone_placement_filter(self, vmss_create_mock):
transitions = (
('includeZones', ['1'], 'exclude_zones', ['2'], 'include_zones'),
('excludeZones', ['2'], 'include_zones', ['1'], 'exclude_zones'),
)

for existing_key, existing_value, new_key, new_value, stale_key in transitions:
with self.subTest(existing_key=existing_key, new_key=new_key):
vmss_create_mock.reset_mock()
parameters = {
'location': 'eastus2',
'placement': {
'zonePlacementPolicy': 'Auto',
existing_key: existing_value,
},
}

update_vmss(
_get_test_cmd(),
'resource-group',
'vmss-name',
parameters=parameters,
**{new_key: new_value}
)

command_args = vmss_create_mock.return_value.call_args.kwargs['command_args']
placement = command_args['placement']
self.assertEqual(new_value, placement[new_key])
self.assertNotIn(stale_key, placement)


class TestVMBootLog(unittest.TestCase):

Expand Down