[T1] recoveryservicesbackup 2020 12 28 (Azure#15924)

* CodeGen from PR 12157 in Azure/azure-rest-api-specs
Updating existing CRR APIs with zone restore feature (Azure#12157)

* - Added change for support of cross zone restores.

* - updating example json

* - Fixing prettier

* test,version,CHANGELOG

Co-authored-by: SDKAuto <sdkautomation@microsoft.com>

Author: msyyc

sdk/recoveryservices/azure-mgmt-recoveryservicesbackup/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release History
 
+## 0.11.0 (2020-12-28)
+
+**Features**
+
+  - Model IaasVMRecoveryPoint has a new parameter zones
+  - Model IaasVMRestoreRequest has a new parameter zones
+
 ## 0.10.0 (2020-12-08)
 
 **Features**

sdk/recoveryservices/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/_models.py

@@ -8391,6 +8391,9 @@ class IaasVMRecoveryPoint(RecoveryPoint):
     :param recovery_point_disk_configuration: Disk configuration
     :type recovery_point_disk_configuration:
      ~azure.mgmt.recoveryservicesbackup.models.RecoveryPointDiskConfiguration
+    :param zones: Identifies the zone of the VM at the time of backup.
+     Applicable only for zone-pinned Vms
+    :type zones: list[str]
     """
 
     _validation = {
@@ -8417,6 +8420,7 @@ class IaasVMRecoveryPoint(RecoveryPoint):
         'original_storage_account_option': {'key': 'originalStorageAccountOption', 'type': 'bool'},
         'os_type': {'key': 'osType', 'type': 'str'},
         'recovery_point_disk_configuration': {'key': 'recoveryPointDiskConfiguration', 'type': 'RecoveryPointDiskConfiguration'},
+        'zones': {'key': 'zones', 'type': '[str]'},
     }
 
     def __init__(self, **kwargs):
@@ -8434,6 +8438,7 @@ def __init__(self, **kwargs):
         self.original_storage_account_option = kwargs.get('original_storage_account_option', None)
         self.os_type = kwargs.get('os_type', None)
         self.recovery_point_disk_configuration = kwargs.get('recovery_point_disk_configuration', None)
+        self.zones = kwargs.get('zones', None)
         self.object_type = 'IaasVMRecoveryPoint'
 
 
@@ -8503,6 +8508,8 @@ class IaasVMRestoreRequest(RestoreRequest):
     :param disk_encryption_set_id: DiskEncryptionSet's ID - needed if the VM
      needs to be encrypted at rest during restore with customer managed key.
     :type disk_encryption_set_id: str
+    :param zones: Target zone where the VM and its disks should be restored.
+    :type zones: list[str]
     """
 
     _validation = {
@@ -8528,6 +8535,7 @@ class IaasVMRestoreRequest(RestoreRequest):
         'restore_disk_lun_list': {'key': 'restoreDiskLunList', 'type': '[int]'},
         'restore_with_managed_disks': {'key': 'restoreWithManagedDisks', 'type': 'bool'},
         'disk_encryption_set_id': {'key': 'diskEncryptionSetId', 'type': 'str'},
+        'zones': {'key': 'zones', 'type': '[str]'},
     }
 
     def __init__(self, **kwargs):
@@ -8549,6 +8557,7 @@ def __init__(self, **kwargs):
         self.restore_disk_lun_list = kwargs.get('restore_disk_lun_list', None)
         self.restore_with_managed_disks = kwargs.get('restore_with_managed_disks', None)
         self.disk_encryption_set_id = kwargs.get('disk_encryption_set_id', None)
+        self.zones = kwargs.get('zones', None)
         self.object_type = 'IaasVMRestoreRequest'
 
 

sdk/recoveryservices/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/_models_py3.py

@@ -8391,6 +8391,9 @@ class IaasVMRecoveryPoint(RecoveryPoint):
     :param recovery_point_disk_configuration: Disk configuration
     :type recovery_point_disk_configuration:
      ~azure.mgmt.recoveryservicesbackup.models.RecoveryPointDiskConfiguration
+    :param zones: Identifies the zone of the VM at the time of backup.
+     Applicable only for zone-pinned Vms
+    :type zones: list[str]
     """
 
     _validation = {
@@ -8417,9 +8420,10 @@ class IaasVMRecoveryPoint(RecoveryPoint):
         'original_storage_account_option': {'key': 'originalStorageAccountOption', 'type': 'bool'},
         'os_type': {'key': 'osType', 'type': 'str'},
         'recovery_point_disk_configuration': {'key': 'recoveryPointDiskConfiguration', 'type': 'RecoveryPointDiskConfiguration'},
+        'zones': {'key': 'zones', 'type': '[str]'},
     }
 
-    def __init__(self, *, key_and_secret=None, is_instant_ilr_session_active: bool=None, recovery_point_tier_details=None, is_managed_virtual_machine: bool=None, virtual_machine_size: str=None, original_storage_account_option: bool=None, os_type: str=None, recovery_point_disk_configuration=None, **kwargs) -> None:
+    def __init__(self, *, key_and_secret=None, is_instant_ilr_session_active: bool=None, recovery_point_tier_details=None, is_managed_virtual_machine: bool=None, virtual_machine_size: str=None, original_storage_account_option: bool=None, os_type: str=None, recovery_point_disk_configuration=None, zones=None, **kwargs) -> None:
         super(IaasVMRecoveryPoint, self).__init__(**kwargs)
         self.recovery_point_type = None
         self.recovery_point_time = None
@@ -8434,6 +8438,7 @@ def __init__(self, *, key_and_secret=None, is_instant_ilr_session_active: bool=N
         self.original_storage_account_option = original_storage_account_option
         self.os_type = os_type
         self.recovery_point_disk_configuration = recovery_point_disk_configuration
+        self.zones = zones
         self.object_type = 'IaasVMRecoveryPoint'
 
 
@@ -8503,6 +8508,8 @@ class IaasVMRestoreRequest(RestoreRequest):
     :param disk_encryption_set_id: DiskEncryptionSet's ID - needed if the VM
      needs to be encrypted at rest during restore with customer managed key.
     :type disk_encryption_set_id: str
+    :param zones: Target zone where the VM and its disks should be restored.
+    :type zones: list[str]
     """
 
     _validation = {
@@ -8528,9 +8535,10 @@ class IaasVMRestoreRequest(RestoreRequest):
         'restore_disk_lun_list': {'key': 'restoreDiskLunList', 'type': '[int]'},
         'restore_with_managed_disks': {'key': 'restoreWithManagedDisks', 'type': 'bool'},
         'disk_encryption_set_id': {'key': 'diskEncryptionSetId', 'type': 'str'},
+        'zones': {'key': 'zones', 'type': '[str]'},
     }
 
-    def __init__(self, *, recovery_point_id: str=None, recovery_type=None, source_resource_id: str=None, target_virtual_machine_id: str=None, target_resource_group_id: str=None, storage_account_id: str=None, virtual_network_id: str=None, subnet_id: str=None, target_domain_name_id: str=None, region: str=None, affinity_group: str=None, create_new_cloud_service: bool=None, original_storage_account_option: bool=None, encryption_details=None, restore_disk_lun_list=None, restore_with_managed_disks: bool=None, disk_encryption_set_id: str=None, **kwargs) -> None:
+    def __init__(self, *, recovery_point_id: str=None, recovery_type=None, source_resource_id: str=None, target_virtual_machine_id: str=None, target_resource_group_id: str=None, storage_account_id: str=None, virtual_network_id: str=None, subnet_id: str=None, target_domain_name_id: str=None, region: str=None, affinity_group: str=None, create_new_cloud_service: bool=None, original_storage_account_option: bool=None, encryption_details=None, restore_disk_lun_list=None, restore_with_managed_disks: bool=None, disk_encryption_set_id: str=None, zones=None, **kwargs) -> None:
         super(IaasVMRestoreRequest, self).__init__(**kwargs)
         self.recovery_point_id = recovery_point_id
         self.recovery_type = recovery_type
@@ -8549,6 +8557,7 @@ def __init__(self, *, recovery_point_id: str=None, recovery_type=None, source_re
         self.restore_disk_lun_list = restore_disk_lun_list
         self.restore_with_managed_disks = restore_with_managed_disks
         self.disk_encryption_set_id = disk_encryption_set_id
+        self.zones = zones
         self.object_type = 'IaasVMRestoreRequest'
 
 

sdk/recoveryservices/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/_aad_properties_operations.py

@@ -94,4 +94,4 @@ def get(
             return client_raw_response
 
         return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.RecoveryServices/locations/{azureRegion}/backupAadProperties/default'}
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.RecoveryServices/locations/{azureRegion}/backupAadProperties'}

sdk/recoveryservices/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/version.py

@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.10.0"
+VERSION = "0.11.0"
 

sdk/recoveryservices/azure-mgmt-recoveryservicesbackup/tests/recordings/test_mgmt_recoveryservices_backup.test_operations_api.yaml

@@ -9,8 +9,8 @@ interactions:
       Connection:
       - keep-alive
       User-Agent:
-      - python/3.6.9 (Linux-4.19.76-linuxkit-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.10
-        msrest_azure/0.6.2 azure-mgmt-recoveryservicesbackup/0.10.0 Azure-SDK-For-Python
+      - python/3.6.9 (Linux-4.19.121-linuxkit-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.10
+        msrest_azure/0.6.2 azure-mgmt-recoveryservicesbackup/0.11.0 Azure-SDK-For-Python
       accept-language:
       - en-US
     method: GET
@@ -345,11 +345,13 @@ interactions:
         Items","operation":"Track the results of an asynchronous operation on the
         resource Migration Items","description":"Track the results of an asynchronous
         operation on the resource Migration Items"},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationSupportedOperatingSystems/read","display":{"provider":"Microsoft.RecoveryServices","operation":"Read
-        ","description":"Read any "},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectedItems/addDisks/action","display":{"provider":"Microsoft.RecoveryServices","resource":"Protected
+        ","description":"Read any "},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationRecoveryPlans/failoverCancel/action","display":{"provider":"Microsoft.RecoveryServices","resource":"Recovery
+        Plans","operation":"Cancel Failover Recovery Plan","description":"Cancel Failover
+        Recovery Plan"},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectedItems/addDisks/action","display":{"provider":"Microsoft.RecoveryServices","resource":"Protected
         Items","operation":"Add disks","description":"Add disks"},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectedItems/removeDisks/action","display":{"provider":"Microsoft.RecoveryServices","resource":"Protected
         Items","operation":"Remove disks","description":"Remove disks"},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectedItems/ResolveHealthErrors/action","display":{"provider":"Microsoft.RecoveryServices","resource":"Protected
         Items"},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectedItems/failoverCancel/action","display":{"provider":"Microsoft.RecoveryServices","resource":"Protected
-        Items"},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationProtectionIntents/read","display":{"provider":"Microsoft.RecoveryServices","operation":"Read
+        Items","operation":"Failover Cancel","description":"Failover Cancel"},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationProtectionIntents/read","display":{"provider":"Microsoft.RecoveryServices","operation":"Read
         ","description":"Read any "},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationProtectionIntents/write","display":{"provider":"Microsoft.RecoveryServices","operation":"Create
         or Update ","description":"Create or Update any "},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationVaultSettings/read","display":{"provider":"Microsoft.RecoveryServices","operation":"Read
         ","description":"Read any "},"origin":"user,system"},{"name":"Microsoft.RecoveryServices/vaults/replicationVaultSettings/write","display":{"provider":"Microsoft.RecoveryServices","operation":"Create
@@ -417,11 +419,11 @@ interactions:
       cache-control:
       - no-cache
       content-length:
-      - '64339'
+      - '64686'
       content-type:
       - application/json
       date:
-      - Tue, 08 Dec 2020 07:31:29 GMT
+      - Mon, 28 Dec 2020 09:03:46 GMT
       expires:
       - '-1'
       pragma: