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

Merge 757409f42a0d5f527fc91ea9e103bd568c70168c into a252633
AzureSDKAutomation · Jun 7, 2021 · 2d10a7a · 2d10a7a
1 parent 19e35d6
commit 2d10a7a
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 51 deletions.
diff --git a/sdk/sql/azure-mgmt-sql/_meta.json b/sdk/sql/azure-mgmt-sql/_meta.json
@@ -2,10 +2,10 @@
   "autorest": "3.4.2",
   "use": [
     "@autorest/[email protected]",
-    "@autorest/[email protected].1"
+    "@autorest/[email protected].2"
   ],
-  "commit": "1c801aa70be460b277f1d81f9cced889ca5008fe",
+  "commit": "82561de1ddbc904efa8a391eeda703b8cc7bb52b",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/sql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected] --use=@autorest/[email protected].1 --version=3.4.2",
+  "autorest_command": "autorest specification/sql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected] --use=@autorest/[email protected].2 --version=3.4.2",
   "readme": "specification/sql/resource-manager/readme.md"
 }
diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_metadata.json b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_metadata.json
@@ -195,7 +195,6 @@
         "server_dns_aliases": "ServerDnsAliasesOperations",
         "server_keys": "ServerKeysOperations",
         "server_operations": "ServerOperationsOperations",
-        "servers": "ServersOperations",
         "server_security_alert_policies": "ServerSecurityAlertPoliciesOperations",
         "server_trust_groups": "ServerTrustGroupsOperations",
         "server_vulnerability_assessments": "ServerVulnerabilityAssessmentsOperations",
@@ -217,6 +216,7 @@
         "outbound_firewall_rules": "OutboundFirewallRulesOperations",
         "restorable_dropped_databases": "RestorableDroppedDatabasesOperations",
         "restorable_dropped_managed_databases": "RestorableDroppedManagedDatabasesOperations",
+        "servers": "ServersOperations",
         "usages": "UsagesOperations"
     }
 }
diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py
@@ -116,7 +116,6 @@
 from .operations import ServerDnsAliasesOperations
 from .operations import ServerKeysOperations
 from .operations import ServerOperationsOperations
-from .operations import ServersOperations
 from .operations import ServerSecurityAlertPoliciesOperations
 from .operations import ServerTrustGroupsOperations
 from .operations import ServerVulnerabilityAssessmentsOperations
@@ -138,6 +137,7 @@
 from .operations import OutboundFirewallRulesOperations
 from .operations import RestorableDroppedDatabasesOperations
 from .operations import RestorableDroppedManagedDatabasesOperations
+from .operations import ServersOperations
 from .operations import UsagesOperations
 from . import models
 
@@ -339,8 +339,6 @@ class SqlManagementClient(object):
     :vartype server_keys: azure.mgmt.sql.operations.ServerKeysOperations
     :ivar server_operations: ServerOperationsOperations operations
     :vartype server_operations: azure.mgmt.sql.operations.ServerOperationsOperations
-    :ivar servers: ServersOperations operations
-    :vartype servers: azure.mgmt.sql.operations.ServersOperations
     :ivar server_security_alert_policies: ServerSecurityAlertPoliciesOperations operations
     :vartype server_security_alert_policies: azure.mgmt.sql.operations.ServerSecurityAlertPoliciesOperations
     :ivar server_trust_groups: ServerTrustGroupsOperations operations
@@ -383,6 +381,8 @@ class SqlManagementClient(object):
     :vartype restorable_dropped_databases: azure.mgmt.sql.operations.RestorableDroppedDatabasesOperations
     :ivar restorable_dropped_managed_databases: RestorableDroppedManagedDatabasesOperations operations
     :vartype restorable_dropped_managed_databases: azure.mgmt.sql.operations.RestorableDroppedManagedDatabasesOperations
+    :ivar servers: ServersOperations operations
+    :vartype servers: azure.mgmt.sql.operations.ServersOperations
     :ivar usages: UsagesOperations operations
     :vartype usages: azure.mgmt.sql.operations.UsagesOperations
     :param credential: Credential needed for the client to connect to Azure.
@@ -605,8 +605,6 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize)
         self.server_operations = ServerOperationsOperations(
             self._client, self._config, self._serialize, self._deserialize)
