Skip to content

Commit 0629540

Browse files
[AutoRelease] t2-batch-2022-02-17-26954 (Azure#23097)
* code and test * update test results * update test results * Update CHANGELOG.md Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Co-authored-by: BigCat20196 <1095260342@qq.com>
1 parent 93c66bf commit 0629540

File tree

47 files changed

+7639
-8360
lines changed

Some content is hidden

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

47 files changed

+7639
-8360
lines changed

sdk/batch/azure-mgmt-batch/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Release History
22

3+
## 16.1.0 (2022-02-24)
4+
5+
**Features**
6+
7+
- Added operation BatchAccountOperations.get_detector
8+
- Added operation BatchAccountOperations.list_detectors
9+
- Model NetworkConfiguration has a new parameter dynamic_v_net_assignment_scope
10+
311
## 16.0.0 (2021-07-30)
412

513
**Features**
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/modelerfour@4.19.2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/modelerfour@4.19.3"
66
],
7-
"commit": "d81e31601e4bcc061ac6436de40d97b7db5e4dd3",
7+
"commit": "3f59f46d112c58cb8f6231732e88848f0f97872c",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/batch/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/modelerfour@4.19.2 --version=3.4.5",
9+
"autorest_command": "autorest specification/batch/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
1010
"readme": "specification/batch/resource-manager/readme.md"
1111
}

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/__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__ = ['BatchManagementClient']
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/batch/azure-mgmt-batch/azure/mgmt/batch/_batch_management_client.py

Lines changed: 55 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,22 @@
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 BatchManagementClientConfiguration
18+
from .operations import ApplicationOperations, ApplicationPackageOperations, BatchAccountOperations, CertificateOperations, LocationOperations, Operations, PoolOperations, PrivateEndpointConnectionOperations, PrivateLinkResourceOperations
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
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import BatchManagementClientConfiguration
22-
from .operations import BatchAccountOperations
23-
from .operations import ApplicationPackageOperations
24-
from .operations import ApplicationOperations
25-
from .operations import LocationOperations
26-
from .operations import Operations
27-
from .operations import CertificateOperations
28-
from .operations import PrivateLinkResourceOperations
29-
from .operations import PrivateEndpointConnectionOperations
30-
from .operations import PoolOperations
31-
from . import models
32-
3323

34-
class BatchManagementClient(object):
24+
class BatchManagementClient:
3525
"""Batch Client.
3626
3727
:ivar batch_account: BatchAccountOperations operations
@@ -49,71 +39,71 @@ class BatchManagementClient(object):
4939
:ivar private_link_resource: PrivateLinkResourceOperations operations
5040
:vartype private_link_resource: azure.mgmt.batch.operations.PrivateLinkResourceOperations
5141
:ivar private_endpoint_connection: PrivateEndpointConnectionOperations operations
52-
:vartype private_endpoint_connection: azure.mgmt.batch.operations.PrivateEndpointConnectionOperations
42+
:vartype private_endpoint_connection:
43+
azure.mgmt.batch.operations.PrivateEndpointConnectionOperations
5344
:ivar pool: PoolOperations operations
5445
:vartype pool: azure.mgmt.batch.operations.PoolOperations
5546
:param credential: Credential needed for the client to connect to Azure.
5647
:type credential: ~azure.core.credentials.TokenCredential
57-
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000).
48+
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g.
49+
00000000-0000-0000-0000-000000000000).
5850
:type subscription_id: str
59-
:param str base_url: Service URL
60-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
51+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
52+
:type base_url: str
53+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
54+
Retry-After header is present.
6155
"""
6256

6357
def __init__(
6458
self,
65-
credential, # type: "TokenCredential"
66-
subscription_id, # type: str
67-
base_url=None, # type: Optional[str]
68-
**kwargs # type: Any
69-
):
70-
# type: (...) -> None
71-
if not base_url:
72-
base_url = 'https://management.azure.com'
73-
self._config = BatchManagementClientConfiguration(credential, subscription_id, **kwargs)
59+
credential: "TokenCredential",
60+
subscription_id: str,
61+
base_url: str = "https://management.azure.com",
62+
**kwargs: Any
63+
) -> None:
64+
self._config = BatchManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
7465
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
7566

