Skip to content

Commit 425bd1b

Browse files
author
SDKAuto
committed
CodeGen from PR 18192 in Azure/azure-rest-api-specs
Merge 9e9ebca8314ed2dc8cd583bb6fb06945d6048c2f into 9aff6fbac1975af94f6a3bc415be84f67d3311ee
1 parent 14ff5a8 commit 425bd1b

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

+7940
-9061
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": "bd288bec4a31b114a29630cebc9b0c6c4c0686ed",
7+
"commit": "c76db05c209e7e3273990521da05e77fd774174b",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/connectedvmware/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/connectedvmware/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].3 --version=3.7.2",
1010
"readme": "specification/connectedvmware/resource-manager/readme.md"
1111
}

sdk/connectedvmware/azure-mgmt-connectedvmware/azure/mgmt/connectedvmware/__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__ = ['AzureArcVMwareManagementServiceAPI']
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/connectedvmware/azure-mgmt-connectedvmware/azure/mgmt/connectedvmware/_azure_arc_vmware_management_service_api.py

Lines changed: 59 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +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 AzureArcVMwareManagementServiceAPIConfiguration
18+
from .operations import ClustersOperations, DatastoresOperations, GuestAgentsOperations, HostsOperations, HybridIdentityMetadataOperations, InventoryItemsOperations, MachineExtensionsOperations, Operations, ResourcePoolsOperations, VCentersOperations, VirtualMachineTemplatesOperations, VirtualMachinesOperations, VirtualNetworksOperations
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 AzureArcVMwareManagementServiceAPIConfiguration
22-
from .operations import Operations
23-
from .operations import ResourcePoolsOperations
24-
from .operations import ClustersOperations
25-
from .operations import HostsOperations
26-
from .operations import DatastoresOperations
27-
from .operations import VCentersOperations
28-
from .operations import VirtualMachinesOperations
29-
from .operations import VirtualMachineTemplatesOperations
30-
from .operations import VirtualNetworksOperations
31-
from .operations import InventoryItemsOperations
32-
from .operations import HybridIdentityMetadataOperations
33-
from .operations import MachineExtensionsOperations
34-
from .operations import GuestAgentsOperations
35-
from . import models
36-
3723

38-
class AzureArcVMwareManagementServiceAPI(object):
24+
class AzureArcVMwareManagementServiceAPI:
3925
"""Self service experience for VMware.
4026
4127
:ivar operations: Operations operations
@@ -53,13 +39,15 @@ class AzureArcVMwareManagementServiceAPI(object):
5339
:ivar virtual_machines: VirtualMachinesOperations operations
5440
:vartype virtual_machines: azure.mgmt.connectedvmware.operations.VirtualMachinesOperations
5541
:ivar virtual_machine_templates: VirtualMachineTemplatesOperations operations
56-
:vartype virtual_machine_templates: azure.mgmt.connectedvmware.operations.VirtualMachineTemplatesOperations
42+
:vartype virtual_machine_templates:
43+
azure.mgmt.connectedvmware.operations.VirtualMachineTemplatesOperations
5744
:ivar virtual_networks: VirtualNetworksOperations operations
5845
:vartype virtual_networks: azure.mgmt.connectedvmware.operations.VirtualNetworksOperations
5946
:ivar inventory_items: InventoryItemsOperations operations
6047
:vartype inventory_items: azure.mgmt.connectedvmware.operations.InventoryItemsOperations
6148
:ivar hybrid_identity_metadata: HybridIdentityMetadataOperations operations
62-
:vartype hybrid_identity_metadata: azure.mgmt.connectedvmware.operations.HybridIdentityMetadataOperations
49+
:vartype hybrid_identity_metadata:
50+
azure.mgmt.connectedvmware.operations.HybridIdentityMetadataOperations
6351
:ivar machine_extensions: MachineExtensionsOperations operations
6452
:vartype machine_extensions: azure.mgmt.connectedvmware.operations.MachineExtensionsOperations
6553
:ivar guest_agents: GuestAgentsOperations operations
@@ -68,72 +56,66 @@ class AzureArcVMwareManagementServiceAPI(object):
6856
:type credential: ~azure.core.credentials.TokenCredential
6957
:param subscription_id: The Subscription ID.
7058
:type subscription_id: str
71-
:param str base_url: Service URL
72-
: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.
7363
"""
7464

