CodeGen from PR 15024 in Azure/azure-rest-api-specs

Merge bae936788e621147ca5a18ed326f8a573f450fbd into 036c2de

Author: SDKAuto

sdk/recoveryservices/azure-mgmt-recoveryservicesbackup/_meta.json

@@ -1,7 +1,7 @@
 {
   "autorest": "V2",
   "use": "@microsoft.azure/autorest.python@~4.0.71",
-  "commit": "8c7aca7f1b778ff6ba937b2e79d08fc851a6f80f",
+  "commit": "817f8724f2dc7c6b29a94c8122a19eae9553a407",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest_command": "autorest specification/recoveryservicesbackup/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --use=@microsoft.azure/autorest.python@~4.0.71 --version=V2",
   "readme": "specification/recoveryservicesbackup/resource-manager/readme.md"

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

@@ -14,6 +14,13 @@
 
 from ._configuration import RecoveryServicesBackupClientConfiguration
 from .operations import RecoveryServicesBackupClientOperationsMixin
+from .operations import BackupResourceStorageConfigsNonCRROperations
+from .operations import ProtectionIntentOperations
+from .operations import BackupStatusOperations
+from .operations import FeatureSupportOperations
+from .operations import BackupProtectionIntentOperations
+from .operations import BackupUsageSummariesOperations
+from .operations import Operations
 from .operations import BackupResourceVaultConfigsOperations
 from .operations import BackupResourceEncryptionConfigsOperations
 from .operations import PrivateEndpointConnectionOperations
@@ -60,12 +67,6 @@
 from .operations import BackupResourceStorageConfigsOperations
 from .operations import RecoveryPointsCrrOperations
 from .operations import BackupProtectedItemsCrrOperations
-from .operations import ProtectionIntentOperations
-from .operations import BackupStatusOperations
-from .operations import FeatureSupportOperations
-from .operations import BackupProtectionIntentOperations
-from .operations import BackupUsageSummariesOperations
-from .operations import Operations
 from . import models
 
 
@@ -75,6 +76,20 @@ class RecoveryServicesBackupClient(RecoveryServicesBackupClientOperationsMixin,
     :ivar config: Configuration for client.
     :vartype config: RecoveryServicesBackupClientConfiguration
 
+    :ivar backup_resource_storage_configs_non_crr: BackupResourceStorageConfigsNonCRR operations
+    :vartype backup_resource_storage_configs_non_crr: azure.mgmt.recoveryservicesbackup.operations.BackupResourceStorageConfigsNonCRROperations
+    :ivar protection_intent: ProtectionIntent operations
+    :vartype protection_intent: azure.mgmt.recoveryservicesbackup.operations.ProtectionIntentOperations
+    :ivar backup_status: BackupStatus operations
+    :vartype backup_status: azure.mgmt.recoveryservicesbackup.operations.BackupStatusOperations
+    :ivar feature_support: FeatureSupport operations
+    :vartype feature_support: azure.mgmt.recoveryservicesbackup.operations.FeatureSupportOperations
+    :ivar backup_protection_intent: BackupProtectionIntent operations
+    :vartype backup_protection_intent: azure.mgmt.recoveryservicesbackup.operations.BackupProtectionIntentOperations
+    :ivar backup_usage_summaries: BackupUsageSummaries operations
+    :vartype backup_usage_summaries: azure.mgmt.recoveryservicesbackup.operations.BackupUsageSummariesOperations
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.recoveryservicesbackup.operations.Operations
     :ivar backup_resource_vault_configs: BackupResourceVaultConfigs operations
     :vartype backup_resource_vault_configs: azure.mgmt.recoveryservicesbackup.operations.BackupResourceVaultConfigsOperations
     :ivar backup_resource_encryption_configs: BackupResourceEncryptionConfigs operations
@@ -167,18 +182,6 @@ class RecoveryServicesBackupClient(RecoveryServicesBackupClientOperationsMixin,
     :vartype recovery_points_crr: azure.mgmt.recoveryservicesbackup.operations.RecoveryPointsCrrOperations
     :ivar backup_protected_items_crr: BackupProtectedItemsCrr operations
     :vartype backup_protected_items_crr: azure.mgmt.recoveryservicesbackup.operations.BackupProtectedItemsCrrOperations
-    :ivar protection_intent: ProtectionIntent operations
-    :vartype protection_intent: azure.mgmt.recoveryservicesbackup.operations.ProtectionIntentOperations
-    :ivar backup_status: BackupStatus operations
-    :vartype backup_status: azure.mgmt.recoveryservicesbackup.operations.BackupStatusOperations
-    :ivar feature_support: FeatureSupport operations
-    :vartype feature_support: azure.mgmt.recoveryservicesbackup.operations.FeatureSupportOperations
-    :ivar backup_protection_intent: BackupProtectionIntent operations
-    :vartype backup_protection_intent: azure.mgmt.recoveryservicesbackup.operations.BackupProtectionIntentOperations
-    :ivar backup_usage_summaries: BackupUsageSummaries operations
-    :vartype backup_usage_summaries: azure.mgmt.recoveryservicesbackup.operations.BackupUsageSummariesOperations
-    :ivar operations: Operations operations
-    :vartype operations: azure.mgmt.recoveryservicesbackup.operations.Operations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -198,6 +201,20 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
+        self.backup_resource_storage_configs_non_crr = BackupResourceStorageConfigsNonCRROperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.protection_intent = ProtectionIntentOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.backup_status = BackupStatusOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.feature_support = FeatureSupportOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.backup_protection_intent = BackupProtectionIntentOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.backup_usage_summaries = BackupUsageSummariesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.operations = Operations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.backup_resource_vault_configs = BackupResourceVaultConfigsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.backup_resource_encryption_configs = BackupResourceEncryptionConfigsOperations(
@@ -290,15 +307,3 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.backup_protected_items_crr = BackupProtectedItemsCrrOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.protection_intent = ProtectionIntentOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.backup_status = BackupStatusOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.feature_support = FeatureSupportOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.backup_protection_intent = BackupProtectionIntentOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.backup_usage_summaries = BackupUsageSummariesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.operations = Operations(
-            self._client, self.config, self._serialize, self._deserialize)

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

@@ -109,6 +109,8 @@
     from ._models_py3 import BackupResourceConfig
     from ._models_py3 import BackupResourceConfigResource
     from ._models_py3 import BackupResourceEncryptionConfig
+    from ._models_py3 import BackupResourceEncryptionConfigExtended
+    from ._models_py3 import BackupResourceEncryptionConfigExtendedResource
     from ._models_py3 import BackupResourceEncryptionConfigResource
     from ._models_py3 import BackupResourceVaultConfig
     from ._models_py3 import BackupResourceVaultConfigResource
@@ -380,6 +382,8 @@
     from ._models import BackupResourceConfig
     from ._models import BackupResourceConfigResource
     from ._models import BackupResourceEncryptionConfig
+    from ._models import BackupResourceEncryptionConfigExtended
+    from ._models import BackupResourceEncryptionConfigExtendedResource
     from ._models import BackupResourceEncryptionConfigResource
     from ._models import BackupResourceVaultConfig
     from ._models import BackupResourceVaultConfigResource
@@ -589,6 +593,8 @@
     SQLDataDirectoryType,
     RestorePointQueryType,
     RetentionDurationType,
+    StorageType,
+    StorageTypeState,
     BackupManagementType,
     JobStatus,
     JobOperationType,
@@ -603,26 +609,24 @@
     CreateMode,
     HealthState,
     ScheduleRunType,
-    StorageType,
-    StorageTypeState,
     EnhancedSecurityState,
     SoftDeleteFeatureState,
     AzureFileShareType,
     InquiryStatus,
     BackupType,
-    OperationType,
-    ContainerType,
+    SupportStatus,
     WorkloadItemType,
-    ProtectionStatus,
-    BackupItemType,
-    OperationStatusValues,
-    RehydrationPriority,
     UsagesUnit,
-    Type,
-    SupportStatus,
+    ProtectionStatus,
     FabricName,
+    Type,
     ValidationStatus,
     IntentItemType,
+    OperationType,
+    ContainerType,
+    BackupItemType,
+    OperationStatusValues,
+    RehydrationPriority,
 )
 
 __all__ = [
@@ -725,6 +729,8 @@
     'BackupResourceConfig',
     'BackupResourceConfigResource',
     'BackupResourceEncryptionConfig',
+    'BackupResourceEncryptionConfigExtended',
+    'BackupResourceEncryptionConfigExtendedResource',
     'BackupResourceEncryptionConfigResource',
     'BackupResourceVaultConfig',
     'BackupResourceVaultConfigResource',
@@ -896,6 +902,9 @@
     'WorkloadProtectableItem',
     'WorkloadProtectableItemResource',
     'YearlyRetentionSchedule',
+    'ProtectionIntentResourcePaged',
+    'BackupManagementUsagePaged',
+    'ClientDiscoveryValueForSingleApiPaged',
     'RecoveryPointResourcePaged',
     'ProtectionPolicyResourcePaged',
     'JobResourcePaged',
@@ -905,9 +914,6 @@
     'WorkloadItemResourcePaged',
     'WorkloadProtectableItemResourcePaged',
     'ProtectionContainerResourcePaged',
-    'BackupManagementUsagePaged',
-    'ProtectionIntentResourcePaged',
-    'ClientDiscoveryValueForSingleApiPaged',
     'EncryptionAtRestType',
     'LastUpdateStatus',
     'InfrastructureEncryptionState',
@@ -933,6 +939,8 @@
     'SQLDataDirectoryType',
     'RestorePointQueryType',
     'RetentionDurationType',
+    'StorageType',
+    'StorageTypeState',
     'BackupManagementType',
     'JobStatus',
     'JobOperationType',
@@ -947,24 +955,22 @@
     'CreateMode',
     'HealthState',
     'ScheduleRunType',
-    'StorageType',
-    'StorageTypeState',
     'EnhancedSecurityState',
     'SoftDeleteFeatureState',
     'AzureFileShareType',
     'InquiryStatus',
     'BackupType',
-    'OperationType',
-    'ContainerType',
+    'SupportStatus',
     'WorkloadItemType',
-    'ProtectionStatus',
-    'BackupItemType',
-    'OperationStatusValues',
-    'RehydrationPriority',
     'UsagesUnit',
-    'Type',
-    'SupportStatus',
+    'ProtectionStatus',
     'FabricName',
+    'Type',
     'ValidationStatus',
     'IntentItemType',
+    'OperationType',
+    'ContainerType',
+    'BackupItemType',
+    'OperationStatusValues',
+    'RehydrationPriority',
 ]

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

@@ -6531,7 +6531,7 @@ class BackupResourceEncryptionConfig(Model):
     :type subscription_id: str
     :param last_update_status: Possible values include: 'Invalid',
      'NotEnabled', 'PartiallySucceeded', 'PartiallyFailed', 'Failed',
-     'Succeeded'
+     'Succeeded', 'Initialized', 'FirstInitialization'
     :type last_update_status: str or
      ~azure.mgmt.recoveryservicesbackup.models.LastUpdateStatus
     :param infrastructure_encryption_state: Possible values include:
@@ -6557,6 +6557,95 @@ def __init__(self, **kwargs):
         self.infrastructure_encryption_state = kwargs.get('infrastructure_encryption_state', None)
 
 
+class BackupResourceEncryptionConfigExtended(BackupResourceEncryptionConfig):
+    """BackupResourceEncryptionConfigExtended.
+
+    :param encryption_at_rest_type: Encryption At Rest Type. Possible values
+     include: 'Invalid', 'MicrosoftManaged', 'CustomerManaged'
+    :type encryption_at_rest_type: str or
+     ~azure.mgmt.recoveryservicesbackup.models.EncryptionAtRestType
+    :param key_uri: Key Vault Key URI
+    :type key_uri: str
+    :param subscription_id: Key Vault Subscription Id
+    :type subscription_id: str
+    :param last_update_status: Possible values include: 'Invalid',
+     'NotEnabled', 'PartiallySucceeded', 'PartiallyFailed', 'Failed',
+     'Succeeded', 'Initialized', 'FirstInitialization'
+    :type last_update_status: str or
+     ~azure.mgmt.recoveryservicesbackup.models.LastUpdateStatus
+    :param infrastructure_encryption_state: Possible values include:
+     'Invalid', 'Disabled', 'Enabled'
+    :type infrastructure_encryption_state: str or
+     ~azure.mgmt.recoveryservicesbackup.models.InfrastructureEncryptionState
+    :param user_assigned_identity: User Assigned Identity Id
+    :type user_assigned_identity: str
+    :param use_system_assigned_identity: bool to indicate whether to use
+     system Assigned Identity or not
+    :type use_system_assigned_identity: bool
+    """
+
+    _attribute_map = {
+        'encryption_at_rest_type': {'key': 'encryptionAtRestType', 'type': 'str'},
+        'key_uri': {'key': 'keyUri', 'type': 'str'},
+        'subscription_id': {'key': 'subscriptionId', 'type': 'str'},
+        'last_update_status': {'key': 'lastUpdateStatus', 'type': 'str'},
+        'infrastructure_encryption_state': {'key': 'infrastructureEncryptionState', 'type': 'str'},
+        'user_assigned_identity': {'key': 'userAssignedIdentity', 'type': 'str'},
+        'use_system_assigned_identity': {'key': 'useSystemAssignedIdentity', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BackupResourceEncryptionConfigExtended, self).__init__(**kwargs)
+        self.user_assigned_identity = kwargs.get('user_assigned_identity', None)
+        self.use_system_assigned_identity = kwargs.get('use_system_assigned_identity', None)
+
+
+class BackupResourceEncryptionConfigExtendedResource(Resource):
+    """BackupResourceEncryptionConfigExtendedResource.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id represents the complete path to the resource.
+    :vartype id: str
+    :ivar name: Resource name associated with the resource.
+    :vartype name: str
+    :ivar type: Resource type represents the complete path of the form
+     Namespace/ResourceType/ResourceType/...
+    :vartype type: str
+    :param location: Resource location.
+    :type location: str
+    :param tags: Resource tags.
+    :type tags: dict[str, str]
+    :param e_tag: Optional ETag.
+    :type e_tag: str
+    :param properties: BackupResourceEncryptionConfigExtendedResource
+     properties
+    :type properties:
+     ~azure.mgmt.recoveryservicesbackup.models.BackupResourceEncryptionConfigExtended
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'e_tag': {'key': 'eTag', 'type': 'str'},
+        'properties': {'key': 'properties', 'type': 'BackupResourceEncryptionConfigExtended'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BackupResourceEncryptionConfigExtendedResource, self).__init__(**kwargs)
+        self.properties = kwargs.get('properties', None)
+
+
 class BackupResourceEncryptionConfigResource(Resource):
     """BackupResourceEncryptionConfigResource.