Skip to content

Commit 20d0004

Browse files
author
SDKAuto
committed
CodeGen from PR 17157 in Azure/azure-rest-api-specs
Merge 44c10d8df642e9801cc38e95fda27719250f70b7 into 0a66655
1 parent 6427bf8 commit 20d0004

Some content is hidden

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

44 files changed

+10074
-4758
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.5",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.4",
5-
"@autorest/[email protected].2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "6b95b0f0fa71e18a350cf0ba152591a29a94bdc0",
7+
"commit": "0b29412331a76d909c729083702173978ccdffce",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/netapp/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/python@5.8.4 --use=@autorest/[email protected].2 --version=3.4.5",
9+
"autorest_command": "autorest specification/netapp/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/python@5.12.0 --use=@autorest/[email protected].3 --version=3.7.2",
1010
"readme": "specification/netapp/resource-manager/readme.md"
1111
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['NetAppManagementClient']
1414

15-
try:
16-
from ._patch import patch_sdk # type: ignore
17-
patch_sdk()
18-
except ImportError:
19-
pass
15+
# `._patch.py` is used for handwritten extensions to the generated code
16+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
17+
from ._patch import patch_sdk
18+
patch_sdk()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from azure.core.configuration import Configuration
1212
from azure.core.pipeline import policies
13-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
13+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1414

1515
from ._version import VERSION
1616

@@ -40,15 +40,15 @@ def __init__(
4040
**kwargs # type: Any
4141
):
4242
# type: (...) -> None
43+
super(NetAppManagementClientConfiguration, self).__init__(**kwargs)
4344
if credential is None:
4445
raise ValueError("Parameter 'credential' must not be None.")
4546
if subscription_id is None:
4647
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(NetAppManagementClientConfiguration, self).__init__(**kwargs)
4848

