From cf783cc931c551243b666fb86221a25a45a3ab2b Mon Sep 17 00:00:00 2001 From: william051200 Date: Tue, 10 Mar 2026 14:24:37 +0800 Subject: [PATCH 1/8] Migrate backup module --- .../command_modules/backup/_client_factory.py | 10 -------- .../cli/command_modules/backup/custom.py | 25 +++++++++++++------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/_client_factory.py b/src/azure-cli/azure/cli/command_modules/backup/_client_factory.py index a95ccbe143c..b2cad0e92fd 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/_client_factory.py +++ b/src/azure-cli/azure/cli/command_modules/backup/_client_factory.py @@ -12,12 +12,6 @@ def _resource_client_factory(cli_ctx, **_): return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES) -def _compute_client_factory(cli_ctx, **_): - from azure.cli.core.profiles import ResourceType - from azure.cli.core.commands.client_factory import get_mgmt_service_client - return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_COMPUTE) - - def _common_client_factory(cli_ctx, **_): from azure.mgmt.recoveryservices import RecoveryServicesClient from azure.cli.core.commands.client_factory import get_mgmt_service_client @@ -40,10 +34,6 @@ def _backup_passive_client_factory(cli_ctx, **_): # External Deps Client Factories -def virtual_machines_cf(cli_ctx, *_): - return _compute_client_factory(cli_ctx).virtual_machines - - def resources_cf(cli_ctx, *_): return _resource_client_factory(cli_ctx).resources diff --git a/src/azure-cli/azure/cli/command_modules/backup/custom.py b/src/azure-cli/azure/cli/command_modules/backup/custom.py index 94851f32478..0a98bffb803 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/custom.py +++ b/src/azure-cli/azure/cli/command_modules/backup/custom.py @@ -38,7 +38,7 @@ from azure.cli.core.azclierror import RequiredArgumentMissingError, InvalidArgumentValueError, \ MutuallyExclusiveArgumentError, ArgumentUsageError, ValidationError, ResourceNotFoundError from azure.cli.command_modules.backup._client_factory import ( - vaults_cf, backup_protected_items_cf, protection_policies_cf, virtual_machines_cf, recovery_points_cf, + vaults_cf, backup_protected_items_cf, protection_policies_cf, recovery_points_cf, protection_containers_cf, backup_protectable_items_cf, backup_protection_containers_cf, protected_items_cf, backup_resource_vault_config_cf, recovery_points_crr_cf, aad_properties_cf, cross_region_restore_cf, backup_crr_job_details_cf, backup_crr_jobs_cf, backup_protected_items_crr_cf, @@ -887,6 +887,7 @@ def list_containers(client, resource_group_name, vault_name, container_type="Azu def check_protection_enabled_for_vm(cmd, vm_id=None, vm=None, resource_group_name=None): + from ..vm.operations.vm import VMShow if vm_id is None: if is_valid_resource_id(vm): vm_id = vm @@ -894,17 +895,27 @@ def check_protection_enabled_for_vm(cmd, vm_id=None, vm=None, resource_group_nam if vm is None or resource_group_name is None: raise RequiredArgumentMissingError("--vm or --resource-group missing. Please provide the required " "arguments.") - vm_id = virtual_machines_cf(cmd.cli_ctx).get(resource_group_name, vm).id + vm_id = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ + 'resource_group': resource_group_name, + 'vm_name': vm + }).get('id') vm_name, vm_rg = cust_help.get_resource_name_and_rg(resource_group_name, vm_id) - vm = virtual_machines_cf(cmd.cli_ctx).get(vm_rg, vm_name) + vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ + 'resource_group': vm_rg, + 'vm_name': vm_name + }).get('id') parameters = BackupStatusRequest(resource_type='VM', resource_id=vm_id) - return backup_status_cf(cmd.cli_ctx).get(vm.location, parameters).vault_id + return backup_status_cf(cmd.cli_ctx).get(vm.get('location'), parameters).vault_id def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, policy_name, diskslist=None, disk_list_setting=None, exclude_all_data_disks=None): + from ..vm.operations.vm import VMShow vm_name, vm_rg = cust_help.get_resource_name_and_rg(resource_group_name, vm) - vm = virtual_machines_cf(cmd.cli_ctx).get(vm_rg, vm_name) + vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ + 'resource_group': vm_rg, + 'vm_name': vm_name + }) vault = vaults_cf(cmd.cli_ctx).get(resource_group_name, vault_name) policy = show_policy(protection_policies_cf(cmd.cli_ctx), resource_group_name, vault_name, policy_name) @@ -915,7 +926,7 @@ def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, p if policy.properties.protected_items_count >= 1000: raise CLIError("Cannot configure backup for more than 1000 VMs per policy") - if vm.location.lower() != vault.location.lower(): + if vm.get('location', '').lower() != vault.location.lower(): raise CLIError( """ The VM should be in the same location as that of the Recovery Services vault to enable protection. @@ -945,7 +956,7 @@ def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, p # Construct enable protection request object container_uri = cust_help.get_protection_container_uri_from_id(protectable_item.id) item_uri = cust_help.get_protectable_item_uri_from_id(protectable_item.id) - vm_item_properties = _get_vm_item_properties_from_vm_type(vm.type) + vm_item_properties = _get_vm_item_properties_from_vm_type(vm['type']) vm_item_properties.policy_id = policy.id vm_item_properties.source_resource_id = protectable_item.properties.virtual_machine_id From 3c30cd4d5f1a3fe471bc100972ed9ea2255ef32c Mon Sep 17 00:00:00 2001 From: william051200 Date: Tue, 10 Mar 2026 14:38:45 +0800 Subject: [PATCH 2/8] Update code --- src/azure-cli/azure/cli/command_modules/backup/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/custom.py b/src/azure-cli/azure/cli/command_modules/backup/custom.py index 0a98bffb803..7c724eec5e4 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/custom.py +++ b/src/azure-cli/azure/cli/command_modules/backup/custom.py @@ -903,7 +903,7 @@ def check_protection_enabled_for_vm(cmd, vm_id=None, vm=None, resource_group_nam vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': vm_rg, 'vm_name': vm_name - }).get('id') + }) parameters = BackupStatusRequest(resource_type='VM', resource_id=vm_id) return backup_status_cf(cmd.cli_ctx).get(vm.get('location'), parameters).vault_id From 15622b13b87ebb9ce64eac6b1f8d6fb9510bee67 Mon Sep 17 00:00:00 2001 From: william051200 Date: Wed, 11 Mar 2026 14:09:21 +0800 Subject: [PATCH 3/8] Update code --- src/azure-cli/azure/cli/command_modules/backup/custom.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/custom.py b/src/azure-cli/azure/cli/command_modules/backup/custom.py index 7c724eec5e4..40be7c7a3d0 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/custom.py +++ b/src/azure-cli/azure/cli/command_modules/backup/custom.py @@ -897,12 +897,14 @@ def check_protection_enabled_for_vm(cmd, vm_id=None, vm=None, resource_group_nam "arguments.") vm_id = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': resource_group_name, - 'vm_name': vm + 'vm_name': vm, + 'expand': 'instanceView' }).get('id') vm_name, vm_rg = cust_help.get_resource_name_and_rg(resource_group_name, vm_id) vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': vm_rg, - 'vm_name': vm_name + 'vm_name': vm_name, + 'expand': 'instanceView' }) parameters = BackupStatusRequest(resource_type='VM', resource_id=vm_id) return backup_status_cf(cmd.cli_ctx).get(vm.get('location'), parameters).vault_id From fc18cf860477ab2a372f5d9595ce0c3615e8e946 Mon Sep 17 00:00:00 2001 From: william051200 Date: Wed, 11 Mar 2026 14:10:54 +0800 Subject: [PATCH 4/8] Update code --- src/azure-cli/azure/cli/command_modules/backup/custom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/custom.py b/src/azure-cli/azure/cli/command_modules/backup/custom.py index 40be7c7a3d0..0689d4a3f0c 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/custom.py +++ b/src/azure-cli/azure/cli/command_modules/backup/custom.py @@ -916,7 +916,8 @@ def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, p vm_name, vm_rg = cust_help.get_resource_name_and_rg(resource_group_name, vm) vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': vm_rg, - 'vm_name': vm_name + 'vm_name': vm_name, + 'expand': 'instanceView' }) vault = vaults_cf(cmd.cli_ctx).get(resource_group_name, vault_name) policy = show_policy(protection_policies_cf(cmd.cli_ctx), resource_group_name, vault_name, policy_name) From 959c93d6e1639ce70dc4da086e52689e36ec5411 Mon Sep 17 00:00:00 2001 From: william051200 Date: Thu, 12 Mar 2026 08:55:57 +0800 Subject: [PATCH 5/8] Update code --- src/azure-cli/azure/cli/command_modules/backup/custom.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/custom.py b/src/azure-cli/azure/cli/command_modules/backup/custom.py index 0689d4a3f0c..71ca4c1fdd1 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/custom.py +++ b/src/azure-cli/azure/cli/command_modules/backup/custom.py @@ -917,7 +917,6 @@ def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, p vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': vm_rg, 'vm_name': vm_name, - 'expand': 'instanceView' }) vault = vaults_cf(cmd.cli_ctx).get(resource_group_name, vault_name) policy = show_policy(protection_policies_cf(cmd.cli_ctx), resource_group_name, vault_name, policy_name) From df5ef6d8657f5cb5225917c6b13e2e565ad0e95c Mon Sep 17 00:00:00 2001 From: william051200 Date: Thu, 12 Mar 2026 15:39:39 +0800 Subject: [PATCH 6/8] Udpate vm show command arg --- src/azure-cli/azure/cli/command_modules/backup/custom.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/custom.py b/src/azure-cli/azure/cli/command_modules/backup/custom.py index 71ca4c1fdd1..7c724eec5e4 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/custom.py +++ b/src/azure-cli/azure/cli/command_modules/backup/custom.py @@ -897,14 +897,12 @@ def check_protection_enabled_for_vm(cmd, vm_id=None, vm=None, resource_group_nam "arguments.") vm_id = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': resource_group_name, - 'vm_name': vm, - 'expand': 'instanceView' + 'vm_name': vm }).get('id') vm_name, vm_rg = cust_help.get_resource_name_and_rg(resource_group_name, vm_id) vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': vm_rg, - 'vm_name': vm_name, - 'expand': 'instanceView' + 'vm_name': vm_name }) parameters = BackupStatusRequest(resource_type='VM', resource_id=vm_id) return backup_status_cf(cmd.cli_ctx).get(vm.get('location'), parameters).vault_id @@ -916,7 +914,7 @@ def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, p vm_name, vm_rg = cust_help.get_resource_name_and_rg(resource_group_name, vm) vm = VMShow(cli_ctx=cmd.cli_ctx)(command_args={ 'resource_group': vm_rg, - 'vm_name': vm_name, + 'vm_name': vm_name }) vault = vaults_cf(cmd.cli_ctx).get(resource_group_name, vault_name) policy = show_policy(protection_policies_cf(cmd.cli_ctx), resource_group_name, vault_name, policy_name) From f3f27dbba47a98b84e2d41131d9a838ff607a2d7 Mon Sep 17 00:00:00 2001 From: william051200 Date: Thu, 12 Mar 2026 15:40:14 +0800 Subject: [PATCH 7/8] Update test case recording version --- .../tests/latest/recordings/test_backup_CrossZonalRestore.yaml | 2 +- .../backup/tests/latest/recordings/test_backup_rg_mapping.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_CrossZonalRestore.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_CrossZonalRestore.yaml index 47048828e09..460e4ab950a 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_CrossZonalRestore.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_CrossZonalRestore.yaml @@ -1915,7 +1915,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rg_mapping.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rg_mapping.yaml index 28adf58d715..6ef0fde12b4 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rg_mapping.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rg_mapping.yaml @@ -1720,7 +1720,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n From e18f6ea443a22b4a219c3667205393bcf3ab516b Mon Sep 17 00:00:00 2001 From: william051200 Date: Fri, 13 Mar 2026 10:34:33 +0800 Subject: [PATCH 8/8] Update test case recording --- .../tests/latest/recordings/test_backup_container.yaml | 4 ++-- .../tests/latest/recordings/test_backup_disk_exclusion.yaml | 2 +- .../backup/tests/latest/recordings/test_backup_item.yaml | 4 ++-- .../backup/tests/latest/recordings/test_backup_job.yaml | 2 +- .../backup/tests/latest/recordings/test_backup_policy.yaml | 4 ++-- .../tests/latest/recordings/test_backup_protection.yaml | 6 +++--- .../backup/tests/latest/recordings/test_backup_restore.yaml | 2 +- .../test_backup_restore_when_storage_in_different_rg.yaml | 2 +- .../backup/tests/latest/recordings/test_backup_rp.yaml | 2 +- .../tests/latest/recordings/test_backup_scenario.yaml | 2 +- .../tests/latest/recordings/test_backup_softdelete.yaml | 2 +- .../recordings/test_vault_soft_delete_with_items.yaml | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_container.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_container.yaml index f970a1081e3..eab82c85ae4 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_container.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_container.yaml @@ -3542,7 +3542,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n @@ -4562,7 +4562,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_disk_exclusion.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_disk_exclusion.yaml index f1f3ced9dd4..95800ecd496 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_disk_exclusion.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_disk_exclusion.yaml @@ -3716,7 +3716,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_item.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_item.yaml index c915b249b0e..11d9f824ed3 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_item.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_item.yaml @@ -3444,7 +3444,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n @@ -4364,7 +4364,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_job.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_job.yaml index a1a2ed7a9db..9977d0e199f 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_job.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_job.yaml @@ -1854,7 +1854,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_policy.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_policy.yaml index 69c052b9055..b2c0249db53 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_policy.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_policy.yaml @@ -3617,7 +3617,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000005?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000005?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000005\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000005\",\r\n @@ -4573,7 +4573,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000006?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000006?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000006\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000006\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_protection.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_protection.yaml index bb7b19b3f23..46d4ce945dc 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_protection.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_protection.yaml @@ -1948,7 +1948,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n @@ -2096,7 +2096,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n @@ -2891,7 +2891,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore.yaml index 8694cb657c0..db858904494 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore.yaml @@ -1812,7 +1812,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000004\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000004\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore_when_storage_in_different_rg.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore_when_storage_in_different_rg.yaml index 35fd99ce0d4..64b53128c63 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore_when_storage_in_different_rg.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_restore_when_storage_in_different_rg.yaml @@ -1860,7 +1860,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000005?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000005?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000005\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000005\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rp.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rp.yaml index ea1dd03a6b5..d2bd59b6b18 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rp.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_rp.yaml @@ -1783,7 +1783,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_scenario.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_scenario.yaml index 9a91f601459..c8cd80c6219 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_scenario.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_scenario.yaml @@ -1779,7 +1779,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_softdelete.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_softdelete.yaml index 28ee6e86b35..21f0b9bdf6b 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_softdelete.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_backup_softdelete.yaml @@ -1772,7 +1772,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n diff --git a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_vault_soft_delete_with_items.yaml b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_vault_soft_delete_with_items.yaml index 47f247257df..b4df6f2a21f 100644 --- a/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_vault_soft_delete_with_items.yaml +++ b/src/azure-cli/azure/cli/command_modules/backup/tests/latest/recordings/test_vault_soft_delete_with_items.yaml @@ -1779,7 +1779,7 @@ interactions: User-Agent: - AZURECLI/2.78.0 azsdk-python-core/1.35.0 Python/3.11.9 (Windows-10-10.0.26200-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2024-11-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003?api-version=2025-04-01 response: body: string: "{\r\n \"name\": \"clitest-vm000003\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/AzureBackupRG_clitest_000001/providers/Microsoft.Compute/virtualMachines/clitest-vm000003\",\r\n