7667
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
7768
self._serialize = Serializer(client_models)
78-
self._serialize.client_side_validation = False
7969
self._deserialize = Deserializer(client_models)
80-
81-
self.batch_account = BatchAccountOperations(
82-
self._client, self._config, self._serialize, self._deserialize)
83-
self.application_package = ApplicationPackageOperations(
84-
self._client, self._config, self._serialize, self._deserialize)
85-
self.application = ApplicationOperations(
86-
self._client, self._config, self._serialize, self._deserialize)
87-
self.location = LocationOperations(
88-
self._client, self._config, self._serialize, self._deserialize)
89-
self.operations = Operations(
90-
self._client, self._config, self._serialize, self._deserialize)
91-
self.certificate = CertificateOperations(
92-
self._client, self._config, self._serialize, self._deserialize)
93-
self.private_link_resource = PrivateLinkResourceOperations(
94-
self._client, self._config, self._serialize, self._deserialize)
95-
self.private_endpoint_connection = PrivateEndpointConnectionOperations(
96-
self._client, self._config, self._serialize, self._deserialize)
97-
self.pool = PoolOperations(
98-
self._client, self._config, self._serialize, self._deserialize)
99-
100-
def _send_request(self, http_request, **kwargs):
101-
# type: (HttpRequest, Any) -> HttpResponse
70+
self._serialize.client_side_validation = False
71+
self.batch_account = BatchAccountOperations(self._client, self._config, self._serialize, self._deserialize)
72+
self.application_package = ApplicationPackageOperations(self._client, self._config, self._serialize, self._deserialize)
73+
self.application = ApplicationOperations(self._client, self._config, self._serialize, self._deserialize)
74+
self.location = LocationOperations(self._client, self._config, self._serialize, self._deserialize)
75+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
76+
self.certificate = CertificateOperations(self._client, self._config, self._serialize, self._deserialize)
77+
self.private_link_resource = PrivateLinkResourceOperations(self._client, self._config, self._serialize, self._deserialize)
78+
self.private_endpoint_connection = PrivateEndpointConnectionOperations(self._client, self._config, self._serialize, self._deserialize)
79+
self.pool = PoolOperations(self._client, self._config, self._serialize, self._deserialize)
80+
81+
82+
def _send_request(
83+
self,
84+
request, # type: HttpRequest
85+
**kwargs: Any
86+
) -> HttpResponse:
10287
"""Runs the network request through the client's chained policies.
10388
104-
:param http_request: The network request you want to make. Required.
105-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
106-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
89+
>>> from azure.core.rest import HttpRequest
90+
>>> request = HttpRequest("GET", "https://www.example.org/")
91+
<HttpRequest [GET], url: 'https://www.example.org/'>
92+
>>> response = client._send_request(request)
93+
<HttpResponse: 200 OK>
94+
95+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
96+
97+
:param request: The network request you want to make. Required.
98+
:type request: ~azure.core.rest.HttpRequest
99+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
107100
:return: The response of your network call. Does not do error handling on your response.
108-
:rtype: ~azure.core.pipeline.transport.HttpResponse
101+
:rtype: ~azure.core.rest.HttpResponse
109102
"""
110-
path_format_arguments = {
111-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
112-
}
113-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
114-
stream = kwargs.pop("stream", True)
115-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
116-
return pipeline_response.http_response
103+
104+
request_copy = deepcopy(request)
105+
request_copy.url = self._client.format_url(request_copy.url)
106+
return self._client.send_request(request_copy, **kwargs)
117107

118108
def close(self):
119109
# type: () -> None

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

Lines changed: 9 additions & 12 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,20 +33,19 @@ class BatchManagementClientConfiguration(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(BatchManagementClientConfiguration, 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(BatchManagementClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
51-
self.api_version = "2021-06-01"
48+
self.api_version = "2022-01-01"
5249
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5350
kwargs.setdefault('sdk_moniker', 'mgmt-batch/{}'.format(VERSION))
5451
self._configure(**kwargs)
@@ -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/batch/azure-mgmt-batch/azure/mgmt/batch/_metadata.json

Lines changed: 12 additions & 13 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": "2022-01-01",
3+
"total_api_version_list": ["2022-01-01"],
44
"client": {
55
"name": "BatchManagementClient",
66
"filename": "_batch_management_client",
77
"description": "Batch Client.",
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\": [\"BatchManagementClientConfiguration\"]}}, \"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\": [\"BatchManagementClientConfiguration\"]}}, \"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\": [\"BatchManagementClientConfiguration\"]}}, \"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\": [\"BatchManagementClientConfiguration\"]}}, \"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
"batch_account": "BatchAccountOperations",

0 commit comments

Comments
 (0)