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

Merge f8ed9cf22413e94fa76d13a7e1fd12ac8cf3d82a into 5a463a464efab1772030e7348ea1515e414d750b

Author: SDKAuto

sdk/network/azure-mgmt-network/_meta.json

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.7.2",
+  "autorest": "3.8.4",
   "use": [
-    "@autorest/python@5.16.0",
-    "@autorest/modelerfour@4.19.3"
+    "@autorest/python@6.0.1",
+    "@autorest/modelerfour@4.23.5"
   ],
-  "commit": "66fcf8b0d60a8d869ac06d6b804a7fbca52d9d28",
+  "commit": "5c502db292cd0a514e4cf18c428b0255a0e80f79",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/network/resource-manager/readme.md --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.16.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
+  "autorest_command": "autorest specification/network/resource-manager/readme.md --models-mode=msrest --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.0.1 --use=@autorest/modelerfour@4.23.5 --version=3.8.4 --version-tolerant=False",
   "readme": "specification/network/resource-manager/readme.md"
 }

sdk/network/azure-mgmt-network/azure/mgmt/network/__init__.py

@@ -7,10 +7,7 @@
 # --------------------------------------------------------------------------
 
 from ._network_management_client import NetworkManagementClient
-from ._version import VERSION
-
 __all__ = ['NetworkManagementClient']
-__version__ = VERSION
 
 try:
     from ._patch import patch_sdk  # type: ignore

sdk/network/azure-mgmt-network/azure/mgmt/network/_configuration.py

@@ -8,7 +8,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
-from typing import TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
@@ -18,8 +18,6 @@
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
 
 class NetworkManagementClientConfiguration(Configuration):
@@ -28,16 +26,16 @@ class NetworkManagementClientConfiguration(Configuration):
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+    :param subscription_id: The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. Required.
     :type subscription_id: str
     """
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
+        credential: "TokenCredential",
+        subscription_id: str,
         **kwargs  # type: Any
     ):
         # type: (...) -> None

sdk/network/azure-mgmt-network/azure/mgmt/network/_network_management_client.py

@@ -9,21 +9,18 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
-
-from msrest import Deserializer, Serializer
+from typing import Any, Optional, TYPE_CHECKING
 
 from azure.mgmt.core import ARMPipelineClient
 from azure.profiles import KnownProfiles, ProfileDefinition
 from azure.profiles.multiapiclient import MultiApiClientMixin
 
 from ._configuration import NetworkManagementClientConfiguration
 from ._operations_mixin import NetworkManagementClientOperationsMixin
+from ._serialization import Deserializer, Serializer
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any, Optional
-
     from azure.core.credentials import TokenCredential
 
 class _SDKClient(object):
@@ -44,9 +41,9 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, MultiApiCl
     The api-version parameter sets the default API version if the operation
     group is not described in the profile.
 
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
+    :param subscription_id: The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. Required.
     :type subscription_id: str
     :param api_version: API version to use if no profile is provided, or if missing in profile.
     :type api_version: str
@@ -73,8 +70,8 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, MultiApiCl
             'network_security_perimeters': '2021-02-01-preview',
             'nsp_access_rules': '2021-02-01-preview',
             'nsp_access_rules_reconcile': '2021-02-01-preview',
+            'nsp_association_reconcile': '2021-02-01-preview',
             'nsp_associations': '2021-02-01-preview',
-            'nsp_associations_proxy': '2021-02-01-preview',
             'nsp_profiles': '2021-02-01-preview',
             'p2_svpn_server_configurations': '2019-07-01',
             'perimeter_associable_resource_types': '2021-02-01-preview',
@@ -87,10 +84,10 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, MultiApiCl
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
+        credential: "TokenCredential",
+        subscription_id: str,
         api_version=None, # type: Optional[str]
-        base_url="https://management.azure.com",  # type: str
+        base_url: str = "https://management.azure.com",
         profile=KnownProfiles.default, # type: KnownProfiles
         **kwargs  # type: Any
     ):
@@ -4957,29 +4954,29 @@ def nsp_access_rules_reconcile(self):
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
 
     @property
-    def nsp_associations(self):
+    def nsp_association_reconcile(self):
         """Instance depends on the API version:
 
-           * 2021-02-01-preview: :class:`NspAssociationsOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationsOperations>`
+           * 2021-02-01-preview: :class:`NspAssociationReconcileOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationReconcileOperations>`
         """
-        api_version = self._get_api_version('nsp_associations')
+        api_version = self._get_api_version('nsp_association_reconcile')
         if api_version == '2021-02-01-preview':
-            from .v2021_02_01_preview.operations import NspAssociationsOperations as OperationClass
+            from .v2021_02_01_preview.operations import NspAssociationReconcileOperations as OperationClass
         else:
-            raise ValueError("API version {} does not have operation group 'nsp_associations'".format(api_version))
+            raise ValueError("API version {} does not have operation group 'nsp_association_reconcile'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
 
     @property
-    def nsp_associations_proxy(self):
+    def nsp_associations(self):
         """Instance depends on the API version:
 
-           * 2021-02-01-preview: :class:`NspAssociationsProxyOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationsProxyOperations>`
+           * 2021-02-01-preview: :class:`NspAssociationsOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationsOperations>`
         """
-        api_version = self._get_api_version('nsp_associations_proxy')
+        api_version = self._get_api_version('nsp_associations')
         if api_version == '2021-02-01-preview':
-            from .v2021_02_01_preview.operations import NspAssociationsProxyOperations as OperationClass
+            from .v2021_02_01_preview.operations import NspAssociationsOperations as OperationClass
         else:
-            raise ValueError("API version {} does not have operation group 'nsp_associations_proxy'".format(api_version))
+            raise ValueError("API version {} does not have operation group 'nsp_associations'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
 
     @property