Generated from 6d7d583a7f0bc7ce5561295515ac2aa6eafa5e19

merge with master & solve conflict

Author: SDK Automation

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

@@ -78,7 +78,6 @@
 from .operations import ManagedDatabaseVulnerabilityAssessmentScansOperations
 from .operations import ManagedDatabaseVulnerabilityAssessmentsOperations
 from .operations import InstanceFailoverGroupsOperations
-from .operations import BackupShortTermRetentionPoliciesOperations
 from .operations import TdeCertificatesOperations
 from .operations import ManagedInstanceTdeCertificatesOperations
 from .operations import ManagedInstanceKeysOperations
@@ -89,7 +88,6 @@
 from .operations import ManagedDatabaseSensitivityLabelsOperations
 from .operations import InstancePoolsOperations
 from .operations import UsagesOperations
-from .operations import ManagedInstancesOperations
 from .operations import PrivateEndpointConnectionsOperations
 from .operations import PrivateLinkResourcesOperations
 from .operations import ServersOperations
@@ -98,12 +96,15 @@
 from .operations import ManagedInstanceLongTermRetentionPoliciesOperations
 from .operations import WorkloadGroupsOperations
 from .operations import WorkloadClassifiersOperations
-from .operations import ServerAzureADAdministratorsOperations
 from .operations import ManagedInstanceOperations
+from .operations import ServerAzureADAdministratorsOperations
 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
 from . import models
 
 
@@ -243,8 +244,6 @@ class SqlManagementClient(SDKClient):
     :vartype managed_database_vulnerability_assessments: azure.mgmt.sql.operations.ManagedDatabaseVulnerabilityAssessmentsOperations
     :ivar instance_failover_groups: InstanceFailoverGroups operations
     :vartype instance_failover_groups: azure.mgmt.sql.operations.InstanceFailoverGroupsOperations
-    :ivar backup_short_term_retention_policies: BackupShortTermRetentionPolicies operations
-    :vartype backup_short_term_retention_policies: azure.mgmt.sql.operations.BackupShortTermRetentionPoliciesOperations
     :ivar tde_certificates: TdeCertificates operations
     :vartype tde_certificates: azure.mgmt.sql.operations.TdeCertificatesOperations
     :ivar managed_instance_tde_certificates: ManagedInstanceTdeCertificates operations
@@ -265,8 +264,6 @@ class SqlManagementClient(SDKClient):
     :vartype instance_pools: azure.mgmt.sql.operations.InstancePoolsOperations
     :ivar usages: Usages operations
     :vartype usages: azure.mgmt.sql.operations.UsagesOperations
-    :ivar managed_instances: ManagedInstances operations
-    :vartype managed_instances: azure.mgmt.sql.operations.ManagedInstancesOperations
     :ivar private_endpoint_connections: PrivateEndpointConnections operations
     :vartype private_endpoint_connections: azure.mgmt.sql.operations.PrivateEndpointConnectionsOperations
     :ivar private_link_resources: PrivateLinkResources operations
@@ -283,18 +280,24 @@ 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 server_azure_ad_administrators: ServerAzureADAdministrators operations
-    :vartype server_azure_ad_administrators: azure.mgmt.sql.operations.ServerAzureADAdministratorsOperations
     :ivar managed_instance_operations: ManagedInstanceOperations operations
     :vartype managed_instance_operations: azure.mgmt.sql.operations.ManagedInstanceOperations
+    :ivar server_azure_ad_administrators: ServerAzureADAdministrators operations
+    :vartype server_azure_ad_administrators: azure.mgmt.sql.operations.ServerAzureADAdministratorsOperations
     :ivar sync_groups: SyncGroups operations
     :vartype sync_groups: azure.mgmt.sql.operations.SyncGroupsOperations
     :ivar sync_members: SyncMembers operations
     :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
     :vartype managed_databases: azure.mgmt.sql.operations.ManagedDatabasesOperations
