diff --git a/src/azure-cli/azure/cli/command_modules/batchai/_params.py b/src/azure-cli/azure/cli/command_modules/batchai/_params.py index 6e4ea1b8b4e..cba35dd5eee 100644 --- a/src/azure-cli/azure/cli/command_modules/batchai/_params.py +++ b/src/azure-cli/azure/cli/command_modules/batchai/_params.py @@ -10,10 +10,10 @@ def get_vm_sizes(cli_ctx, location): - from azure.cli.core.profiles import ResourceType - from azure.cli.core.commands.client_factory import get_mgmt_service_client - client_factory = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_COMPUTE) - return list(client_factory.virtual_machine_sizes.list(location)) + from ..vm.operations.vm import VMListSizes + return VMListSizes(cli_ctx=cli_ctx)(command_args={ + 'location': location + }) @Completer @@ -23,7 +23,7 @@ def get_vm_size_completion_list(cmd, prefix, namespace, **kwargs): # pylint: di except AttributeError: location = get_one_of_subscription_locations(cmd.cli_ctx) result = get_vm_sizes(cmd.cli_ctx, location) - return [r.name for r in result] + return [r.get('name') for r in result] # pylint: disable=line-too-long, too-many-statements diff --git a/src/azure-cli/azure/cli/command_modules/vm/aaz/latest/vm/_list_sizes.py b/src/azure-cli/azure/cli/command_modules/vm/aaz/latest/vm/_list_sizes.py index 75e1cac3a13..6f1ebaa17e8 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/aaz/latest/vm/_list_sizes.py +++ b/src/azure-cli/azure/cli/command_modules/vm/aaz/latest/vm/_list_sizes.py @@ -22,9 +22,9 @@ class ListSizes(AAZCommand): """ _aaz_info = { - "version": "2022-11-01", + "version": "2024-11-01", "resources": [ - ["mgmt-plane", "/subscriptions/{}/providers/microsoft.compute/locations/{}/vmsizes", "2022-11-01"], + ["mgmt-plane", "/subscriptions/{}/providers/microsoft.compute/locations/{}/vmsizes", "2024-11-01"], ] } @@ -111,7 +111,7 @@ def url_parameters(self): def query_parameters(self): parameters = { **self.serialize_query_param( - "api-version", "2022-11-01", + "api-version", "2024-11-01", required=True, ), } @@ -144,6 +144,9 @@ def _build_schema_on_200(cls): cls._schema_on_200 = AAZObjectType() _schema_on_200 = cls._schema_on_200 + _schema_on_200.next_link = AAZStrType( + serialized_name="nextLink", + ) _schema_on_200.value = AAZListType() value = cls._schema_on_200.value diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_dedicated_host_e2e.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_dedicated_host_e2e.yaml index 0cbdc555684..e3ee88c48d9 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_dedicated_host_e2e.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_dedicated_host_e2e.yaml @@ -732,7 +732,7 @@ interactions: - AZURECLI/2.47.0 azsdk-python-azure-mgmt-compute/29.1.0 Python/3.10.11 (Linux-5.15.0-1036-azure-x86_64-with-glibc2.31) VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westeurope/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westeurope/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\n @@ -4639,7 +4639,7 @@ interactions: - AZURECLI/2.47.0 azsdk-python-azure-mgmt-compute/29.1.0 Python/3.10.11 (Linux-5.15.0-1036-azure-x86_64-with-glibc2.31) VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\n @@ -7743,7 +7743,7 @@ interactions: - AZURECLI/2.47.0 azsdk-python-azure-mgmt-compute/29.1.0 Python/3.10.11 (Linux-5.15.0-1036-azure-x86_64-with-glibc2.31) VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_accelerated_networking.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_accelerated_networking.yaml index 95b62ba57cf..04f387591c7 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_accelerated_networking.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_accelerated_networking.yaml @@ -1752,7 +1752,7 @@ interactions: User-Agent: - AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.10.11 (Windows-10-10.0.26100-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_size_list.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_size_list.yaml index 3865e446a73..29c2261303e 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_size_list.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_size_list.yaml @@ -15,7 +15,7 @@ interactions: User-Agent: - AZURECLI/2.68.0 azsdk-python-core/1.31.0 Python/3.11.9 (Windows-10-10.0.26100-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_ephemeral_os_disk_placement.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_ephemeral_os_disk_placement.yaml index 7899c86134d..d1cdc5e3588 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_ephemeral_os_disk_placement.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_ephemeral_os_disk_placement.yaml @@ -1705,7 +1705,7 @@ interactions: User-Agent: - AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.10.11 (Windows-10-10.0.26100-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_size.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_size.yaml index 73e94bfc706..6f33ebaa4b4 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_size.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vm_update_size.yaml @@ -1705,7 +1705,7 @@ interactions: User-Agent: - AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.10.11 (Windows-10-10.0.26100-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_ephemeral_os_disk_placement.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_ephemeral_os_disk_placement.yaml index 49d9b130170..75410ce821e 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_ephemeral_os_disk_placement.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_ephemeral_os_disk_placement.yaml @@ -938,7 +938,7 @@ interactions: User-Agent: - AZURECLI/2.63.0 azsdk-python-core/1.28.0 Python/3.10.11 (Windows-10-10.0.22631-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\ diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_options.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_options.yaml index ebf0e0c6405..1ebeb2cab25 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_options.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_vmss_create_options.yaml @@ -1868,7 +1868,7 @@ interactions: User-Agent: - AZURECLI/2.63.0 azsdk-python-core/1.28.0 Python/3.10.11 (Windows-10-10.0.22631-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2022-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2024-11-01 response: body: string: "{\r\n \"value\": [\r\n {\r\n \"name\": \"Standard_B1ls\",\r\