[Backup] Migrate backup to track2 SDK

src/azure-cli/azure/cli/command_modules/backup/custom.py

@@ -23,6 +23,7 @@
     BackupResourceVaultConfig, BackupResourceVaultConfigResource, DiskExclusionProperties, ExtendedProperties
 
 from azure.cli.core.util import CLIError
+from azure.core.exceptions import HttpResponseError
 from azure.cli.core.azclierror import RequiredArgumentMissingError, InvalidArgumentValueError
 from azure.cli.command_modules.backup._client_factory import (
     vaults_cf, backup_protected_items_cf, protection_policies_cf, virtual_machines_cf, recovery_points_cf,
@@ -163,14 +164,14 @@ def _force_delete_vault(cmd, vault_name, resource_group_name):
     # now delete the vault
     try:
         vault_client.delete(resource_group_name, vault_name)
-    except Exception as ex:
+    except HttpResponseError as ex:
         raise ex
 
 
 def delete_vault(cmd, client, vault_name, resource_group_name, force=False):
     try:
         client.delete(resource_group_name, vault_name)
-    except Exception as ex:  # pylint: disable=broad-except
+    except HttpResponseError as ex:  # pylint: disable=broad-except
         if 'existing resources within the vault' in ex.message and force:  # pylint: disable=no-member
             _force_delete_vault(cmd, vault_name, resource_group_name)
         else:

src/azure-cli/azure/cli/command_modules/backup/tests/latest/preparers.py

@@ -34,9 +34,11 @@ def create_resource(self, name, **kwargs):
             self.resource_group = self._get_resource_group(**kwargs)
             self.location = self._get_resource_group_location(**kwargs)
             cmd = 'az backup vault create -n {} -g {} --location {}'.format(name, self.resource_group, self.location)
+            print(cmd)
             execute(self.cli_ctx, cmd)
             if not self.soft_delete:
                 cmd = 'az backup vault backup-properties set -n {} -g {} --soft-delete-feature-state Disable'.format(name, self.resource_group)
+                print(cmd)
                 execute(self.cli_ctx, cmd)
             return {self.parameter_name: name}
         return {self.parameter_name: self.dev_setting_value}
@@ -65,18 +67,24 @@ def _get_resource_group_location(self, **kwargs):
     def _cleanup(self, vault_name, resource_group):
         containers = execute(self.cli_ctx, 'az backup container list --backup-management-type AzureIaasVM -v {} -g {} --query [].properties.friendlyName'
                              .format(vault_name, resource_group)).get_output_in_json()
+        print('az backup container list --backup-management-type AzureIaasVM -v {} -g {} --query [].properties.friendlyName'
+                             .format(vault_name, resource_group))
         for container in containers:
             items = execute(self.cli_ctx, 'az backup item list --backup-management-type AzureIaasVM --workload-type VM -g {} -v {} -c {} --query [].properties.friendlyName'
                             .format(resource_group, vault_name, container)).get_output_in_json()
+            print('az backup item list --backup-management-type AzureIaasVM --workload-type VM -g {} -v {} -c {} --query [].properties.friendlyName'
+                            .format(resource_group, vault_name, container))
             for item in items:
                 execute(self.cli_ctx,
                         'az backup protection disable --backup-management-type AzureIaasVM --workload-type VM -g {} -v {} -c {} -i {} --delete-backup-data true --yes'
                         .format(resource_group, vault_name, container, item))
-        from msrestazure.azure_exceptions import CloudError
+                print('az backup protection disable --backup-management-type AzureIaasVM --workload-type VM -g {} -v {} -c {} -i {} --delete-backup-data true --yes'
+                        .format(resource_group, vault_name, container, item))
+        from azure.core.exceptions import HttpResponseError
         try:
             execute(self.cli_ctx, 'az backup vault delete -n {} -g {} --yes'.format(vault_name, resource_group))
-        except CloudError as ex:
-            if 'Recovery Services vault cannot be deleted as there are backup items in soft deleted state in the vault' not in str(ex):
+        except HttpResponseError as ex:
+            if "Operation returned an invalid status 'Bad Request'" not in str(ex):
                 raise ex