[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,
@@ -162,14 +163,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

@@ -72,11 +72,11 @@ def _cleanup(self, vault_name, resource_group):
                 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
+        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
 
 
@@ -229,7 +229,7 @@ def _get_resource_group(self, **kwargs):
         try:
             return kwargs.get(self.resource_group_parameter_name)
         except KeyError:
-            template = 'To create an item, a resource group is required. Please add ' \
+            template = 'To create a Policy, a resource group is required. Please add ' \
                        'decorator @{} in front of this Policy preparer.'
             raise CliTestError(template.format(ResourceGroupPreparer.__name__,
                                                self.resource_group_parameter_name))
@@ -238,7 +238,7 @@ def _get_vault(self, **kwargs):
         try:
             return kwargs.get(self.vault_parameter_name)
         except KeyError:
-            template = 'To create an item, a vault is required. Please add ' \
+            template = 'To create a Policy, a vault is required. Please add ' \
                        'decorator @{} in front of this Policy preparer.'
             raise CliTestError(template.format(VaultPreparer.__name__,
                                                self.vault_parameter_name))
@@ -281,7 +281,7 @@ def _get_resource_group(self, **kwargs):
         try:
             return kwargs.get(self.resource_group_parameter_name)
         except KeyError:
-            template = 'To create an item, a resource group is required. Please add ' \
+            template = 'To create an RP, a resource group is required. Please add ' \
                        'decorator @{} in front of this RP preparer.'
             raise CliTestError(template.format(ResourceGroupPreparer.__name__,
                                                self.resource_group_parameter_name))
@@ -290,7 +290,7 @@ def _get_vault(self, **kwargs):
         try:
             return kwargs.get(self.vault_parameter_name)
         except KeyError:
-            template = 'To create an item, a vault is required. Please add ' \
+            template = 'To create an RP, a vault is required. Please add ' \
                        'decorator @{} in front of this RP preparer.'
             raise CliTestError(template.format(VaultPreparer.__name__,
                                                self.vault_parameter_name))
@@ -299,7 +299,7 @@ def _get_vm(self, **kwargs):
         try:
             return kwargs.get(self.vm_parameter_name)
         except KeyError:
-            template = 'To create an rp, a VM is required. Please add ' \
+            template = 'To create an RP, a VM is required. Please add ' \
                        'decorator @{} in front of this RP preparer.'
             raise CliTestError(template.format(ItemPreparer.__name__, self.vm_parameter_name))
 
@@ -345,7 +345,7 @@ def _get_resource_group(self, **kwargs):
         try:
             return kwargs.get(self.resource_group_parameter_name)
         except KeyError:
-            template = 'To create an item, a resource group is required. Please add ' \
+            template = 'To create a Policy, a resource group is required. Please add ' \
                        'decorator @{} in front of this Policy preparer.'
             raise CliTestError(template.format(ResourceGroupPreparer.__name__,
                                                self.resource_group_parameter_name))
@@ -354,7 +354,7 @@ def _get_vault(self, **kwargs):
         try:
             return kwargs.get(self.vault_parameter_name)
         except KeyError:
-            template = 'To create an item, a vault is required. Please add ' \
+            template = 'To create a Policy, a vault is required. Please add ' \
                        'decorator @{} in front of this Policy preparer.'
             raise CliTestError(template.format(VaultPreparer.__name__,
                                                self.vault_parameter_name))
@@ -409,8 +409,8 @@ def _get_resource_group(self, **kwargs):
         try:
             return kwargs.get(self.resource_group_parameter_name)
         except KeyError:
-            template = 'To create an item, a resource group is required. Please add ' \
-                       'decorator @{} in front of this Policy preparer.'
+            template = 'To create a Fileshare, a resource group is required. Please add ' \
+                       'decorator @{} in front of this Fileshare preparer.'
             raise CliTestError(template.format(ResourceGroupPreparer.__name__,
                                                self.resource_group_parameter_name))
 
@@ -424,8 +424,8 @@ def _get_storage_account(self, **kwargs):
         try:
             return kwargs.get(self.storage_account_parameter_name)
         except KeyError:
-            template = 'To create an item, a vault is required. Please add ' \
-                       'decorator @StorageAccountPreparer in front of this Policy preparer.'
+            template = 'To create a Fileshare, a storage_account is required. Please add ' \
+                       'decorator @StorageAccountPreparer in front of this Fileshare preparer.'
             raise CliTestError(template)
 
 
@@ -468,7 +468,7 @@ def _get_resource_group(self, **kwargs):
             return kwargs.get(self.resource_group_parameter_name)
         except KeyError:
             template = 'To create an item, a resource group is required. Please add ' \
-                       'decorator @{} in front of this Policy preparer.'
+                       'decorator @{} in front of this Item preparer.'
             raise CliTestError(template.format(ResourceGroupPreparer.__name__,
                                                self.resource_group_parameter_name))
 
@@ -477,32 +477,32 @@ def _get_vault(self, **kwargs):
             return kwargs.get(self.vault_parameter_name)
         except KeyError:
             template = 'To create an item, a vault is required. Please add ' \
-                       'decorator @{} in front of this Policy preparer.'
+                       'decorator @{} in front of this Item preparer.'
             raise CliTestError(template.format(VaultPreparer.__name__,
                                                self.vault_parameter_name))
 
     def _get_storage_account(self, **kwargs):
         try:
             return kwargs.get(self.storage_account_parameter_name)
         except KeyError:
-            template = 'To create an item, a vault is required. Please add ' \
-                       'decorator @StorageAccountPreparer in front of this Policy preparer.'
+            template = 'To create an item, a storage_account is required. Please add ' \
+                       'decorator @StorageAccountPreparer in front of this Item preparer.'
             raise CliTestError(template)
 
     def _get_file_share(self, **kwargs):
         try:
             return kwargs.get(self.afs_parameter_name)
         except KeyError:
             template = 'To create an item, a fileshare is required. Please add ' \
-                       'decorator @FileSharePreparer in front of this Policy preparer.'
+                       'decorator @FileSharePreparer in front of this Item preparer.'
             raise CliTestError(template)
 
     def _get_policy(self, **kwargs):
         try:
             return kwargs.get(self.policy_parameter_name)
         except KeyError:
             template = 'To create an item, a policy is required. Please add ' \
-                       'decorator @AFSPolicyPreparer in front of this Policy preparer.'
+                       'decorator @AFSPolicyPreparer in front of this Item preparer.'
             raise CliTestError(template)
 
 
@@ -545,34 +545,34 @@ def _get_resource_group(self, **kwargs):
         try:
             return kwargs.get(self.resource_group_parameter_name)
         except KeyError:
-            template = 'To create an item, a resource group is required. Please add ' \
-                       'decorator @{} in front of this Policy preparer.'
+            template = 'To create an RP, a resource group is required. Please add ' \
+                       'decorator @{} in front of this RP preparer.'
             raise CliTestError(template.format(ResourceGroupPreparer.__name__,
                                                self.resource_group_parameter_name))
 
     def _get_vault(self, **kwargs):
         try:
             return kwargs.get(self.vault_parameter_name)
         except KeyError:
-            template = 'To create an item, a vault is required. Please add ' \
-                       'decorator @{} in front of this Policy preparer.'
+            template = 'To create an RP, a vault is required. Please add ' \
+                       'decorator @{} in front of this RP preparer.'
             raise CliTestError(template.format(VaultPreparer.__name__,
                                                self.vault_parameter_name))
 
     def _get_storage_account(self, **kwargs):
         try:
             return kwargs.get(self.storage_account_parameter_name)
         except KeyError:
-            template = 'To create a RP, an item is required. Please add ' \
-                       'decorator @AFSItemPreparer in front of this Policy preparer.'
+            template = 'To create an RP, a storage_account is required. Please add ' \
+                       'decorator @AFSItemPreparer in front of this RP preparer.'
             raise CliTestError(template)
 
     def _get_file_share(self, **kwargs):
         try:
             return kwargs.get(self.afs_parameter_name)
         except KeyError:
-            template = 'To create an item, a fileshare is required. Please add ' \
-                       'decorator @FileSharePreparer in front of this Policy preparer.'
+            template = 'To create an RP, a fileshare is required. Please add ' \
+                       'decorator @FileSharePreparer in front of this RP preparer.'
             raise CliTestError(template)