[T1] sql 2020 11 04 (Azure#14996)

* Generated from d7216ae183c55f5117ed2417449f62635c834253

* test,version,changelog

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

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

@@ -83,6 +83,7 @@
 from .operations import ManagedInstanceKeysOperations
 from .operations import ManagedInstanceEncryptionProtectorsOperations
 from .operations import RecoverableManagedDatabasesOperations
+from .operations import BackupShortTermRetentionPoliciesOperations
 from .operations import ManagedInstanceVulnerabilityAssessmentsOperations
 from .operations import ServerVulnerabilityAssessmentsOperations
 from .operations import ManagedDatabaseSensitivityLabelsOperations
@@ -101,7 +102,6 @@
 from .operations import SyncGroupsOperations
 from .operations import SyncMembersOperations
 from .operations import ManagedInstancesOperations
-from .operations import BackupShortTermRetentionPoliciesOperations
 from .operations import ManagedDatabaseRestoreDetailsOperations
 from .operations import ManagedDatabasesOperations
 from .operations import ServerAzureADOnlyAuthenticationsOperations
@@ -257,6 +257,8 @@ class SqlManagementClient(SDKClient):
     :vartype managed_instance_encryption_protectors: azure.mgmt.sql.operations.ManagedInstanceEncryptionProtectorsOperations
     :ivar recoverable_managed_databases: RecoverableManagedDatabases operations
     :vartype recoverable_managed_databases: azure.mgmt.sql.operations.RecoverableManagedDatabasesOperations
+    :ivar backup_short_term_retention_policies: BackupShortTermRetentionPolicies operations
+    :vartype backup_short_term_retention_policies: azure.mgmt.sql.operations.BackupShortTermRetentionPoliciesOperations
     :ivar managed_instance_vulnerability_assessments: ManagedInstanceVulnerabilityAssessments operations
     :vartype managed_instance_vulnerability_assessments: azure.mgmt.sql.operations.ManagedInstanceVulnerabilityAssessmentsOperations
     :ivar server_vulnerability_assessments: ServerVulnerabilityAssessments operations
@@ -293,8 +295,6 @@ class SqlManagementClient(SDKClient):
     :vartype sync_members: azure.mgmt.sql.operations.SyncMembersOperations
     :ivar managed_instances: ManagedInstances operations
     :vartype managed_instances: azure.mgmt.sql.operations.ManagedInstancesOperations
-    :ivar backup_short_term_retention_policies: BackupShortTermRetentionPolicies operations
-    :vartype backup_short_term_retention_policies: azure.mgmt.sql.operations.BackupShortTermRetentionPoliciesOperations
     :ivar managed_database_restore_details: ManagedDatabaseRestoreDetails operations
     :vartype managed_database_restore_details: azure.mgmt.sql.operations.ManagedDatabaseRestoreDetailsOperations
     :ivar managed_databases: ManagedDatabases operations
@@ -467,6 +467,8 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.recoverable_managed_databases = RecoverableManagedDatabasesOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.backup_short_term_retention_policies = BackupShortTermRetentionPoliciesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.managed_instance_vulnerability_assessments = ManagedInstanceVulnerabilityAssessmentsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.server_vulnerability_assessments = ServerVulnerabilityAssessmentsOperations(
@@ -503,8 +505,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.managed_instances = ManagedInstancesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.backup_short_term_retention_policies = BackupShortTermRetentionPoliciesOperations(
-            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(

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

@@ -813,6 +813,7 @@
     'ManagedInstanceKeyPaged',
     'ManagedInstanceEncryptionProtectorPaged',
     'RecoverableManagedDatabasePaged',
+    'BackupShortTermRetentionPolicyPaged',
     'ManagedInstanceVulnerabilityAssessmentPaged',
     'ServerVulnerabilityAssessmentPaged',
     'InstancePoolPaged',
@@ -832,7 +833,6 @@
     'SyncGroupPaged',
     'SyncMemberPaged',
     'ManagedInstancePaged',
-    'BackupShortTermRetentionPolicyPaged',
     'ManagedDatabasePaged',
     'ServerAzureADOnlyAuthenticationPaged',
     'ManagedInstanceAzureADOnlyAuthenticationPaged',

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

@@ -280,11 +280,6 @@ class BackupShortTermRetentionPolicy(ProxyResource):
     :param retention_days: The backup retention period in days. This is how
      many days Point-in-Time Restore will be supported.
     :type retention_days: int
-    :param diff_backup_interval_in_hours: The differential backup interval in
-     hours. This is how many interval hours between each differential backup
-     will be supported. This is only applicable to live databases but not
-     dropped databases.
-    :type diff_backup_interval_in_hours: int
     """
 
     _validation = {
@@ -298,13 +293,11 @@ class BackupShortTermRetentionPolicy(ProxyResource):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'retention_days': {'key': 'properties.retentionDays', 'type': 'int'},
-        'diff_backup_interval_in_hours': {'key': 'properties.diffBackupIntervalInHours', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(BackupShortTermRetentionPolicy, self).__init__(**kwargs)
         self.retention_days = kwargs.get('retention_days', None)
-        self.diff_backup_interval_in_hours = kwargs.get('diff_backup_interval_in_hours', None)
 
 
 class CheckNameAvailabilityRequest(Model):

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

@@ -280,11 +280,6 @@ class BackupShortTermRetentionPolicy(ProxyResource):
     :param retention_days: The backup retention period in days. This is how
      many days Point-in-Time Restore will be supported.
     :type retention_days: int
-    :param diff_backup_interval_in_hours: The differential backup interval in
-     hours. This is how many interval hours between each differential backup
-     will be supported. This is only applicable to live databases but not
-     dropped databases.
-    :type diff_backup_interval_in_hours: int
     """
 
     _validation = {
@@ -298,13 +293,11 @@ class BackupShortTermRetentionPolicy(ProxyResource):
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
         'retention_days': {'key': 'properties.retentionDays', 'type': 'int'},
-        'diff_backup_interval_in_hours': {'key': 'properties.diffBackupIntervalInHours', 'type': 'int'},
     }
 
-    def __init__(self, *, retention_days: int=None, diff_backup_interval_in_hours: int=None, **kwargs) -> None:
+    def __init__(self, *, retention_days: int=None, **kwargs) -> None:
         super(BackupShortTermRetentionPolicy, self).__init__(**kwargs)
         self.retention_days = retention_days
-        self.diff_backup_interval_in_hours = diff_backup_interval_in_hours
 
 
 class CheckNameAvailabilityRequest(Model):

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

@@ -766,6 +766,19 @@ class RecoverableManagedDatabasePaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(RecoverableManagedDatabasePaged, self).__init__(*args, **kwargs)
+class BackupShortTermRetentionPolicyPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`BackupShortTermRetentionPolicy <azure.mgmt.sql.models.BackupShortTermRetentionPolicy>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[BackupShortTermRetentionPolicy]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(BackupShortTermRetentionPolicyPaged, self).__init__(*args, **kwargs)
 class ManagedInstanceVulnerabilityAssessmentPaged(Paged):
     """
     A paging container for iterating over a list of :class:`ManagedInstanceVulnerabilityAssessment <azure.mgmt.sql.models.ManagedInstanceVulnerabilityAssessment>` object
@@ -1013,19 +1026,6 @@ class ManagedInstancePaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(ManagedInstancePaged, self).__init__(*args, **kwargs)
-class BackupShortTermRetentionPolicyPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`BackupShortTermRetentionPolicy <azure.mgmt.sql.models.BackupShortTermRetentionPolicy>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[BackupShortTermRetentionPolicy]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(BackupShortTermRetentionPolicyPaged, self).__init__(*args, **kwargs)
 class ManagedDatabasePaged(Paged):
     """
     A paging container for iterating over a list of :class:`ManagedDatabase <azure.mgmt.sql.models.ManagedDatabase>` object

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

@@ -79,6 +79,7 @@
 from ._managed_instance_keys_operations import ManagedInstanceKeysOperations
 from ._managed_instance_encryption_protectors_operations import ManagedInstanceEncryptionProtectorsOperations
 from ._recoverable_managed_databases_operations import RecoverableManagedDatabasesOperations
+from ._backup_short_term_retention_policies_operations import BackupShortTermRetentionPoliciesOperations
 from ._managed_instance_vulnerability_assessments_operations import ManagedInstanceVulnerabilityAssessmentsOperations
 from ._server_vulnerability_assessments_operations import ServerVulnerabilityAssessmentsOperations
 from ._managed_database_sensitivity_labels_operations import ManagedDatabaseSensitivityLabelsOperations
@@ -97,7 +98,6 @@
 from ._sync_groups_operations import SyncGroupsOperations
 from ._sync_members_operations import SyncMembersOperations
 from ._managed_instances_operations import ManagedInstancesOperations
-from ._backup_short_term_retention_policies_operations import BackupShortTermRetentionPoliciesOperations
 from ._managed_database_restore_details_operations import ManagedDatabaseRestoreDetailsOperations
 from ._managed_databases_operations import ManagedDatabasesOperations
 from ._server_azure_ad_only_authentications_operations import ServerAzureADOnlyAuthenticationsOperations
@@ -176,6 +176,7 @@
     'ManagedInstanceKeysOperations',
     'ManagedInstanceEncryptionProtectorsOperations',
     'RecoverableManagedDatabasesOperations',
+    'BackupShortTermRetentionPoliciesOperations',
     'ManagedInstanceVulnerabilityAssessmentsOperations',
     'ServerVulnerabilityAssessmentsOperations',
     'ManagedDatabaseSensitivityLabelsOperations',
@@ -194,7 +195,6 @@
     'SyncGroupsOperations',
     'SyncMembersOperations',
     'ManagedInstancesOperations',
-    'BackupShortTermRetentionPoliciesOperations',
     'ManagedDatabaseRestoreDetailsOperations',
     'ManagedDatabasesOperations',
     'ServerAzureADOnlyAuthenticationsOperations',

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_backup_short_term_retention_policies_operations.py

@@ -28,7 +28,7 @@ class BackupShortTermRetentionPoliciesOperations(object):
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
     :ivar policy_name: The policy name. Should always be "default". Constant value: "default".
-    :ivar api_version: The API version to use for the request. Constant value: "2020-02-02-preview".
+    :ivar api_version: The API version to use for the request. Constant value: "2017-10-01-preview".
     """
 
     models = models
@@ -39,7 +39,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._serialize = serializer
         self._deserialize = deserializer
         self.policy_name = "default"
-        self.api_version = "2020-02-02-preview"
+        self.api_version = "2017-10-01-preview"
 
         self.config = config
 
@@ -113,8 +113,8 @@ def get(
 
 
     def _create_or_update_initial(
-            self, resource_group_name, server_name, database_name, retention_days=None, diff_backup_interval_in_hours=None, custom_headers=None, raw=False, **operation_config):
-        parameters = models.BackupShortTermRetentionPolicy(retention_days=retention_days, diff_backup_interval_in_hours=diff_backup_interval_in_hours)
+            self, resource_group_name, server_name, database_name, retention_days=None, custom_headers=None, raw=False, **operation_config):
+        parameters = models.BackupShortTermRetentionPolicy(retention_days=retention_days)
 
         # Construct URL
         url = self.create_or_update.metadata['url']
@@ -166,7 +166,7 @@ def _create_or_update_initial(
         return deserialized
 
     def create_or_update(
-            self, resource_group_name, server_name, database_name, retention_days=None, diff_backup_interval_in_hours=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, server_name, database_name, retention_days=None, custom_headers=None, raw=False, polling=True, **operation_config):
         """Updates a database's short term retention policy.
 
         :param resource_group_name: The name of the resource group that
@@ -180,11 +180,6 @@ def create_or_update(
         :param retention_days: The backup retention period in days. This is
          how many days Point-in-Time Restore will be supported.
         :type retention_days: int
-        :param diff_backup_interval_in_hours: The differential backup interval
-         in hours. This is how many interval hours between each differential
-         backup will be supported. This is only applicable to live databases
-         but not dropped databases.
-        :type diff_backup_interval_in_hours: int
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
          direct response alongside the deserialized response
@@ -204,7 +199,6 @@ def create_or_update(
             server_name=server_name,
             database_name=database_name,
             retention_days=retention_days,
-            diff_backup_interval_in_hours=diff_backup_interval_in_hours,
             custom_headers=custom_headers,
             raw=True,
             **operation_config
@@ -230,8 +224,8 @@ def get_long_running_output(response):
 
 
     def _update_initial(
-            self, resource_group_name, server_name, database_name, retention_days=None, diff_backup_interval_in_hours=None, custom_headers=None, raw=False, **operation_config):
-        parameters = models.BackupShortTermRetentionPolicy(retention_days=retention_days, diff_backup_interval_in_hours=diff_backup_interval_in_hours)
+            self, resource_group_name, server_name, database_name, retention_days=None, custom_headers=None, raw=False, **operation_config):
+        parameters = models.BackupShortTermRetentionPolicy(retention_days=retention_days)
 
         # Construct URL
         url = self.update.metadata['url']
@@ -283,7 +277,7 @@ def _update_initial(
         return deserialized
 
     def update(
-            self, resource_group_name, server_name, database_name, retention_days=None, diff_backup_interval_in_hours=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, server_name, database_name, retention_days=None, custom_headers=None, raw=False, polling=True, **operation_config):
         """Updates a database's short term retention policy.
 
         :param resource_group_name: The name of the resource group that
@@ -297,11 +291,6 @@ def update(
         :param retention_days: The backup retention period in days. This is
          how many days Point-in-Time Restore will be supported.
         :type retention_days: int
-        :param diff_backup_interval_in_hours: The differential backup interval
-         in hours. This is how many interval hours between each differential
-         backup will be supported. This is only applicable to live databases
-         but not dropped databases.
-        :type diff_backup_interval_in_hours: int
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
          direct response alongside the deserialized response
@@ -321,7 +310,6 @@ def update(
             server_name=server_name,
             database_name=database_name,
             retention_days=retention_days,
-            diff_backup_interval_in_hours=diff_backup_interval_in_hours,
             custom_headers=custom_headers,
             raw=True,
             **operation_config

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

@@ -9,4 +9,4 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.23.0"
+VERSION = "0.24.0"