-        self.servers = ServersOperations(
-            self._client, self._config, self._serialize, self._deserialize)
         self.server_security_alert_policies = ServerSecurityAlertPoliciesOperations(
             self._client, self._config, self._serialize, self._deserialize)
         self.server_trust_groups = ServerTrustGroupsOperations(
@@ -649,6 +647,8 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize)
         self.restorable_dropped_managed_databases = RestorableDroppedManagedDatabasesOperations(
             self._client, self._config, self._serialize, self._deserialize)
+        self.servers = ServersOperations(
+            self._client, self._config, self._serialize, self._deserialize)
         self.usages = UsagesOperations(
             self._client, self._config, self._serialize, self._deserialize)
 

diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_version.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2.1.0"
+VERSION = "0.9.0"
diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/_sql_management_client.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/_sql_management_client.py
@@ -114,7 +114,6 @@
 from .operations import ServerDnsAliasesOperations
 from .operations import ServerKeysOperations
 from .operations import ServerOperationsOperations
-from .operations import ServersOperations
 from .operations import ServerSecurityAlertPoliciesOperations
 from .operations import ServerTrustGroupsOperations
 from .operations import ServerVulnerabilityAssessmentsOperations
@@ -136,6 +135,7 @@
 from .operations import OutboundFirewallRulesOperations
 from .operations import RestorableDroppedDatabasesOperations
 from .operations import RestorableDroppedManagedDatabasesOperations
+from .operations import ServersOperations
 from .operations import UsagesOperations
 from .. import models
 
@@ -337,8 +337,6 @@ class SqlManagementClient(object):
     :vartype server_keys: azure.mgmt.sql.aio.operations.ServerKeysOperations
     :ivar server_operations: ServerOperationsOperations operations
     :vartype server_operations: azure.mgmt.sql.aio.operations.ServerOperationsOperations
-    :ivar servers: ServersOperations operations
-    :vartype servers: azure.mgmt.sql.aio.operations.ServersOperations
     :ivar server_security_alert_policies: ServerSecurityAlertPoliciesOperations operations
     :vartype server_security_alert_policies: azure.mgmt.sql.aio.operations.ServerSecurityAlertPoliciesOperations
     :ivar server_trust_groups: ServerTrustGroupsOperations operations
@@ -381,6 +379,8 @@ class SqlManagementClient(object):
     :vartype restorable_dropped_databases: azure.mgmt.sql.aio.operations.RestorableDroppedDatabasesOperations
     :ivar restorable_dropped_managed_databases: RestorableDroppedManagedDatabasesOperations operations
     :vartype restorable_dropped_managed_databases: azure.mgmt.sql.aio.operations.RestorableDroppedManagedDatabasesOperations
+    :ivar servers: ServersOperations operations
+    :vartype servers: azure.mgmt.sql.aio.operations.ServersOperations
     :ivar usages: UsagesOperations operations
     :vartype usages: azure.mgmt.sql.aio.operations.UsagesOperations
     :param credential: Credential needed for the client to connect to Azure.
@@ -602,8 +602,6 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize)
         self.server_operations = ServerOperationsOperations(
             self._client, self._config, self._serialize, self._deserialize)
-        self.servers = ServersOperations(
-            self._client, self._config, self._serialize, self._deserialize)
         self.server_security_alert_policies = ServerSecurityAlertPoliciesOperations(
             self._client, self._config, self._serialize, self._deserialize)
         self.server_trust_groups = ServerTrustGroupsOperations(
@@ -646,6 +644,8 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize)
         self.restorable_dropped_managed_databases = RestorableDroppedManagedDatabasesOperations(
             self._client, self._config, self._serialize, self._deserialize)
+        self.servers = ServersOperations(
+            self._client, self._config, self._serialize, self._deserialize)
         self.usages = UsagesOperations(
             self._client, self._config, self._serialize, self._deserialize)
 

diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/__init__.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/__init__.py
@@ -103,7 +103,6 @@
 from ._server_dns_aliases_operations import ServerDnsAliasesOperations
 from ._server_keys_operations import ServerKeysOperations
 from ._server_operations_operations import ServerOperationsOperations
-from ._servers_operations import ServersOperations
 from ._server_security_alert_policies_operations import ServerSecurityAlertPoliciesOperations
 from ._server_trust_groups_operations import ServerTrustGroupsOperations
 from ._server_vulnerability_assessments_operations import ServerVulnerabilityAssessmentsOperations
