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
Original file line number Diff line number Diff line change
Expand Up @@ -3462,7 +3462,7 @@ interactions:
User-Agent:
- AZURECLI/2.84.0 azsdk-python-core/1.38.0 Python/3.12.10 (Windows-11-10.0.26200-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_nw_packet_capture000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2025-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_nw_packet_capture000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3277,7 +3277,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/resourcegroups/cli_test_nw_vm000001/providers/Microsoft.Network/networkSecurityGroups/nsg1?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_nw_vm000001/providers/Microsoft.Network/networkSecurityGroups/nsg1?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/nsg1''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1593,7 +1593,7 @@ interactions:
User-Agent:
- AZURECLI/2.72.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/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
Expand Down Expand Up @@ -9075,7 +9075,7 @@ interactions:
User-Agent:
- AZURECLI/2.72.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/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm2''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1593,7 +1593,7 @@ interactions:
User-Agent:
- AZURECLI/2.72.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/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,7 @@ interactions:
User-Agent:
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1026-azure-x86_64-with-glibc2.31)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
Expand Down Expand Up @@ -9110,7 +9110,7 @@ interactions:
User-Agent:
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1026-azure-x86_64-with-glibc2.31)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm2''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1697,7 +1697,7 @@ interactions:
User-Agent:
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-10-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
Expand Down Expand Up @@ -9402,7 +9402,7 @@ interactions:
User-Agent:
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2024-10-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2023-11-01
response:
body:
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm2''
Expand Down
18 changes: 12 additions & 6 deletions src/azure-cli/azure/cli/command_modules/vm/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ def _validate_proximity_placement_group(cmd, namespace):
parsed = parse_resource_id(namespace.proximity_placement_group)
rg, name = parsed['resource_group'], parsed['name']

if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute', 'proximityPlacementGroups'):
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute',
'proximityPlacementGroups', static_version='2024-07-01'):
raise CLIError("Proximity Placement Group '{}' does not exist.".format(name))


Expand Down Expand Up @@ -692,7 +693,8 @@ def _validate_vm_create_storage_account(cmd, namespace):
if namespace.storage_account:
storage_id = parse_resource_id(namespace.storage_account)
rg = storage_id.get('resource_group', namespace.resource_group_name)
if check_existence(cmd.cli_ctx, storage_id['name'], rg, 'Microsoft.Storage', 'storageAccounts'):
if check_existence(cmd.cli_ctx, storage_id['name'], rg, 'Microsoft.Storage',
'storageAccounts', static_version='2024-01-01'):
# 1 - existing storage account specified
namespace.storage_account_type = 'existing'
logger.debug("using specified existing storage account '%s'", storage_id['name'])
Expand Down Expand Up @@ -735,7 +737,8 @@ def _validate_vm_create_availability_set(cmd, namespace):
name = as_id['name']
rg = as_id.get('resource_group', namespace.resource_group_name)

if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute', 'availabilitySets'):
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute',
'availabilitySets', static_version='2024-07-01'):
raise CLIError("Availability set '{}' does not exist.".format(name))

namespace.availability_set = resource_id(
Expand All @@ -755,7 +758,8 @@ def _validate_vm_create_vmss(cmd, namespace):
name = as_id['name']
rg = as_id.get('resource_group', namespace.resource_group_name)

if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute', 'virtualMachineScaleSets'):
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute',
'virtualMachineScaleSets', static_version='2025-04-01'):
raise CLIError("virtual machine scale set '{}' does not exist.".format(name))

