Skip to content

Commit 53dda73

Browse files
author
SDKAuto
committed
CodeGen from PR 18201 in Azure/azure-rest-api-specs
Merge 78c740349acb28572fe43faa51c716e38d19aff4 into 96da969aa75e2beb27c3dbc2d69a76900856cc52
1 parent 573d68e commit 53dda73

28 files changed

+2945
-3205
lines changed

‎sdk/azurestack/azure-mgmt-azurestack/_meta.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
2-
"autorest": "3.0.6369",
3-
"use": "@autorest/[email protected]",
4-
"commit": "ea6ceada9e22eb0d455288d339955dfe56521302",
2+
"autorest": "3.7.2",
3+
"use": [
4+
"@autorest/[email protected]",
5+
"@autorest/[email protected]"
6+
],
7+
"commit": "86fc7ac77ad48e14f33b34888d3f65967d7c68d4",
58
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
6-
"autorest_command": "autorest specification/azurestack/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.6.2 --version=3.0.6369",
9+
"autorest_command": "autorest specification/azurestack/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/[email protected] --version=3.7.2",
710
"readme": "specification/azurestack/resource-manager/readme.md"
811
}

‎sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/__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__ = ['AzureStackManagementClient']
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/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_azure_stack_management_client.py

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

9-
from typing import TYPE_CHECKING
9+
from copy import deepcopy
10+
from typing import Any, Optional, TYPE_CHECKING
1011

12+
from azure.core.rest import HttpRequest, HttpResponse
1113
from azure.mgmt.core import ARMPipelineClient
1214
from msrest import Deserializer, Serializer
1315

16+
from . import models
17+
from ._configuration import AzureStackManagementClientConfiguration
18+
from .operations import CloudManifestFileOperations, CustomerSubscriptionsOperations, LinkedSubscriptionsOperations, Operations, ProductsOperations, RegistrationsOperations
19+
1420
if TYPE_CHECKING:
1521
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
1822
from azure.core.credentials import TokenCredential
1923

20-
from ._configuration import AzureStackManagementClientConfiguration
21-
from .operations import Operations
22-
from .operations import CloudManifestFileOperations
23-
from .operations import CustomerSubscriptionsOperations
24-
from .operations import ProductsOperations
25-
from .operations import RegistrationsOperations
26-
from .operations import LinkedSubscriptionsOperations
27-
from . import models
28-
29-
30-
class AzureStackManagementClient(object):
24+
class AzureStackManagementClient:
3125
"""Azure Stack.
3226
3327
:ivar operations: Operations operations
3428
:vartype operations: azure.mgmt.azurestack.operations.Operations
3529
:ivar cloud_manifest_file: CloudManifestFileOperations operations
3630
:vartype cloud_manifest_file: azure.mgmt.azurestack.operations.CloudManifestFileOperations
3731
:ivar customer_subscriptions: CustomerSubscriptionsOperations operations
38-
:vartype customer_subscriptions: azure.mgmt.azurestack.operations.CustomerSubscriptionsOperations
32+
:vartype customer_subscriptions:
33+
azure.mgmt.azurestack.operations.CustomerSubscriptionsOperations
3934
:ivar products: ProductsOperations operations
4035
:vartype products: azure.mgmt.azurestack.operations.ProductsOperations
4136
:ivar registrations: RegistrationsOperations operations
@@ -44,41 +39,60 @@ class AzureStackManagementClient(object):
4439
:vartype linked_subscriptions: azure.mgmt.azurestack.operations.LinkedSubscriptionsOperations
4540
:param credential: Credential needed for the client to connect to Azure.
4641
:type credential: ~azure.core.credentials.TokenCredential
47-
:param subscription_id: Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
42+
:param subscription_id: Subscription credentials that uniquely identify Microsoft Azure
43+
subscription. The subscription ID forms part of the URI for every service call.
4844
:type subscription_id: str
49-
:param str base_url: Service URL
45+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
46+
:type base_url: str
5047
"""
5148

5249
def __init__(
5350
self,
54-
credential, # type: "TokenCredential"
55-
subscription_id, # type: str
56-
base_url=None, # type: Optional[str]
57-
**kwargs # type: Any
58-
):
59-
# type: (...) -> None
60-
if not base_url:
61-
base_url = 'https://management.azure.com'
62-
self._config = AzureStackManagementClientConfiguration(credential, subscription_id, **kwargs)
51+
credential: "TokenCredential",
52+
subscription_id: str,
53+
base_url: str = "https://management.azure.com",
54+
**kwargs: Any
55+
) -> None:
56+
self._config = AzureStackManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
6357
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6458

6559
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6660
self._serialize = Serializer(client_models)
67-
self._serialize.client_side_validation = False
6861
self._deserialize = Deserializer(client_models)
62+
self._serialize.client_side_validation = False
63+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
64+
self.cloud_manifest_file = CloudManifestFileOperations(self._client, self._config, self._serialize, self._deserialize)
65+
self.customer_subscriptions = CustomerSubscriptionsOperations(self._client, self._config, self._serialize, self._deserialize)
66+
self.products = ProductsOperations(self._client, self._config, self._serialize, self._deserialize)
67+
self.registrations = RegistrationsOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.linked_subscriptions = LinkedSubscriptionsOperations(self._client, self._config, self._serialize, self._deserialize)
69+
70+
71+
def _send_request(
72+
self,
73+
request, # type: HttpRequest
74+
**kwargs: Any
75+
) -> HttpResponse:
76+
"""Runs the network request through the client's chained policies.
77+
78+
>>> from azure.core.rest import HttpRequest
79+
>>> request = HttpRequest("GET", "https://www.example.org/")
80+
<HttpRequest [GET], url: 'https://www.example.org/'>
81+
>>> response = client._send_request(request)
82+
<HttpResponse: 200 OK>
83+
84+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
85+
86+
:param request: The network request you want to make. Required.
87+
:type request: ~azure.core.rest.HttpRequest
88+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
89+
:return: The response of your network call. Does not do error handling on your response.
90+
:rtype: ~azure.core.rest.HttpResponse
91+
"""
6992

