Skip to content

Commit aa57b4f

Browse files
author
SDKAuto
committed
CodeGen from PR 18597 in Azure/azure-rest-api-specs
Merge 148c86ff0fb4e44aabdb82e50547e59e5393e49b into e7d2d8c48cf6f8f63de7e252c467930449b5fd88
1 parent de2b0fe commit aa57b4f

Some content is hidden

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

42 files changed

+16603
-17935
lines changed
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": "850425353115aa23d469f12f44847ff9e8326294",
7+
"commit": "2ded927e0a97ba1e79744ac167fb4d7f1c53b24d",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/datamigration/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/datamigration/resource-manager/readme.md --multiapi --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
1010
"readme": "specification/datamigration/resource-manager/readme.md"
1111
}

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['DataMigrationManagementClient']
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/datamigration/azure-mgmt-datamigration/azure/mgmt/datamigration/_configuration.py

+10-13
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

@@ -29,26 +27,25 @@ class DataMigrationManagementClientConfiguration(Configuration):
2927
3028
:param credential: Credential needed for the client to connect to Azure.
3129
:type credential: ~azure.core.credentials.TokenCredential
32-
:param subscription_id: Identifier of the subscription.
30+
:param subscription_id: Subscription ID that identifies an Azure subscription.
3331
:type subscription_id: str
3432
"""
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(DataMigrationManagementClientConfiguration, 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(DataMigrationManagementClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
51-
self.api_version = "2021-06-30"
48+
self.api_version = "2022-03-30-preview"
5249
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5350
kwargs.setdefault('sdk_moniker', 'mgmt-datamigration/{}'.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/datamigration/azure-mgmt-datamigration/azure/mgmt/datamigration/_data_migration_management_client.py

+69-63
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,38 @@
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 DataMigrationManagementClientConfiguration
18+
from .operations import DatabaseMigrationsSqlDbOperations, DatabaseMigrationsSqlMiOperations, DatabaseMigrationsSqlVmOperations, FilesOperations, Operations, ProjectsOperations, ResourceSkusOperations, ServiceTasksOperations, ServicesOperations, SqlMigrationServicesOperations, TasksOperations, UsagesOperations
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 DataMigrationManagementClientConfiguration
22-
from .operations import ResourceSkusOperations
23-
from .operations import ServicesOperations
24-
from .operations import TasksOperations
25-
from .operations import ServiceTasksOperations
26-
from .operations import ProjectsOperations
27-
from .operations import UsagesOperations
28-
from .operations import Operations
29-
from .operations import FilesOperations
30-
from . import models
31-
3223

33-
class DataMigrationManagementClient(object):
24+
class DataMigrationManagementClient:
3425
"""Data Migration Client.
3526
27+
:ivar database_migrations_sql_db: DatabaseMigrationsSqlDbOperations operations
28+
:vartype database_migrations_sql_db:
29+
azure.mgmt.datamigration.operations.DatabaseMigrationsSqlDbOperations
30+
:ivar database_migrations_sql_mi: DatabaseMigrationsSqlMiOperations operations
31+
:vartype database_migrations_sql_mi:
32+
azure.mgmt.datamigration.operations.DatabaseMigrationsSqlMiOperations
33+
:ivar database_migrations_sql_vm: DatabaseMigrationsSqlVmOperations operations
34+
:vartype database_migrations_sql_vm:
35+
azure.mgmt.datamigration.operations.DatabaseMigrationsSqlVmOperations
36+
:ivar operations: Operations operations
37+
:vartype operations: azure.mgmt.datamigration.operations.Operations
38+
:ivar sql_migration_services: SqlMigrationServicesOperations operations
39+
:vartype sql_migration_services:
40+
azure.mgmt.datamigration.operations.SqlMigrationServicesOperations
3641
:ivar resource_skus: ResourceSkusOperations operations
3742
:vartype resource_skus: azure.mgmt.datamigration.operations.ResourceSkusOperations
3843
:ivar services: ServicesOperations operations
@@ -45,70 +50,71 @@ class DataMigrationManagementClient(object):
4550
:vartype projects: azure.mgmt.datamigration.operations.ProjectsOperations
4651
:ivar usages: UsagesOperations operations
4752
:vartype usages: azure.mgmt.datamigration.operations.UsagesOperations
48-
:ivar operations: Operations operations
49-
:vartype operations: azure.mgmt.datamigration.operations.Operations
5053
:ivar files: FilesOperations operations
5154
:vartype files: azure.mgmt.datamigration.operations.FilesOperations
5255
:param credential: Credential needed for the client to connect to Azure.
5356
:type credential: ~azure.core.credentials.TokenCredential
54-
:param subscription_id: Identifier of the subscription.
57+
:param subscription_id: Subscription ID that identifies an Azure subscription.
5558
:type subscription_id: str
56-
:param str base_url: Service URL
57-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
59+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
60+
:type base_url: str
61+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
62+
Retry-After header is present.
5863
"""
5964

6065
def __init__(
6166
self,
62-
credential, # type: "TokenCredential"
63-
subscription_id, # type: str
64-
base_url=None, # type: Optional[str]
65-
**kwargs # type: Any
66-
):
67-
# type: (...) -> None
68-
if not base_url:
69-
base_url = 'https://management.azure.com'
70-
self._config = DataMigrationManagementClientConfiguration(credential, subscription_id, **kwargs)
67+
credential: "TokenCredential",
68+
subscription_id: str,
69+
base_url: str = "https://management.azure.com",
70+
**kwargs: Any
71+
) -> None:
72+
self._config = DataMigrationManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
7173
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
7274

7375
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
7476
self._serialize = Serializer(client_models)
75-
self._serialize.client_side_validation = False
7677
self._deserialize = Deserializer(client_models)
77-
78-
self.resource_skus = ResourceSkusOperations(
79-
self._client, self._config, self._serialize, self._deserialize)
80-
self.services = ServicesOperations(
81-
self._client, self._config, self._serialize, self._deserialize)
82-
self.tasks = TasksOperations(
83-
self._client, self._config, self._serialize, self._deserialize)
84-
self.service_tasks = ServiceTasksOperations(
85-
self._client, self._config, self._serialize, self._deserialize)
86-
self.projects = ProjectsOperations(
87-
self._client, self._config, self._serialize, self._deserialize)
88-
self.usages = UsagesOperations(
89-
self._client, self._config, self._serialize, self._deserialize)
90-
self.operations = Operations(
91-
self._client, self._config, self._serialize, self._deserialize)
92-
self.files = FilesOperations(
93-
self._client, self._config, self._serialize, self._deserialize)
94-
95-
def _send_request(self, http_request, **kwargs):
96-
# type: (HttpRequest, Any) -> HttpResponse
78+
self._serialize.client_side_validation = False
79+
self.database_migrations_sql_db = DatabaseMigrationsSqlDbOperations(self._client, self._config, self._serialize, self._deserialize)
80+
self.database_migrations_sql_mi = DatabaseMigrationsSqlMiOperations(self._client, self._config, self._serialize, self._deserialize)
81+
self.database_migrations_sql_vm = DatabaseMigrationsSqlVmOperations(self._client, self._config, self._serialize, self._deserialize)
82+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
83+
self.sql_migration_services = SqlMigrationServicesOperations(self._client, self._config, self._serialize, self._deserialize)
84+
self.resource_skus = ResourceSkusOperations(self._client, self._config, self._serialize, self._deserialize)
85+
self.services = ServicesOperations(self._client, self._config, self._serialize, self._deserialize)
86+
self.tasks = TasksOperations(self._client, self._config, self._serialize, self._deserialize)
87+
self.service_tasks = ServiceTasksOperations(self._client, self._config, self._serialize, self._deserialize)
88+
self.projects = ProjectsOperations(self._client, self._config, self._serialize, self._deserialize)
89+
self.usages = UsagesOperations(self._client, self._config, self._serialize, self._deserialize)
90+
self.files = FilesOperations(self._client, self._config, self._serialize, self._deserialize)
91+
92+
93+
def _send_request(
94+
self,
95+
request, # type: HttpRequest
96+
**kwargs: Any
97+
) -> HttpResponse:
9798
"""Runs the network request through the client's chained policies.
9899
99-
:param http_request: The network request you want to make. Required.
100-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
101-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
100+
>>> from azure.core.rest import HttpRequest
101+
>>> request = HttpRequest("GET", "https://www.example.org/")
102+
<HttpRequest [GET], url: 'https://www.example.org/'>
103+
>>> response = client._send_request(request)
104+
<HttpResponse: 200 OK>
105+
106+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
107+
108+
:param request: The network request you want to make. Required.
109+
:type request: ~azure.core.rest.HttpRequest
110+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
102111
:return: The response of your network call. Does not do error handling on your response.
103-
:rtype: ~azure.core.pipeline.transport.HttpResponse
112+
:rtype: ~azure.core.rest.HttpResponse
104113
"""
105-
path_format_arguments = {
106-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
107-
}
108-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
109-
stream = kwargs.pop("stream", True)
110-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
111-
return pipeline_response.http_response
114+
115+
request_copy = deepcopy(request)
116+
request_copy.url = self._client.format_url(request_copy.url)
117+
return self._client.send_request(request_copy, **kwargs)
112118

113119
def close(self):
114120
# type: () -> None

0 commit comments

Comments
 (0)