namespace.vmss = resource_id(
Expand Down Expand Up @@ -1035,7 +1039,8 @@ def _validate_vm_create_nsg(cmd, namespace):

if namespace.nsg:
if check_existence(cmd.cli_ctx, namespace.nsg, namespace.resource_group_name,
'Microsoft.Network', 'networkSecurityGroups'):
'Microsoft.Network', 'networkSecurityGroups',
static_version="2023-11-01"):
namespace.nsg_type = 'existing'
logger.debug("using specified NSG '%s'", namespace.nsg)
else:
Expand All @@ -1058,7 +1063,8 @@ def _validate_vmss_create_nsg(cmd, namespace):
def _validate_vm_vmss_create_public_ip(cmd, namespace):
if namespace.public_ip_address:
if check_existence(cmd.cli_ctx, namespace.public_ip_address, namespace.resource_group_name,
'Microsoft.Network', 'publicIPAddresses'):
'Microsoft.Network', 'publicIPAddresses',
static_version='2022-05-01'):
namespace.public_ip_address_type = 'existing'
logger.debug("using existing specified public IP '%s'", namespace.public_ip_address)
else:
Expand Down
5 changes: 3 additions & 2 deletions src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ def check_existence(cli_ctx, value, resource_group, provider_namespace, resource
resource_name = id_parts['name']
resource_type = id_parts.get('type', resource_type)

api_version = _resolve_api_version(cli_ctx, provider_namespace, resource_type, parent_path)
if static_version: # only for vnet
if static_version:
api_version = static_version
else:
api_version = _resolve_api_version(cli_ctx, provider_namespace, resource_type, parent_path)

try:
resource_client.get(rg, ns, parent_path, resource_type, resource_name, api_version)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3916,7 +3916,7 @@ interactions:
User-Agent:
- AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.12.9 (Linux-6.8.0-1021-azure-x86_64-with-glibc2.36)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2022-05-01
response:
body:
string: '{"name":"pubip","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip","etag":"W/\"80267895-4ce0-4ce9-a1f2-462176bfa265\"","location":"westus","properties":{"provisioningState":"Succeeded","resourceGuid":"67086f65-b393-436d-a5c4-09ff7129484e","ipAddress":"172.184.160.120","publicIPAddressVersion":"IPv4","publicIPAllocationMethod":"Static","idleTimeoutInMinutes":4,"ipTags":[{"ipTagType":"FirstPartyUsage","tag":"/NonProd"}],"ddosSettings":{"protectionMode":"VirtualNetworkInherited"}},"type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"}}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3917,7 +3917,7 @@ interactions:
User-Agent:
- AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.12.9 (Linux-6.8.0-1021-azure-x86_64-with-glibc2.36)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_image_version_create_000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_image_version_create_000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2022-05-01
response:
body:
string: '{"name":"pubip","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_image_version_create_000001/providers/Microsoft.Network/publicIPAddresses/pubip","etag":"W/\"a70e8018-4560-4c6d-b92b-3fa945aab7b1\"","location":"westus","properties":{"provisioningState":"Succeeded","resourceGuid":"264ec368-bd59-4314-98a3-dc9fe55d0206","ipAddress":"20.66.96.64","publicIPAddressVersion":"IPv4","publicIPAllocationMethod":"Static","idleTimeoutInMinutes":4,"ipTags":[{"ipTagType":"FirstPartyUsage","tag":"/NonProd"}],"ddosSettings":{"protectionMode":"VirtualNetworkInherited"}},"type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"}}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,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/resourcegroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg?api-version=2024-11-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg?api-version=2024-07-01
response:
body:
string: "{\r\n \"name\": \"myppg\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg\",\r\n
Expand Down Expand Up @@ -6893,7 +6893,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/resourcegroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg?api-version=2024-11-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg?api-version=2024-07-01
response:
body:
string: "{\r\n \"name\": \"myppg\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg\",\r\n
Expand Down Expand Up @@ -8368,7 +8368,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/resourcegroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg?api-version=2024-11-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg?api-version=2024-07-01
response:
body:
string: "{\r\n \"name\": \"myppg\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_ppg_vm_vmss_000001/providers/Microsoft.Compute/proximityPlacementGroups/myppg\",\r\n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3988,7 +3988,7 @@ interactions:
User-Agent:
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.12.9 (Linux-6.8.0-1026-azure-x86_64-with-glibc2.36)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2022-05-01
response:
body:
string: '{"name":"pubip","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip","etag":"W/\"a29b3304-8118-49d6-9b68-b32ce2dc8cee\"","location":"westus","properties":{"provisioningState":"Succeeded","resourceGuid":"1286d80e-433f-4c85-bf8b-8fbd54b05bbc","ipAddress":"20.253.182.67","publicIPAddressVersion":"IPv4","publicIPAllocationMethod":"Static","idleTimeoutInMinutes":4,"ipTags":[{"ipTagType":"FirstPartyUsage","tag":"/NonProd"}],"ddosSettings":{"protectionMode":"VirtualNetworkInherited"}},"type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"}}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,7 @@ interactions:
User-Agent:
- AZURECLI/2.77.0 azsdk-python-core/1.35.0 Python/3.10.11 (Windows-10-10.0.26100-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_avset_migrate000001/providers/Microsoft.Compute/availabilitySets/avset000002?api-version=2025-04-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_avset_migrate000001/providers/Microsoft.Compute/availabilitySets/avset000002?api-version=2024-07-01
response:
body:
string: "{\r\n \"name\": \"avset000002\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_avset_migrate000001/providers/Microsoft.Compute/availabilitySets/avset000002\",\r\n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3484,7 +3484,7 @@ interactions:
User-Agent:
- AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.12.9 (Linux-6.8.0-1021-azure-x86_64-with-glibc2.36)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_generalize_vm000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2024-07-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_generalize_vm000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2022-05-01
response:
body:
string: '{"name":"pubip","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_generalize_vm000001/providers/Microsoft.Network/publicIPAddresses/pubip","etag":"W/\"90c21a25-5632-4a49-b3aa-4906fe588fee\"","location":"francecentral","properties":{"provisioningState":"Succeeded","resourceGuid":"3c2cd6cc-6696-4042-8023-3e1401f3d3ae","ipAddress":"52.143.147.243","publicIPAddressVersion":"IPv4","publicIPAllocationMethod":"Static","idleTimeoutInMinutes":4,"ipTags":[{"ipTagType":"FirstPartyUsage","tag":"/NonProd"}],"ddosSettings":{"protectionMode":"VirtualNetworkInherited"}},"type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"}}'
Expand Down
Loading
Loading