@@ -125,6 +124,7 @@
 from ._outbound_firewall_rules_operations import OutboundFirewallRulesOperations
 from ._restorable_dropped_databases_operations import RestorableDroppedDatabasesOperations
 from ._restorable_dropped_managed_databases_operations import RestorableDroppedManagedDatabasesOperations
+from ._servers_operations import ServersOperations
 from ._usages_operations import UsagesOperations
 
 __all__ = [
@@ -225,7 +225,6 @@
     'ServerDnsAliasesOperations',
     'ServerKeysOperations',
     'ServerOperationsOperations',
-    'ServersOperations',
     'ServerSecurityAlertPoliciesOperations',
     'ServerTrustGroupsOperations',
     'ServerVulnerabilityAssessmentsOperations',
@@ -247,5 +246,6 @@
     'OutboundFirewallRulesOperations',
     'RestorableDroppedDatabasesOperations',
     'RestorableDroppedManagedDatabasesOperations',
+    'ServersOperations',
     'UsagesOperations',
 ]
diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_servers_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_servers_operations.py
@@ -66,7 +66,7 @@ def list_by_resource_group(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -145,7 +145,7 @@ async def get(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
         accept = "application/json"
 
         # Construct URL
@@ -195,7 +195,7 @@ async def _create_or_update_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -324,7 +324,7 @@ async def _delete_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
 
         # Construct URL
         url = self._delete_initial.metadata['url']  # type: ignore
@@ -432,7 +432,7 @@ async def _update_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -566,7 +566,7 @@ def list(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
         accept = "application/json"
 
         def prepare_request(next_link=None):
@@ -630,7 +630,7 @@ async def _import_database_initial(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 
@@ -764,7 +764,7 @@ async def check_name_availability(
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2020-11-01-preview"
+        api_version = "2021-02-01-preview"
         content_type = kwargs.pop("content_type", "application/json")
         accept = "application/json"
 

diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_sync_groups_operations.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_sync_groups_operations.py
@@ -325,7 +325,7 @@ def list_logs(
         sync_group_name: str,
         start_time: str,
         end_time: str,
-        type: Union[str, "_models.Enum81"],
+        type: Union[str, "_models.Enum78"],
         continuation_token_parameter: Optional[str] = None,
         **kwargs: Any
     ) -> AsyncIterable["_models.SyncGroupLogListResult"]:
@@ -345,7 +345,7 @@ def list_logs(
         :param end_time: Get logs generated before this time.
         :type end_time: str
         :param type: The types of logs to retrieve.
-        :type type: str or ~azure.mgmt.sql.models.Enum81
+        :type type: str or ~azure.mgmt.sql.models.Enum78
         :param continuation_token_parameter: The continuation token for this operation.
         :type continuation_token_parameter: str
         :keyword callable cls: A custom type or function that will be passed the direct response

diff --git a/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py b/sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py
@@ -729,7 +729,7 @@
     ElasticPoolLicenseType,
     ElasticPoolState,
     EncryptionProtectorName,
-    Enum81,
+    Enum78,
     FailoverGroupReplicationRole,
     GeoBackupPolicyName,
     GeoBackupPolicyState,
@@ -796,7 +796,7 @@
     SensitivityLabelUpdateKind,
     ServerConnectionType,
     ServerKeyType,
-    ServerPublicNetworkAccess,
+    ServerNetworkAccessFlag,
     ServerTrustGroupPropertiesTrustScopesItem,
     ServerWorkspaceFeature,
     ServiceObjectiveName,
@@ -1207,7 +1207,7 @@
     'ElasticPoolLicenseType',
     'ElasticPoolState',
     'EncryptionProtectorName',
-    'Enum81',
+    'Enum78',
     'FailoverGroupReplicationRole',
     'GeoBackupPolicyName',
     'GeoBackupPolicyState',
@@ -1274,7 +1274,7 @@
     'SensitivityLabelUpdateKind',
     'ServerConnectionType',
     'ServerKeyType',
-    'ServerPublicNetworkAccess',
+    'ServerNetworkAccessFlag',
     'ServerTrustGroupPropertiesTrustScopesItem',
     'ServerWorkspaceFeature',
     'ServiceObjectiveName',