Update from release/v3

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py

@@ -98,12 +98,12 @@
 from .operations import ManagedInstanceLongTermRetentionPoliciesOperations
 from .operations import WorkloadGroupsOperations
 from .operations import WorkloadClassifiersOperations
-from .operations import ManagedDatabaseRestoreDetailsOperations
-from .operations import ManagedDatabasesOperations
 from .operations import ServerAzureADAdministratorsOperations
 from .operations import ManagedInstanceOperations
 from .operations import SyncGroupsOperations
 from .operations import SyncMembersOperations
+from .operations import ManagedDatabaseRestoreDetailsOperations
+from .operations import ManagedDatabasesOperations
 from . import models
 
 
@@ -283,10 +283,6 @@ class SqlManagementClient(SDKClient):
     :vartype workload_groups: azure.mgmt.sql.operations.WorkloadGroupsOperations
     :ivar workload_classifiers: WorkloadClassifiers operations
     :vartype workload_classifiers: azure.mgmt.sql.operations.WorkloadClassifiersOperations
-    :ivar managed_database_restore_details: ManagedDatabaseRestoreDetails operations
-    :vartype managed_database_restore_details: azure.mgmt.sql.operations.ManagedDatabaseRestoreDetailsOperations
-    :ivar managed_databases: ManagedDatabases operations
-    :vartype managed_databases: azure.mgmt.sql.operations.ManagedDatabasesOperations
     :ivar server_azure_ad_administrators: ServerAzureADAdministrators operations
     :vartype server_azure_ad_administrators: azure.mgmt.sql.operations.ServerAzureADAdministratorsOperations
     :ivar managed_instance_operations: ManagedInstanceOperations operations
@@ -295,6 +291,10 @@ class SqlManagementClient(SDKClient):
     :vartype sync_groups: azure.mgmt.sql.operations.SyncGroupsOperations
     :ivar sync_members: SyncMembers operations
     :vartype sync_members: azure.mgmt.sql.operations.SyncMembersOperations
