Skip to content

Commit 053376d

Browse files
author
SDKAuto
committed
CodeGen from PR 20167 in Azure/azure-rest-api-specs
Merge f8ed9cf22413e94fa76d13a7e1fd12ac8cf3d82a into 5a463a464efab1772030e7348ea1515e414d750b
1 parent 388efaa commit 053376d

File tree

734 files changed

+1455426
-1362114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

734 files changed

+1455426
-1362114
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.7.2",
2+
"autorest": "3.8.4",
33
"use": [
4-
"@autorest/python@5.16.0",
5-
"@autorest/modelerfour@4.19.3"
4+
"@autorest/python@6.0.1",
5+
"@autorest/modelerfour@4.23.5"
66
],
7-
"commit": "66fcf8b0d60a8d869ac06d6b804a7fbca52d9d28",
7+
"commit": "5c502db292cd0a514e4cf18c428b0255a0e80f79",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"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",
9+
"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",
1010
"readme": "specification/network/resource-manager/readme.md"
1111
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
# --------------------------------------------------------------------------
88

99
from ._network_management_client import NetworkManagementClient
10-
from ._version import VERSION
11-
1210
__all__ = ['NetworkManagementClient']
13-
__version__ = VERSION
1411

1512
try:
1613
from ._patch import patch_sdk # type: ignore

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Changes may cause incorrect behavior and will be lost if the code is
99
# regenerated.
1010
# --------------------------------------------------------------------------
11-
from typing import TYPE_CHECKING
11+
from typing import Any, TYPE_CHECKING
1212

1313
from azure.core.configuration import Configuration
1414
from azure.core.pipeline import policies
@@ -18,8 +18,6 @@
1818

1919
if TYPE_CHECKING:
2020
# pylint: disable=unused-import,ungrouped-imports
21-
from typing import Any
22-
2321
from azure.core.credentials import TokenCredential
2422

2523
class NetworkManagementClientConfiguration(Configuration):
@@ -28,16 +26,16 @@ class NetworkManagementClientConfiguration(Configuration):
2826
Note that all parameters used to create this instance are saved as instance
2927
attributes.
3028
31-
:param credential: Credential needed for the client to connect to Azure.
29+
:param credential: Credential needed for the client to connect to Azure. Required.
3230
:type credential: ~azure.core.credentials.TokenCredential
33-
: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.
31+
: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.
3432
:type subscription_id: str
3533
"""
3634

3735
def __init__(
3836
self,
39-
credential, # type: "TokenCredential"
40-
subscription_id, # type: str
37+
credential: "TokenCredential",
38+
subscription_id: str,
4139
**kwargs # type: Any
4240
):
4341
# type: (...) -> None

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

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,18 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from typing import TYPE_CHECKING
13-
14-
from msrest import Deserializer, Serializer
12+
from typing import Any, Optional, TYPE_CHECKING
1513

1614
from azure.mgmt.core import ARMPipelineClient
1715
from azure.profiles import KnownProfiles, ProfileDefinition
1816
from azure.profiles.multiapiclient import MultiApiClientMixin
1917

2018
from ._configuration import NetworkManagementClientConfiguration
2119
from ._operations_mixin import NetworkManagementClientOperationsMixin
20+
from ._serialization import Deserializer, Serializer
2221

2322
if TYPE_CHECKING:
2423
# pylint: disable=unused-import,ungrouped-imports
25-
from typing import Any, Optional
26-
2724
from azure.core.credentials import TokenCredential
2825

2926
class _SDKClient(object):
@@ -44,9 +41,9 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, MultiApiCl
4441
The api-version parameter sets the default API version if the operation
4542
group is not described in the profile.
4643

47-
:param credential: Credential needed for the client to connect to Azure.
44+
:param credential: Credential needed for the client to connect to Azure. Required.
4845
:type credential: ~azure.core.credentials.TokenCredential
49-
: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.
46+
: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.
5047
:type subscription_id: str
5148
:param api_version: API version to use if no profile is provided, or if missing in profile.
5249
:type api_version: str
@@ -73,8 +70,8 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, MultiApiCl
7370
'network_security_perimeters': '2021-02-01-preview',
7471
'nsp_access_rules': '2021-02-01-preview',
7572
'nsp_access_rules_reconcile': '2021-02-01-preview',
73+
'nsp_association_reconcile': '2021-02-01-preview',
7674
'nsp_associations': '2021-02-01-preview',
77-
'nsp_associations_proxy': '2021-02-01-preview',
7875
'nsp_profiles': '2021-02-01-preview',
7976
'p2_svpn_server_configurations': '2019-07-01',
8077
'perimeter_associable_resource_types': '2021-02-01-preview',
@@ -87,10 +84,10 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, MultiApiCl
8784

8885
def __init__(
8986
self,
90-
credential, # type: "TokenCredential"
91-
subscription_id, # type: str
87+
credential: "TokenCredential",
88+
subscription_id: str,
9289
api_version=None, # type: Optional[str]
93-
base_url="https://management.azure.com", # type: str
90+
base_url: str = "https://management.azure.com",
9491
profile=KnownProfiles.default, # type: KnownProfiles
9592
**kwargs # type: Any
9693
):
@@ -4957,29 +4954,29 @@ def nsp_access_rules_reconcile(self):
49574954
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
49584955

49594956
@property
4960-
def nsp_associations(self):
4957+
def nsp_association_reconcile(self):
49614958
"""Instance depends on the API version:
49624959

4963-
* 2021-02-01-preview: :class:`NspAssociationsOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationsOperations>`
4960+
* 2021-02-01-preview: :class:`NspAssociationReconcileOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationReconcileOperations>`
49644961
"""
4965-
api_version = self._get_api_version('nsp_associations')
4962+
api_version = self._get_api_version('nsp_association_reconcile')
49664963
if api_version == '2021-02-01-preview':
4967-
from .v2021_02_01_preview.operations import NspAssociationsOperations as OperationClass
4964+
from .v2021_02_01_preview.operations import NspAssociationReconcileOperations as OperationClass
49684965
else:
4969-
raise ValueError("API version {} does not have operation group 'nsp_associations'".format(api_version))
4966+
raise ValueError("API version {} does not have operation group 'nsp_association_reconcile'".format(api_version))
49704967
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
49714968

49724969
@property
4973-
def nsp_associations_proxy(self):
4970+
def nsp_associations(self):
49744971
"""Instance depends on the API version:
49754972

4976-
* 2021-02-01-preview: :class:`NspAssociationsProxyOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationsProxyOperations>`
4973+
* 2021-02-01-preview: :class:`NspAssociationsOperations<azure.mgmt.network.v2021_02_01_preview.operations.NspAssociationsOperations>`
49774974
"""
4978-
api_version = self._get_api_version('nsp_associations_proxy')
4975+
api_version = self._get_api_version('nsp_associations')
49794976
if api_version == '2021-02-01-preview':
4980-
from .v2021_02_01_preview.operations import NspAssociationsProxyOperations as OperationClass
4977+
from .v2021_02_01_preview.operations import NspAssociationsOperations as OperationClass
49814978
else:
4982-
raise ValueError("API version {} does not have operation group 'nsp_associations_proxy'".format(api_version))
4979+
raise ValueError("API version {} does not have operation group 'nsp_associations'".format(api_version))
49834980
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
49844981

49854982
@property

0 commit comments

Comments
 (0)