4949
self.credential = credential
5050
self.subscription_id = subscription_id
51-
self.api_version = "2021-06-01"
51+
self.api_version = "2021-08-01"
5252
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5353
kwargs.setdefault('sdk_moniker', 'mgmt-netapp/{}'.format(VERSION))
5454
self._configure(**kwargs)
@@ -68,4 +68,4 @@ def _configure(
6868
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6969
self.authentication_policy = kwargs.get('authentication_policy')
7070
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
71+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_metadata.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"chosen_version": "2021-06-01",
3-
"total_api_version_list": ["2021-06-01"],
2+
"chosen_version": "2021-08-01",
3+
"total_api_version_list": ["2021-08-01"],
44
"client": {
55
"name": "NetAppManagementClient",
66
"filename": "_net_app_management_client",
77
"description": "Microsoft NetApp Files Azure Resource Provider specification.",
8-
"base_url": "\u0027https://management.azure.com\u0027",
9-
"custom_base_url": null,
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
1010
"azure_arm": true,
1111
"has_lro_operations": true,
1212
"client_side_validation": false,
13-
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"NetAppManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}}}",
14-
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"NetAppManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}}}"
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"NetAppManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14+
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"NetAppManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {
@@ -54,7 +54,7 @@
5454
"required": false
5555
},
5656
"base_url": {
57-
"signature": "base_url=None, # type: Optional[str]",
57+
"signature": "base_url=\"https://management.azure.com\", # type: str",
5858
"description": "Service URL",
5959
"docstring_type": "str",
6060
"required": false
@@ -74,7 +74,7 @@
7474
"required": false
7575
},
7676
"base_url": {
77-
"signature": "base_url: Optional[str] = None,",
77+
"signature": "base_url: str = \"https://management.azure.com\",",
7878
"description": "Service URL",
7979
"docstring_type": "str",
8080
"required": false
@@ -91,11 +91,10 @@
9191
"config": {
9292
"credential": true,
9393
"credential_scopes": ["https://management.azure.com/.default"],
94-
"credential_default_policy_type": "BearerTokenCredentialPolicy",
95-
"credential_default_policy_type_has_async_version": true,
96-
"credential_key_header_name": null,
97-
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
98-
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
94+
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
95+
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
96+
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
97+
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
9998
},
10099
"operation_groups": {
101100
"operations": "Operations",
@@ -109,6 +108,7 @@
109108
"backups": "BackupsOperations",
110109
"account_backups": "AccountBackupsOperations",
111110
"backup_policies": "BackupPoliciesOperations",
112-
"vaults": "VaultsOperations"
111+
"vaults": "VaultsOperations",
112+
"volume_groups": "VolumeGroupsOperations"
113113
}
114114
}

sdk/netapp/azure-mgmt-netapp/azure/mgmt/netapp/_net_app_management_client.py

Lines changed: 56 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,22 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9+
from copy import deepcopy
910
from typing import TYPE_CHECKING
1011

1112
from azure.mgmt.core import ARMPipelineClient
1213
from msrest import Deserializer, Serializer
1314

15+
from . import models
16+
from ._configuration import NetAppManagementClientConfiguration
17+
from .operations import AccountBackupsOperations, AccountsOperations, BackupPoliciesOperations, BackupsOperations, NetAppResourceOperations, NetAppResourceQuotaLimitsOperations, Operations, PoolsOperations, SnapshotPoliciesOperations, SnapshotsOperations, VaultsOperations, VolumeGroupsOperations, VolumesOperations
18+
1419
if TYPE_CHECKING:
1520
# pylint: disable=unused-import,ungrouped-imports
1621
from typing import Any, Optional
1722

1823
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import NetAppManagementClientConfiguration
22-
from .operations import Operations
23-
from .operations import NetAppResourceOperations
24-
from .operations import NetAppResourceQuotaLimitsOperations
25-
from .operations import AccountsOperations
26-
from .operations import PoolsOperations
27-
from .operations import VolumesOperations
28-
from .operations import SnapshotsOperations
29-
from .operations import SnapshotPoliciesOperations
30-
from .operations import BackupsOperations
31-
from .operations import AccountBackupsOperations
32-
from .operations import BackupPoliciesOperations
33-
from .operations import VaultsOperations
34-
from . import models
35-
24+
from azure.core.rest import HttpRequest, HttpResponse
3625

3726
class NetAppManagementClient(object):
3827
"""Microsoft NetApp Files Azure Resource Provider specification.
@@ -42,7 +31,8 @@ class NetAppManagementClient(object):
4231
:ivar net_app_resource: NetAppResourceOperations operations
4332
:vartype net_app_resource: azure.mgmt.netapp.operations.NetAppResourceOperations
4433
:ivar net_app_resource_quota_limits: NetAppResourceQuotaLimitsOperations operations
45-
:vartype net_app_resource_quota_limits: azure.mgmt.netapp.operations.NetAppResourceQuotaLimitsOperations
34+
:vartype net_app_resource_quota_limits:
35+
azure.mgmt.netapp.operations.NetAppResourceQuotaLimitsOperations
4636
:ivar accounts: AccountsOperations operations
4737
:vartype accounts: azure.mgmt.netapp.operations.AccountsOperations
4838
:ivar pools: PoolsOperations operations
@@ -61,74 +51,75 @@ class NetAppManagementClient(object):
6151
:vartype backup_policies: azure.mgmt.netapp.operations.BackupPoliciesOperations
6252
:ivar vaults: VaultsOperations operations
6353
:vartype vaults: azure.mgmt.netapp.operations.VaultsOperations
54+
:ivar volume_groups: VolumeGroupsOperations operations
55+
:vartype volume_groups: azure.mgmt.netapp.operations.VolumeGroupsOperations
6456
:param credential: Credential needed for the client to connect to Azure.
6557
:type credential: ~azure.core.credentials.TokenCredential
66-
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
58+
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure
59+
subscription. The subscription ID forms part of the URI for every service call.
6760
:type subscription_id: str
68-
:param str base_url: Service URL
69-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
61+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
62+
:type base_url: str
63+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
64+
Retry-After header is present.
7065
"""
7166

7267
def __init__(
7368
self,
7469
credential, # type: "TokenCredential"
7570
subscription_id, # type: str
76-
base_url=None, # type: Optional[str]
71+
base_url="https://management.azure.com", # type: str
7772
**kwargs # type: Any
7873
):
7974
# type: (...) -> None
80-
if not base_url:
81-
base_url = 'https://management.azure.com'
82-
self._config = NetAppManagementClientConfiguration(credential, subscription_id, **kwargs)
75+
self._config = NetAppManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
8376
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8477

8578
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
8679
self._serialize = Serializer(client_models)
87-
self._serialize.client_side_validation = False
8880
self._deserialize = Deserializer(client_models)
89-
90-
self.operations = Operations(
91-
self._client, self._config, self._serialize, self._deserialize)
92-
self.net_app_resource = NetAppResourceOperations(
93-
self._client, self._config, self._serialize, self._deserialize)
94-
self.net_app_resource_quota_limits = NetAppResourceQuotaLimitsOperations(
95-
self._client, self._config, self._serialize, self._deserialize)
96-
self.accounts = AccountsOperations(
97-
self._client, self._config, self._serialize, self._deserialize)
98-
self.pools = PoolsOperations(
99-
self._client, self._config, self._serialize, self._deserialize)
100-
self.volumes = VolumesOperations(
101-
self._client, self._config, self._serialize, self._deserialize)
102-
self.snapshots = SnapshotsOperations(
103-
self._client, self._config, self._serialize, self._deserialize)
104-
self.snapshot_policies = SnapshotPoliciesOperations(
105-
self._client, self._config, self._serialize, self._deserialize)
106-
self.backups = BackupsOperations(
107-
self._client, self._config, self._serialize, self._deserialize)
108-
self.account_backups = AccountBackupsOperations(
109-
self._client, self._config, self._serialize, self._deserialize)
110-
self.backup_policies = BackupPoliciesOperations(
111-
self._client, self._config, self._serialize, self._deserialize)
112-
self.vaults = VaultsOperations(
113-
self._client, self._config, self._serialize, self._deserialize)
114-
115-
def _send_request(self, http_request, **kwargs):
116-
# type: (HttpRequest, Any) -> HttpResponse
81+
self._serialize.client_side_validation = False
82+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
83+
self.net_app_resource = NetAppResourceOperations(self._client, self._config, self._serialize, self._deserialize)
84+
self.net_app_resource_quota_limits = NetAppResourceQuotaLimitsOperations(self._client, self._config, self._serialize, self._deserialize)
85+
self.accounts = AccountsOperations(self._client, self._config, self._serialize, self._deserialize)
86+
self.pools = PoolsOperations(self._client, self._config, self._serialize, self._deserialize)
87+
self.volumes = VolumesOperations(self._client, self._config, self._serialize, self._deserialize)
88+
self.snapshots = SnapshotsOperations(self._client, self._config, self._serialize, self._deserialize)
89+
self.snapshot_policies = SnapshotPoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
90+
self.backups = BackupsOperations(self._client, self._config, self._serialize, self._deserialize)
91+
self.account_backups = AccountBackupsOperations(self._client, self._config, self._serialize, self._deserialize)
92+
self.backup_policies = BackupPoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
93+
self.vaults = VaultsOperations(self._client, self._config, self._serialize, self._deserialize)
94+
self.volume_groups = VolumeGroupsOperations(self._client, self._config, self._serialize, self._deserialize)
95+
96+
97+
def _send_request(
98+
self,
99+
request, # type: HttpRequest
100+
**kwargs # type: Any
101+
):
102+
# type: (...) -> HttpResponse
117103
"""Runs the network request through the client's chained policies.
118104
119-
:param http_request: The network request you want to make. Required.
120-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
121-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
105+
>>> from azure.core.rest import HttpRequest
106+
>>> request = HttpRequest("GET", "https://www.example.org/")
107+
<HttpRequest [GET], url: 'https://www.example.org/'>
108+
>>> response = client._send_request(request)
109+
<HttpResponse: 200 OK>
110+
111+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
112+
113+
:param request: The network request you want to make. Required.
114+
:type request: ~azure.core.rest.HttpRequest
115+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
122116
:return: The response of your network call. Does not do error handling on your response.
123-
:rtype: ~azure.core.pipeline.transport.HttpResponse
117+
:rtype: ~azure.core.rest.HttpResponse
124118
"""
125-
path_format_arguments = {
126-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
127-
}
128-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
129-
stream = kwargs.pop("stream", True)
130-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
131-
return pipeline_response.http_response
119+
120+
request_copy = deepcopy(request)
121+
request_copy.url = self._client.format_url(request_copy.url)
122+
return self._client.send_request(request_copy, **kwargs)
132123

133124
def close(self):
134125
# type: () -> None

0 commit comments

Comments
 (0)