+    :ivar server_azure_ad_only_authentications: ServerAzureADOnlyAuthentications operations
+    :vartype server_azure_ad_only_authentications: azure.mgmt.sql.operations.ServerAzureADOnlyAuthenticationsOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -445,8 +448,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.instance_failover_groups = InstanceFailoverGroupsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.backup_short_term_retention_policies = BackupShortTermRetentionPoliciesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.tde_certificates = TdeCertificatesOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.managed_instance_tde_certificates = ManagedInstanceTdeCertificatesOperations(
@@ -467,8 +468,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.usages = UsagesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.managed_instances = ManagedInstancesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.private_link_resources = PrivateLinkResourcesOperations(
@@ -485,15 +484,21 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.workload_classifiers = WorkloadClassifiersOperations(
             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(
             self._client, self.config, self._serialize, self._deserialize)
+        self.server_azure_ad_administrators = ServerAzureADAdministratorsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.sync_groups = SyncGroupsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.sync_members = SyncMembersOperations(
             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(
             self._client, self.config, self._serialize, self._deserialize)
+        self.server_azure_ad_only_authentications = ServerAzureADOnlyAuthenticationsOperations(
+            self._client, self.config, self._serialize, self._deserialize)

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

@@ -99,6 +99,7 @@
     from ._models_py3 import ManagedInstanceOperationParametersPair
     from ._models_py3 import ManagedInstanceOperationSteps
     from ._models_py3 import ManagedInstancePairInfo
+    from ._models_py3 import ManagedInstancePrivateLinkServiceConnectionStateProperty
     from ._models_py3 import ManagedInstanceUpdate
     from ._models_py3 import ManagedInstanceVcoresCapability
     from ._models_py3 import ManagedInstanceVersionCapability
@@ -143,6 +144,7 @@
     from ._models_py3 import Server
     from ._models_py3 import ServerAutomaticTuning
     from ._models_py3 import ServerAzureADAdministrator
+    from ._models_py3 import ServerAzureADOnlyAuthentication
     from ._models_py3 import ServerBlobAuditingPolicy
     from ._models_py3 import ServerCommunicationLink
     from ._models_py3 import ServerConnectionPolicy
@@ -281,6 +283,7 @@
     from ._models import ManagedInstanceOperationParametersPair
     from ._models import ManagedInstanceOperationSteps
     from ._models import ManagedInstancePairInfo
+    from ._models import ManagedInstancePrivateLinkServiceConnectionStateProperty
     from ._models import ManagedInstanceUpdate
     from ._models import ManagedInstanceVcoresCapability
     from ._models import ManagedInstanceVersionCapability
@@ -325,6 +328,7 @@
     from ._models import Server
     from ._models import ServerAutomaticTuning
     from ._models import ServerAzureADAdministrator
+    from ._models import ServerAzureADOnlyAuthentication
     from ._models import ServerBlobAuditingPolicy
     from ._models import ServerCommunicationLink
     from ._models import ServerConnectionPolicy
@@ -427,6 +431,7 @@
 from ._paged_models import RestorePointPaged
 from ._paged_models import SensitivityLabelPaged
 from ._paged_models import ServerAzureADAdministratorPaged
+from ._paged_models import ServerAzureADOnlyAuthenticationPaged
 from ._paged_models import ServerBlobAuditingPolicyPaged
 from ._paged_models import ServerCommunicationLinkPaged
 from ._paged_models import ServerDnsAliasPaged
@@ -515,13 +520,10 @@
     VulnerabilityAssessmentScanState,
     InstanceFailoverGroupReplicationRole,
     InstancePoolLicenseType,
-    IdentityType,
-    ManagedServerCreateMode,
-    ManagedInstanceLicenseType,
-    ManagedInstanceProxyOverride,
     PrivateLinkServiceConnectionStateStatus,
     PrivateLinkServiceConnectionStateActionsRequire,
     PrivateEndpointProvisioningState,
+    IdentityType,
     ServerPublicNetworkAccess,
     CheckNameAvailabilityReason,
     MaxSizeUnit,
@@ -536,6 +538,9 @@
     SyncMemberState,
     ManagedDatabaseStatus,
     ManagedDatabaseCreateMode,
+    ManagedServerCreateMode,
+    ManagedInstanceLicenseType,
+    ManagedInstanceProxyOverride,
     LongTermRetentionDatabaseState,
     VulnerabilityAssessmentPolicyBaselineName,
     SensitivityLabelSource,
@@ -639,6 +644,7 @@
     'ManagedInstanceOperationParametersPair',
     'ManagedInstanceOperationSteps',
     'ManagedInstancePairInfo',
+    'ManagedInstancePrivateLinkServiceConnectionStateProperty',
     'ManagedInstanceUpdate',
     'ManagedInstanceVcoresCapability',
     'ManagedInstanceVersionCapability',
@@ -683,6 +689,7 @@
     'Server',
     'ServerAutomaticTuning',
     'ServerAzureADAdministrator',
+    'ServerAzureADOnlyAuthentication',
     'ServerBlobAuditingPolicy',
     'ServerCommunicationLink',
     'ServerConnectionPolicy',
@@ -786,30 +793,31 @@
     'ElasticPoolOperationPaged',
     'VulnerabilityAssessmentScanRecordPaged',
     'InstanceFailoverGroupPaged',
-    'BackupShortTermRetentionPolicyPaged',
     'ManagedInstanceKeyPaged',
     'ManagedInstanceEncryptionProtectorPaged',
     'RecoverableManagedDatabasePaged',
     'ManagedInstanceVulnerabilityAssessmentPaged',
     'ServerVulnerabilityAssessmentPaged',
     'InstancePoolPaged',
     'UsagePaged',
-    'ManagedInstancePaged',
     'PrivateEndpointConnectionPaged',
     'PrivateLinkResourcePaged',
     'ServerPaged',
     'ManagedInstanceLongTermRetentionBackupPaged',
     'ManagedInstanceLongTermRetentionPolicyPaged',
     'WorkloadGroupPaged',
     'WorkloadClassifierPaged',
-    'ServerAzureADAdministratorPaged',
     'ManagedInstanceOperationPaged',
+    'ServerAzureADAdministratorPaged',
     'SyncDatabaseIdPropertiesPaged',
     'SyncFullSchemaPropertiesPaged',
     'SyncGroupLogPropertiesPaged',
     'SyncGroupPaged',
     'SyncMemberPaged',
+    'ManagedInstancePaged',
+    'BackupShortTermRetentionPolicyPaged',
     'ManagedDatabasePaged',
+    'ServerAzureADOnlyAuthenticationPaged',
     'ServerConnectionType',
     'SecurityAlertPolicyState',
     'SecurityAlertPolicyEmailAccountAdmins',
@@ -872,13 +880,10 @@
     'VulnerabilityAssessmentScanState',
     'InstanceFailoverGroupReplicationRole',
     'InstancePoolLicenseType',
-    'IdentityType',
-    'ManagedServerCreateMode',
-    'ManagedInstanceLicenseType',
-    'ManagedInstanceProxyOverride',
     'PrivateLinkServiceConnectionStateStatus',
     'PrivateLinkServiceConnectionStateActionsRequire',
     'PrivateEndpointProvisioningState',
+    'IdentityType',
     'ServerPublicNetworkAccess',
     'CheckNameAvailabilityReason',
     'MaxSizeUnit',
@@ -893,6 +898,9 @@
     'SyncMemberState',
     'ManagedDatabaseStatus',
     'ManagedDatabaseCreateMode',
+    'ManagedServerCreateMode',
+    'ManagedInstanceLicenseType',
+    'ManagedInstanceProxyOverride',
     'LongTermRetentionDatabaseState',
     'VulnerabilityAssessmentPolicyBaselineName',
     'SensitivityLabelSource',