+    :ivar managed_database_restore_details: ManagedDatabaseRestoreDetails operations
+    :vartype managed_database_restore_details: azure.mgmt.sql.operations.ManagedDatabaseRestoreDetailsOperations
+    :ivar managed_databases: ManagedDatabases operations
+    :vartype managed_databases: azure.mgmt.sql.operations.ManagedDatabasesOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -485,10 +485,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.workload_classifiers = WorkloadClassifiersOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.managed_database_restore_details = ManagedDatabaseRestoreDetailsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.managed_databases = ManagedDatabasesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.server_azure_ad_administrators = ServerAzureADAdministratorsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.managed_instance_operations = ManagedInstanceOperations(
@@ -497,3 +493,7 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.sync_members = SyncMembersOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.managed_database_restore_details = ManagedDatabaseRestoreDetailsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.managed_databases = ManagedDatabasesOperations(
+            self._client, self.config, self._serialize, self._deserialize)

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py

@@ -96,6 +96,8 @@
     from ._models_py3 import ManagedInstanceLongTermRetentionBackup
     from ._models_py3 import ManagedInstanceLongTermRetentionPolicy
     from ._models_py3 import ManagedInstanceOperation
+    from ._models_py3 import ManagedInstanceOperationParametersPair
+    from ._models_py3 import ManagedInstanceOperationSteps
     from ._models_py3 import ManagedInstancePairInfo
     from ._models_py3 import ManagedInstanceUpdate
     from ._models_py3 import ManagedInstanceVcoresCapability
@@ -178,6 +180,8 @@
     from ._models_py3 import TransparentDataEncryption
     from ._models_py3 import TransparentDataEncryptionActivity
     from ._models_py3 import UnlinkParameters
+    from ._models_py3 import UpsertManagedServerOperationParameters
+    from ._models_py3 import UpsertManagedServerOperationStep
     from ._models_py3 import Usage
     from ._models_py3 import VirtualCluster
     from ._models_py3 import VirtualClusterUpdate
@@ -274,6 +278,8 @@
     from ._models import ManagedInstanceLongTermRetentionBackup
     from ._models import ManagedInstanceLongTermRetentionPolicy
     from ._models import ManagedInstanceOperation
+    from ._models import ManagedInstanceOperationParametersPair
+    from ._models import ManagedInstanceOperationSteps
     from ._models import ManagedInstancePairInfo
     from ._models import ManagedInstanceUpdate
     from ._models import ManagedInstanceVcoresCapability
@@ -356,6 +362,8 @@
     from ._models import TransparentDataEncryption
     from ._models import TransparentDataEncryptionActivity
     from ._models import UnlinkParameters
+    from ._models import UpsertManagedServerOperationParameters
+    from ._models import UpsertManagedServerOperationStep
     from ._models import Usage
     from ._models import VirtualCluster
     from ._models import VirtualClusterUpdate
@@ -521,13 +529,13 @@
     CapabilityStatus,
     PerformanceLevelUnit,
     PauseDelayTimeUnit,
-    ManagedDatabaseStatus,
-    ManagedDatabaseCreateMode,
     SyncGroupLogType,
     SyncConflictResolutionPolicy,
     SyncGroupState,
     SyncDirection,
     SyncMemberState,
+    ManagedDatabaseStatus,
+    ManagedDatabaseCreateMode,
     LongTermRetentionDatabaseState,
     VulnerabilityAssessmentPolicyBaselineName,
     SensitivityLabelSource,
@@ -628,6 +636,8 @@
     'ManagedInstanceLongTermRetentionBackup',
     'ManagedInstanceLongTermRetentionPolicy',
     'ManagedInstanceOperation',
+    'ManagedInstanceOperationParametersPair',
+    'ManagedInstanceOperationSteps',
     'ManagedInstancePairInfo',
     'ManagedInstanceUpdate',
     'ManagedInstanceVcoresCapability',
@@ -710,6 +720,8 @@
     'TransparentDataEncryption',
     'TransparentDataEncryptionActivity',
     'UnlinkParameters',
+    'UpsertManagedServerOperationParameters',
+    'UpsertManagedServerOperationStep',
     'Usage',
     'VirtualCluster',
     'VirtualClusterUpdate',
@@ -790,14 +802,14 @@
     'ManagedInstanceLongTermRetentionPolicyPaged',
     'WorkloadGroupPaged',
     'WorkloadClassifierPaged',
-    'ManagedDatabasePaged',
     'ServerAzureADAdministratorPaged',
     'ManagedInstanceOperationPaged',
     'SyncDatabaseIdPropertiesPaged',
     'SyncFullSchemaPropertiesPaged',
     'SyncGroupLogPropertiesPaged',
     'SyncGroupPaged',
     'SyncMemberPaged',
+    'ManagedDatabasePaged',
     'ServerConnectionType',
     'SecurityAlertPolicyState',
     'SecurityAlertPolicyEmailAccountAdmins',
@@ -874,13 +886,13 @@
     'CapabilityStatus',
     'PerformanceLevelUnit',
     'PauseDelayTimeUnit',
-    'ManagedDatabaseStatus',
-    'ManagedDatabaseCreateMode',
     'SyncGroupLogType',
     'SyncConflictResolutionPolicy',
     'SyncGroupState',
     'SyncDirection',
     'SyncMemberState',
+    'ManagedDatabaseStatus',
+    'ManagedDatabaseCreateMode',
     'LongTermRetentionDatabaseState',
     'VulnerabilityAssessmentPolicyBaselineName',
     'SensitivityLabelSource',

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models.py

@@ -4740,6 +4740,12 @@ class ManagedDatabase(TrackedResource):
     :param long_term_retention_backup_resource_id: The name of the Long Term
      Retention backup to be used for restore of this managed database.
     :type long_term_retention_backup_resource_id: str
+    :param auto_complete_restore: Whether to auto complete restore of this
+     managed database.
+    :type auto_complete_restore: bool
+    :param last_backup_name: Last backup file name for restore of this managed
+     database.
+    :type last_backup_name: str
     """
 
     _validation = {
@@ -4775,6 +4781,8 @@ class ManagedDatabase(TrackedResource):
         'failover_group_id': {'key': 'properties.failoverGroupId', 'type': 'str'},
         'recoverable_database_id': {'key': 'properties.recoverableDatabaseId', 'type': 'str'},
         'long_term_retention_backup_resource_id': {'key': 'properties.longTermRetentionBackupResourceId', 'type': 'str'},
+        'auto_complete_restore': {'key': 'properties.autoCompleteRestore', 'type': 'bool'},
+        'last_backup_name': {'key': 'properties.lastBackupName', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -4794,6 +4802,8 @@ def __init__(self, **kwargs):
         self.failover_group_id = None
         self.recoverable_database_id = kwargs.get('recoverable_database_id', None)
         self.long_term_retention_backup_resource_id = kwargs.get('long_term_retention_backup_resource_id', None)
+        self.auto_complete_restore = kwargs.get('auto_complete_restore', None)
+        self.last_backup_name = kwargs.get('last_backup_name', None)
 
 
 class ManagedDatabaseRestoreDetailsResult(ProxyResource):
@@ -5015,6 +5025,12 @@ class ManagedDatabaseUpdate(Model):
     :param long_term_retention_backup_resource_id: The name of the Long Term
      Retention backup to be used for restore of this managed database.
     :type long_term_retention_backup_resource_id: str
+    :param auto_complete_restore: Whether to auto complete restore of this
+     managed database.
+    :type auto_complete_restore: bool
+    :param last_backup_name: Last backup file name for restore of this managed
+     database.
+    :type last_backup_name: str
     :param tags: Resource tags.
     :type tags: dict[str, str]
     """
@@ -5043,6 +5059,8 @@ class ManagedDatabaseUpdate(Model):
         'failover_group_id': {'key': 'properties.failoverGroupId', 'type': 'str'},
         'recoverable_database_id': {'key': 'properties.recoverableDatabaseId', 'type': 'str'},
         'long_term_retention_backup_resource_id': {'key': 'properties.longTermRetentionBackupResourceId', 'type': 'str'},
+        'auto_complete_restore': {'key': 'properties.autoCompleteRestore', 'type': 'bool'},
+        'last_backup_name': {'key': 'properties.lastBackupName', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
     }
 
@@ -5063,6 +5081,8 @@ def __init__(self, **kwargs):
         self.failover_group_id = None
         self.recoverable_database_id = kwargs.get('recoverable_database_id', None)
         self.long_term_retention_backup_resource_id = kwargs.get('long_term_retention_backup_resource_id', None)
+        self.auto_complete_restore = kwargs.get('auto_complete_restore', None)
+        self.last_backup_name = kwargs.get('last_backup_name', None)
         self.tags = kwargs.get('tags', None)
 
 
@@ -5649,6 +5669,12 @@ class ManagedInstanceOperation(ProxyResource):
     :vartype description: str
     :ivar is_cancellable: Whether the operation can be cancelled.
     :vartype is_cancellable: bool
+    :ivar operation_parameters: The operation parameters.
+    :vartype operation_parameters:
+     ~azure.mgmt.sql.models.ManagedInstanceOperationParametersPair
+    :ivar operation_steps: The operation steps.
+    :vartype operation_steps:
+     ~azure.mgmt.sql.models.ManagedInstanceOperationSteps
     """
 
     _validation = {
@@ -5668,6 +5694,8 @@ class ManagedInstanceOperation(ProxyResource):
         'estimated_completion_time': {'readonly': True},
         'description': {'readonly': True},
         'is_cancellable': {'readonly': True},
+        'operation_parameters': {'readonly': True},
+        'operation_steps': {'readonly': True},
     }
 
     _attribute_map = {
@@ -5687,6 +5715,8 @@ class ManagedInstanceOperation(ProxyResource):
         'estimated_completion_time': {'key': 'properties.estimatedCompletionTime', 'type': 'iso-8601'},
         'description': {'key': 'properties.description', 'type': 'str'},
         'is_cancellable': {'key': 'properties.isCancellable', 'type': 'bool'},
+        'operation_parameters': {'key': 'properties.operationParameters', 'type': 'ManagedInstanceOperationParametersPair'},
+        'operation_steps': {'key': 'properties.operationSteps', 'type': 'ManagedInstanceOperationSteps'},
     }
 
     def __init__(self, **kwargs):
@@ -5704,6 +5734,72 @@ def __init__(self, **kwargs):
         self.estimated_completion_time = None
         self.description = None
         self.is_cancellable = None
+        self.operation_parameters = None
+        self.operation_steps = None
+
+
+class ManagedInstanceOperationParametersPair(Model):
+    """The parameters of a managed instance operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar current_parameters: The current parameters.
+    :vartype current_parameters:
+     ~azure.mgmt.sql.models.UpsertManagedServerOperationParameters
+    :ivar requested_parameters: The requested parameters.
+    :vartype requested_parameters:
+     ~azure.mgmt.sql.models.UpsertManagedServerOperationParameters
+    """
+
+    _validation = {
+        'current_parameters': {'readonly': True},
+        'requested_parameters': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'current_parameters': {'key': 'currentParameters', 'type': 'UpsertManagedServerOperationParameters'},
+        'requested_parameters': {'key': 'requestedParameters', 'type': 'UpsertManagedServerOperationParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ManagedInstanceOperationParametersPair, self).__init__(**kwargs)
+        self.current_parameters = None
+        self.requested_parameters = None
+
+
+class ManagedInstanceOperationSteps(Model):
+    """The steps of a managed instance operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar total_steps: The total number of operation steps.
+    :vartype total_steps: str
+    :ivar current_step: The number of current operation steps.
+    :vartype current_step: int
+    :ivar steps_list: The operation steps list.
+    :vartype steps_list:
+     list[~azure.mgmt.sql.models.UpsertManagedServerOperationStep]
+    """
+
+    _validation = {
+        'total_steps': {'readonly': True},
+        'current_step': {'readonly': True},
+        'steps_list': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'total_steps': {'key': 'totalSteps', 'type': 'str'},
+        'current_step': {'key': 'currentStep', 'type': 'int'},
+        'steps_list': {'key': 'stepsList', 'type': '[UpsertManagedServerOperationStep]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ManagedInstanceOperationSteps, self).__init__(**kwargs)
+        self.total_steps = None
+        self.current_step = None
+        self.steps_list = None
 
 
 class ManagedInstancePairInfo(Model):
@@ -9695,6 +9791,59 @@ def __init__(self, **kwargs):
         self.forced_termination = kwargs.get('forced_termination', None)
 
 
+class UpsertManagedServerOperationParameters(Model):
+    """UpsertManagedServerOperationParameters.
+
+    :param family:
+    :type family: str
+    :param tier:
+    :type tier: str
+    :param v_cores:
+    :type v_cores: int
+    :param storage_size_in_gb:
+    :type storage_size_in_gb: int
+    """
+
+    _attribute_map = {
+        'family': {'key': 'family', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+        'v_cores': {'key': 'vCores', 'type': 'int'},
+        'storage_size_in_gb': {'key': 'storageSizeInGB', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpsertManagedServerOperationParameters, self).__init__(**kwargs)
+        self.family = kwargs.get('family', None)
+        self.tier = kwargs.get('tier', None)
+        self.v_cores = kwargs.get('v_cores', None)
+        self.storage_size_in_gb = kwargs.get('storage_size_in_gb', None)
+
+
+class UpsertManagedServerOperationStep(Model):
+    """UpsertManagedServerOperationStep.
+
+    :param order:
+    :type order: int
+    :param name:
+    :type name: str
+    :param status: Possible values include: 'NotStarted', 'InProgress',
+     'SlowedDown', 'Completed', 'Failed', 'Canceled'
+    :type status: str or ~azure.mgmt.sql.models.enum
+    """
+
+    _attribute_map = {
+        'order': {'key': 'order', 'type': 'int'},
+        'name': {'key': 'name', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpsertManagedServerOperationStep, self).__init__(**kwargs)
+        self.order = kwargs.get('order', None)
+        self.name = kwargs.get('name', None)
+        self.status = kwargs.get('status', None)
+
+
 class Usage(Model):
     """ARM usage.