[BACKUP] Added Archive Support for Azure CLI

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

@@ -630,9 +630,12 @@ def _should_use_original_storage_account(recovery_point, restore_to_staging_stor
 def _get_trigger_restore_properties(rp_name, vault_location, storage_account_id,
                                     source_resource_id, target_rg_id,
                                     use_original_storage_account, restore_disk_lun_list,
-                                    rehydration_duration, rehydration_priority, tier_type):
+                                    rehydration_duration, rehydration_priority, rp_list):
+    tier = None
+    if rp_list[0].properties.recovery_point_tier_details is not None:
+        tier = rp_list[0].tier_type
 
-    if tier_type == 'VaultArchive':
+    if tier == 'VaultArchive':
         rehyd_duration = 'P' + str(rehydration_duration) + 'D'
         rehydration_info = RecoveryPointRehydrationInfo(rehydration_retention_duration=rehyd_duration,
                                                         rehydration_priority=rehydration_priority)
@@ -680,7 +683,8 @@ def restore_disks(cmd, client, resource_group_name, vault_name, container_name,
     rp_list = [recovery_point]
     common.fetch_tier(rp_list)
 
-    if(rp_list[0].tier_type == 'VaultArchive' and rehydration_priority is None):
+    if (rp_list[0].properties.recovery_point_tier_details is not None and rp_list[0].tier_type == 'VaultArchive' and
+            rehydration_priority is None):
         raise InvalidArgumentValueError("""The selected recovery point is in archive tier, provide additional
         parameters of rehydration duration and rehydration priority.""")
 
@@ -738,8 +742,7 @@ def restore_disks(cmd, client, resource_group_name, vault_name, container_name,
     trigger_restore_properties = _get_trigger_restore_properties(rp_name, vault_location, _storage_account_id,
                                                                  _source_resource_id, target_rg_id,
                                                                  use_original_storage_account, restore_disk_lun_list,
-                                                                 rehydration_duration, rehydration_priority,
-                                                                 rp_list[0].tier_type)
+                                                                 rehydration_duration, rehydration_priority, rp_list)
     trigger_restore_request = RestoreRequestResource(properties=trigger_restore_properties)
 
     if use_secondary_region:

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

@@ -18,7 +18,7 @@
 from azure.cli.command_modules.backup._client_factory import protection_containers_cf, protectable_containers_cf, \
     protection_policies_cf, backup_protection_containers_cf, backup_protectable_items_cf, \
     resources_cf, backup_protected_items_cf
-from azure.cli.core.azclierror import InvalidArgumentValueError
+from azure.cli.core.azclierror import InvalidArgumentValueError, ArgumentUsageError
 
 fabric_name = "Azure"
 backup_management_type = "AzureStorage"
@@ -220,11 +220,11 @@ def list_recovery_points(cmd, client, resource_group_name, vault_name, item, sta
             """)
 
     if is_ready_for_move is not None or target_tier is not None or tier is not None:
-        raise InvalidArgumentValueError("""Invalid argument has been passed. --is-ready-for-move true, --target-tier
+        raise ArgumentUsageError("""Invalid argument has been passed. --is-ready-for-move true, --target-tier
         and --tier flags are not supported for --backup-management-type AzureStorage.""")
 
     if recommended_for_archive is not None:
-        raise InvalidArgumentValueError("""--recommended-for-archive is supported by AzureIaasVM backup management
+        raise ArgumentUsageError("""--recommended-for-archive is supported by AzureIaasVM backup management
         type only.""")
 
     if cmd.name.split()[2] == 'show-log-chain':

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

@@ -11,7 +11,7 @@
 from azure.cli.command_modules.backup._client_factory import protection_policies_cf, backup_protected_items_cf, \
     backup_protection_containers_cf, backup_protectable_items_cf
 from azure.cli.core.azclierror import ValidationError, RequiredArgumentMissingError, InvalidArgumentValueError, \
-    MutuallyExclusiveArgumentError
+    MutuallyExclusiveArgumentError, ArgumentUsageError
 # pylint: disable=import-error
 
 fabric_name = "Azure"
@@ -150,7 +150,7 @@ def move_recovery_points(cmd, resource_group_name, vault_name, container_name, i
         return custom_wl.move_wl_recovery_points(cmd, resource_group_name, vault_name, item, rp_name,
                                                  source_tier, destination_tier)
 
-    raise InvalidArgumentValueError('This command is not supported for --backup-management-type AzureStorage.')
+    raise ArgumentUsageError('This command is not supported for --backup-management-type AzureStorage.')
 
 
 def backup_now(cmd, client, resource_group_name, vault_name, item_name, retain_until=None, container_name=None,

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

@@ -31,7 +31,7 @@
 import azure.cli.command_modules.backup.custom_help as cust_help
 import azure.cli.command_modules.backup.custom_common as common
 from azure.cli.core.azclierror import InvalidArgumentValueError, RequiredArgumentMissingError, ValidationError, \
-    ResourceNotFoundError
+    ResourceNotFoundError, ArgumentUsageError
 
 
 fabric_name = "Azure"
@@ -328,7 +328,7 @@ def list_wl_recovery_points(cmd, client, resource_group_name, vault_name, item,
                             tier=None, recommended_for_archive=None):
 
     if recommended_for_archive is not None:
-        raise InvalidArgumentValueError("""--recommended-for-archive is supported by AzureIaasVM backup management
+        raise ArgumentUsageError("""--recommended-for-archive is supported by AzureIaasVM backup management
         type only.""")
 
     # Get container and item URIs
@@ -589,11 +589,12 @@ def restore_azure_wl(cmd, client, resource_group_name, vault_name, recovery_conf
     rp_list = [recovery_point]
     common.fetch_tier(rp_list)
 
-    if rp_list[0].tier_type == 'VaultArchive' and rehydration_priority is None:
+    if (rp_list[0].properties.recovery_point_tier_details is not None and rp_list[0].tier_type == 'VaultArchive' and
+            rehydration_priority is None):
         raise InvalidArgumentValueError("""The selected recovery point is in archive tier, provide additional
         parameters of rehydration duration and rehydration priority.""")
 
-    if rp_list[0].tier_type == 'VaultArchive':
+    if rp_list[0].properties.recovery_point_tier_details is not None and rp_list[0].tier_type == 'VaultArchive':
         # Construct trigger restore request object
         trigger_restore_properties = _get_restore_request_instance(item_type, log_point_in_time, rehydration_priority)