70-
self.operations = Operations(
71-
self._client, self._config, self._serialize, self._deserialize)
72-
self.cloud_manifest_file = CloudManifestFileOperations(
73-
self._client, self._config, self._serialize, self._deserialize)
74-
self.customer_subscriptions = CustomerSubscriptionsOperations(
75-
self._client, self._config, self._serialize, self._deserialize)
76-
self.products = ProductsOperations(
77-
self._client, self._config, self._serialize, self._deserialize)
78-
self.registrations = RegistrationsOperations(
79-
self._client, self._config, self._serialize, self._deserialize)
80-
self.linked_subscriptions = LinkedSubscriptionsOperations(
81-
self._client, self._config, self._serialize, self._deserialize)
93+
request_copy = deepcopy(request)
94+
request_copy.url = self._client.format_url(request_copy.url)
95+
return self._client.send_request(request_copy, **kwargs)
8296

8397
def close(self):
8498
# type: () -> None

‎sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_configuration.py

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

9-
from typing import TYPE_CHECKING
9+
from typing import Any, TYPE_CHECKING
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

1717
if TYPE_CHECKING:
1818
# pylint: disable=unused-import,ungrouped-imports
19-
from typing import Any
20-
2119
from azure.core.credentials import TokenCredential
2220

2321

@@ -35,16 +33,15 @@ class AzureStackManagementClientConfiguration(Configuration):
3533

3634
def __init__(
3735
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
36+
credential: "TokenCredential",
37+
subscription_id: str,
38+
**kwargs: Any
39+
) -> None:
40+
super(AzureStackManagementClientConfiguration, self).__init__(**kwargs)
4341
if credential is None:
4442
raise ValueError("Parameter 'credential' must not be None.")
4543
if subscription_id is None:
4644
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(AzureStackManagementClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
@@ -68,4 +65,4 @@ def _configure(
6865
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6966
self.authentication_policy = kwargs.get('authentication_policy')
7067
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
68+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_metadata.json

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "AzureStackManagementClient",
66
"filename": "_azure_stack_management_client",
77
"description": "Azure Stack.",
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": false,
1212
"client_side_validation": false,
1313
"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\": [\"AzureStackManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
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\": [\"AzureStackManagementClientConfiguration\"]}}, \"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\": [\"AzureStackManagementClientConfiguration\"]}}, \"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",
@@ -104,11 +103,5 @@
104103
"products": "ProductsOperations",
105104
"registrations": "RegistrationsOperations",
106105
"linked_subscriptions": "LinkedSubscriptionsOperations"
107-
},
108-
"operation_mixins": {
109-
"sync_imports": "None",
110-
"async_imports": "None",
111-
"operations": {
112-
}
113106
}
114107
}

‎sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_patch.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
#
4+
# Copyright (c) Microsoft Corporation. All rights reserved.
5+
#
6+
# The MIT License (MIT)
7+
#
8+
# Permission is hereby granted, free of charge, to any person obtaining a copy
9+
# of this software and associated documentation files (the ""Software""), to
10+
# deal in the Software without restriction, including without limitation the
11+
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12+
# sell copies of the Software, and to permit persons to whom the Software is
13+
# furnished to do so, subject to the following conditions:
14+
#
15+
# The above copyright notice and this permission notice shall be included in
16+
# all copies or substantial portions of the Software.
17+
#
18+
# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24+
# IN THE SOFTWARE.
25+
#
26+
# --------------------------------------------------------------------------
27+
28+
# This file is used for handwritten extensions to the generated code. Example:
29+
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
30+
def patch_sdk():
31+
pass

‎sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_vendor.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) AutoRest Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------
7+
8+
from azure.core.pipeline.transport import HttpRequest
9+
10+
def _convert_request(request, files=None):
11+
data = request.content if not files else None
12+
request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
13+
if files:
14+
request.set_formdata_body(files)
15+
return request
16+
17+
def _format_url_section(template, **kwargs):
18+
components = template.split("/")
19+
while components:
20+
try:
21+
return template.format(**kwargs)
22+
except KeyError as key:
23+
formatted_components = template.split("/")
24+
components = [
25+
c for c in formatted_components if "{}".format(key.args[0]) not in c
26+
]
27+
template = "/".join(components)

‎sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "1.0.0"
9+
VERSION = "1.0.0b1"

‎sdk/azurestack/azure-mgmt-azurestack/azure/mgmt/azurestack/aio/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88

99
from ._azure_stack_management_client import AzureStackManagementClient
1010
__all__ = ['AzureStackManagementClient']
11+
12+
# `._patch.py` is used for handwritten extensions to the generated code
13+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
14+
from ._patch import patch_sdk
15+
patch_sdk()

0 commit comments

Comments
 (0)