7565
def __init__(
7666
self,
77-
credential, # type: "TokenCredential"
78-
subscription_id, # type: str
79-
base_url=None, # type: Optional[str]
80-
**kwargs # type: Any
81-
):
82-
# type: (...) -> None
83-
if not base_url:
84-
base_url = 'https://management.azure.com'
85-
self._config = AzureArcVMwareManagementServiceAPIConfiguration(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 = AzureArcVMwareManagementServiceAPIConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
8673
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8774

8875
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
8976
self._serialize = Serializer(client_models)
90-
self._serialize.client_side_validation = False
9177
self._deserialize = Deserializer(client_models)
92-
93-
self.operations = Operations(
94-
self._client, self._config, self._serialize, self._deserialize)
95-
self.resource_pools = ResourcePoolsOperations(
96-
self._client, self._config, self._serialize, self._deserialize)
97-
self.clusters = ClustersOperations(
98-
self._client, self._config, self._serialize, self._deserialize)
99-
self.hosts = HostsOperations(
100-
self._client, self._config, self._serialize, self._deserialize)
101-
self.datastores = DatastoresOperations(
102-
self._client, self._config, self._serialize, self._deserialize)
103-
self.vcenters = VCentersOperations(
104-
self._client, self._config, self._serialize, self._deserialize)
105-
self.virtual_machines = VirtualMachinesOperations(
106-
self._client, self._config, self._serialize, self._deserialize)
107-
self.virtual_machine_templates = VirtualMachineTemplatesOperations(
108-
self._client, self._config, self._serialize, self._deserialize)
109-
self.virtual_networks = VirtualNetworksOperations(
110-
self._client, self._config, self._serialize, self._deserialize)
111-
self.inventory_items = InventoryItemsOperations(
112-
self._client, self._config, self._serialize, self._deserialize)
113-
self.hybrid_identity_metadata = HybridIdentityMetadataOperations(
114-
self._client, self._config, self._serialize, self._deserialize)
115-
self.machine_extensions = MachineExtensionsOperations(
116-
self._client, self._config, self._serialize, self._deserialize)
117-
self.guest_agents = GuestAgentsOperations(
118-
self._client, self._config, self._serialize, self._deserialize)
119-
120-
def _send_request(self, http_request, **kwargs):
121-
# type: (HttpRequest, Any) -> HttpResponse
78+
self._serialize.client_side_validation = False
79+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
80+
self.resource_pools = ResourcePoolsOperations(self._client, self._config, self._serialize, self._deserialize)
81+
self.clusters = ClustersOperations(self._client, self._config, self._serialize, self._deserialize)
82+
self.hosts = HostsOperations(self._client, self._config, self._serialize, self._deserialize)
83+
self.datastores = DatastoresOperations(self._client, self._config, self._serialize, self._deserialize)
84+
self.vcenters = VCentersOperations(self._client, self._config, self._serialize, self._deserialize)
85+
self.virtual_machines = VirtualMachinesOperations(self._client, self._config, self._serialize, self._deserialize)
86+
self.virtual_machine_templates = VirtualMachineTemplatesOperations(self._client, self._config, self._serialize, self._deserialize)
87+
self.virtual_networks = VirtualNetworksOperations(self._client, self._config, self._serialize, self._deserialize)
88+
self.inventory_items = InventoryItemsOperations(self._client, self._config, self._serialize, self._deserialize)
89+
self.hybrid_identity_metadata = HybridIdentityMetadataOperations(self._client, self._config, self._serialize, self._deserialize)
90+
self.machine_extensions = MachineExtensionsOperations(self._client, self._config, self._serialize, self._deserialize)
91+
self.guest_agents = GuestAgentsOperations(self._client, self._config, self._serialize, self._deserialize)
92+
93+
94+
def _send_request(
95+
self,
96+
request, # type: HttpRequest
97+
**kwargs: Any
98+
) -> HttpResponse:
12299
"""Runs the network request through the client's chained policies.
123100
124-
:param http_request: The network request you want to make. Required.
125-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
126-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
101+
>>> from azure.core.rest import HttpRequest
102+
>>> request = HttpRequest("GET", "https://www.example.org/")
103+
<HttpRequest [GET], url: 'https://www.example.org/'>
104+
>>> response = client._send_request(request)
105+
<HttpResponse: 200 OK>
106+
107+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
108+
109+
:param request: The network request you want to make. Required.
110+
:type request: ~azure.core.rest.HttpRequest
111+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
127112
:return: The response of your network call. Does not do error handling on your response.
128-
:rtype: ~azure.core.pipeline.transport.HttpResponse
113+
:rtype: ~azure.core.rest.HttpResponse
129114
"""
130-
path_format_arguments = {
131-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
132-
}
133-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
134-
stream = kwargs.pop("stream", True)
135-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
136-
return pipeline_response.http_response
115+
116+
request_copy = deepcopy(request)
117+
request_copy.url = self._client.format_url(request_copy.url)
118+
return self._client.send_request(request_copy, **kwargs)
137119

138120
def close(self):
139121
# type: () -> None

sdk/connectedvmware/azure-mgmt-connectedvmware/azure/mgmt/connectedvmware/_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 AzureArcVMwareManagementServiceAPIConfiguration(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(AzureArcVMwareManagementServiceAPIConfiguration, 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(AzureArcVMwareManagementServiceAPIConfiguration, 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/connectedvmware/azure-mgmt-connectedvmware/azure/mgmt/connectedvmware/_metadata.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "AzureArcVMwareManagementServiceAPI",
66
"filename": "_azure_arc_vmware_management_service_api",
77
"description": "Self service experience for VMware.",
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\": [\"AzureArcVMwareManagementServiceAPIConfiguration\"]}}, \"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\": [\"AzureArcVMwareManagementServiceAPIConfiguration\"]}}, \"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\": [\"AzureArcVMwareManagementServiceAPIConfiguration\"]}}, \"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\": [\"AzureArcVMwareManagementServiceAPIConfiguration\"]}}, \"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",

0 commit comments

Comments
 (0)