Skip to content

Commit 127b444

Browse files
SDKAutoalexwilcox9
SDKAuto
andcommitted
CodeGen from PR 18748 in Azure/azure-rest-api-specs
desktopvirtualization: generating the 2022-02 sdk (Azure#18748) Co-authored-by: Alex Wilcox <[email protected]>
1 parent 01ab6a1 commit 127b444

Some content is hidden

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

43 files changed

+8727
-7993
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.13.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "2b56c8a3da0e04aea6f6d80a9ac04741d1ae5904",
7+
"commit": "1880c646609cdd627d5c72f255335b4d4048cbcc",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/desktopvirtualization/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/desktopvirtualization/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.13.0 --use=@autorest/[email protected].3 --version=3.7.2",
1010
"readme": "specification/desktopvirtualization/resource-manager/readme.md"
1111
}

sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/__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__ = ['DesktopVirtualizationAPIClient']
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/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/_configuration.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,20 @@
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

24-
class DesktopVirtualizationAPIClientConfiguration(Configuration):
22+
class DesktopVirtualizationAPIClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2523
"""Configuration for DesktopVirtualizationAPIClient.
2624
2725
Note that all parameters used to create this instance are saved as instance
@@ -31,24 +29,28 @@ class DesktopVirtualizationAPIClientConfiguration(Configuration):
3129
:type credential: ~azure.core.credentials.TokenCredential
3230
:param subscription_id: The ID of the target subscription.
3331
:type subscription_id: str
32+
:keyword api_version: Api Version. Default value is "2022-02-10-preview". Note that overriding
33+
this default value may result in unsupported behavior.
34+
:paramtype api_version: str
3435
"""
3536

3637
def __init__(
3738
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
39+
credential: "TokenCredential",
40+
subscription_id: str,
41+
**kwargs: Any
42+
) -> None:
43+
super(DesktopVirtualizationAPIClientConfiguration, self).__init__(**kwargs)
44+
api_version = kwargs.pop('api_version', "2022-02-10-preview") # type: str
45+
4346
if credential is None:
4447
raise ValueError("Parameter 'credential' must not be None.")
4548
if subscription_id is None:
4649
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(DesktopVirtualizationAPIClientConfiguration, self).__init__(**kwargs)
4850

4951
self.credential = credential
5052
self.subscription_id = subscription_id
51-
self.api_version = "2021-09-03-preview"
53+
self.api_version = api_version
5254
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5355
kwargs.setdefault('sdk_moniker', 'mgmt-desktopvirtualization/{}'.format(VERSION))
5456
self._configure(**kwargs)
@@ -68,4 +70,4 @@ def _configure(
6870
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6971
self.authentication_policy = kwargs.get('authentication_policy')
7072
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
73+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/_desktop_virtualization_api_client.py

Lines changed: 76 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -6,138 +6,122 @@
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, TYPE_CHECKING
1011

11-
from azure.mgmt.core import ARMPipelineClient
1212
from msrest import Deserializer, Serializer
1313

14-
if TYPE_CHECKING:
15-
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
18-
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
14+
from azure.core.rest import HttpRequest, HttpResponse
15+
from azure.mgmt.core import ARMPipelineClient
2016

21-
from ._configuration import DesktopVirtualizationAPIClientConfiguration
22-
from .operations import Operations
23-
from .operations import WorkspacesOperations
24-
from .operations import ScalingPlansOperations
25-
from .operations import ApplicationGroupsOperations
26-
from .operations import StartMenuItemsOperations
27-
from .operations import ApplicationsOperations
28-
from .operations import DesktopsOperations
29-
from .operations import HostPoolsOperations
30-
from .operations import UserSessionsOperations
31-
from .operations import SessionHostsOperations
32-
from .operations import MSIXPackagesOperations
33-
from .operations import MsixImagesOperations
34-
from .operations import PrivateEndpointConnectionsOperations
35-
from .operations import PrivateLinkResourcesOperations
3617
from . import models
18+
from ._configuration import DesktopVirtualizationAPIClientConfiguration
19+
from .operations import ApplicationGroupsOperations, ApplicationsOperations, DesktopsOperations, HostPoolsOperations, MSIXPackagesOperations, MsixImagesOperations, Operations, PrivateEndpointConnectionsOperations, PrivateLinkResourcesOperations, ScalingPlansOperations, SessionHostsOperations, StartMenuItemsOperations, UserSessionsOperations, WorkspacesOperations
3720

21+
if TYPE_CHECKING:
22+
# pylint: disable=unused-import,ungrouped-imports
23+
from azure.core.credentials import TokenCredential
3824

39-
class DesktopVirtualizationAPIClient(object):
25+
class DesktopVirtualizationAPIClient: # pylint: disable=too-many-instance-attributes
4026
"""DesktopVirtualizationAPIClient.
4127
4228
:ivar operations: Operations operations
43-
:vartype operations: desktop_virtualization_api_client.operations.Operations
29+
:vartype operations: azure.mgmt.desktopvirtualization.operations.Operations
4430
:ivar workspaces: WorkspacesOperations operations
45-
:vartype workspaces: desktop_virtualization_api_client.operations.WorkspacesOperations
31+
:vartype workspaces: azure.mgmt.desktopvirtualization.operations.WorkspacesOperations
4632
:ivar scaling_plans: ScalingPlansOperations operations
47-
:vartype scaling_plans: desktop_virtualization_api_client.operations.ScalingPlansOperations
33+
:vartype scaling_plans: azure.mgmt.desktopvirtualization.operations.ScalingPlansOperations
4834
:ivar application_groups: ApplicationGroupsOperations operations
49-
:vartype application_groups: desktop_virtualization_api_client.operations.ApplicationGroupsOperations
35+
:vartype application_groups:
36+
azure.mgmt.desktopvirtualization.operations.ApplicationGroupsOperations
5037
:ivar start_menu_items: StartMenuItemsOperations operations
51-
:vartype start_menu_items: desktop_virtualization_api_client.operations.StartMenuItemsOperations
38+
:vartype start_menu_items: azure.mgmt.desktopvirtualization.operations.StartMenuItemsOperations
5239
:ivar applications: ApplicationsOperations operations
53-
:vartype applications: desktop_virtualization_api_client.operations.ApplicationsOperations
40+
:vartype applications: azure.mgmt.desktopvirtualization.operations.ApplicationsOperations
5441
:ivar desktops: DesktopsOperations operations
55-
:vartype desktops: desktop_virtualization_api_client.operations.DesktopsOperations
42+
:vartype desktops: azure.mgmt.desktopvirtualization.operations.DesktopsOperations
5643
:ivar host_pools: HostPoolsOperations operations
57-
:vartype host_pools: desktop_virtualization_api_client.operations.HostPoolsOperations
44+
:vartype host_pools: azure.mgmt.desktopvirtualization.operations.HostPoolsOperations
5845
:ivar user_sessions: UserSessionsOperations operations
59-
:vartype user_sessions: desktop_virtualization_api_client.operations.UserSessionsOperations
46+
:vartype user_sessions: azure.mgmt.desktopvirtualization.operations.UserSessionsOperations
6047
:ivar session_hosts: SessionHostsOperations operations
61-
:vartype session_hosts: desktop_virtualization_api_client.operations.SessionHostsOperations
48+
:vartype session_hosts: azure.mgmt.desktopvirtualization.operations.SessionHostsOperations
6249
:ivar msix_packages: MSIXPackagesOperations operations
63-
:vartype msix_packages: desktop_virtualization_api_client.operations.MSIXPackagesOperations
50+
:vartype msix_packages: azure.mgmt.desktopvirtualization.operations.MSIXPackagesOperations
6451
:ivar msix_images: MsixImagesOperations operations
65-
:vartype msix_images: desktop_virtualization_api_client.operations.MsixImagesOperations
52+
:vartype msix_images: azure.mgmt.desktopvirtualization.operations.MsixImagesOperations
6653
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
67-
:vartype private_endpoint_connections: desktop_virtualization_api_client.operations.PrivateEndpointConnectionsOperations
54+
:vartype private_endpoint_connections:
55+
azure.mgmt.desktopvirtualization.operations.PrivateEndpointConnectionsOperations
6856
:ivar private_link_resources: PrivateLinkResourcesOperations operations
69-
:vartype private_link_resources: desktop_virtualization_api_client.operations.PrivateLinkResourcesOperations
57+
:vartype private_link_resources:
58+
azure.mgmt.desktopvirtualization.operations.PrivateLinkResourcesOperations
7059
:param credential: Credential needed for the client to connect to Azure.
7160
:type credential: ~azure.core.credentials.TokenCredential
7261
:param subscription_id: The ID of the target subscription.
7362
:type subscription_id: str
74-
:param str base_url: Service URL
63+
:param base_url: Service URL. Default value is "https://management.azure.com".
64+
:type base_url: str
65+
:keyword api_version: Api Version. Default value is "2022-02-10-preview". Note that overriding
66+
this default value may result in unsupported behavior.
67+
:paramtype api_version: str
7568
"""
7669

7770
def __init__(
7871
self,
79-
credential, # type: "TokenCredential"
80-
subscription_id, # type: str
81-
base_url=None, # type: Optional[str]
82-
**kwargs # type: Any
83-
):
84-
# type: (...) -> None
85-
if not base_url:
86-
base_url = 'https://management.azure.com'
87-
self._config = DesktopVirtualizationAPIClientConfiguration(credential, subscription_id, **kwargs)
72+
credential: "TokenCredential",
73+
subscription_id: str,
74+
base_url: str = "https://management.azure.com",
75+
**kwargs: Any
76+
) -> None:
77+
self._config = DesktopVirtualizationAPIClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
8878
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8979

9080
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
9181
self._serialize = Serializer(client_models)
92-
self._serialize.client_side_validation = False
9382
self._deserialize = Deserializer(client_models)
94-
95-
self.operations = Operations(
96-
self._client, self._config, self._serialize, self._deserialize)
97-
self.workspaces = WorkspacesOperations(
98-
self._client, self._config, self._serialize, self._deserialize)
99-
self.scaling_plans = ScalingPlansOperations(
100-
self._client, self._config, self._serialize, self._deserialize)
101-
self.application_groups = ApplicationGroupsOperations(
102-
self._client, self._config, self._serialize, self._deserialize)
103-
self.start_menu_items = StartMenuItemsOperations(
104-
self._client, self._config, self._serialize, self._deserialize)
105-
self.applications = ApplicationsOperations(
106-
self._client, self._config, self._serialize, self._deserialize)
107-
self.desktops = DesktopsOperations(
108-
self._client, self._config, self._serialize, self._deserialize)
109-
self.host_pools = HostPoolsOperations(
110-
self._client, self._config, self._serialize, self._deserialize)
111-
self.user_sessions = UserSessionsOperations(
112-
self._client, self._config, self._serialize, self._deserialize)
113-
self.session_hosts = SessionHostsOperations(
114-
self._client, self._config, self._serialize, self._deserialize)
115-
self.msix_packages = MSIXPackagesOperations(
116-
self._client, self._config, self._serialize, self._deserialize)
117-
self.msix_images = MsixImagesOperations(
118-
self._client, self._config, self._serialize, self._deserialize)
119-
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
120-
self._client, self._config, self._serialize, self._deserialize)
121-
self.private_link_resources = PrivateLinkResourcesOperations(
122-
self._client, self._config, self._serialize, self._deserialize)
123-
124-
def _send_request(self, http_request, **kwargs):
125-
# type: (HttpRequest, Any) -> HttpResponse
83+
self._serialize.client_side_validation = False
84+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
85+
self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
86+
self.scaling_plans = ScalingPlansOperations(self._client, self._config, self._serialize, self._deserialize)
87+
self.application_groups = ApplicationGroupsOperations(self._client, self._config, self._serialize, self._deserialize)
88+
self.start_menu_items = StartMenuItemsOperations(self._client, self._config, self._serialize, self._deserialize)
89+
self.applications = ApplicationsOperations(self._client, self._config, self._serialize, self._deserialize)
90+
self.desktops = DesktopsOperations(self._client, self._config, self._serialize, self._deserialize)
91+
self.host_pools = HostPoolsOperations(self._client, self._config, self._serialize, self._deserialize)
92+
self.user_sessions = UserSessionsOperations(self._client, self._config, self._serialize, self._deserialize)
93+
self.session_hosts = SessionHostsOperations(self._client, self._config, self._serialize, self._deserialize)
94+
self.msix_packages = MSIXPackagesOperations(self._client, self._config, self._serialize, self._deserialize)
95+
self.msix_images = MsixImagesOperations(self._client, self._config, self._serialize, self._deserialize)
96+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
97+
self.private_link_resources = PrivateLinkResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
98+
99+
100+
def _send_request(
101+
self,
102+
request: HttpRequest,
103+
**kwargs: Any
104+
) -> HttpResponse:
126105
"""Runs the network request through the client's chained policies.
127106
128-
:param http_request: The network request you want to make. Required.
129-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
130-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
107+
>>> from azure.core.rest import HttpRequest
108+
>>> request = HttpRequest("GET", "https://www.example.org/")
109+
<HttpRequest [GET], url: 'https://www.example.org/'>
110+
>>> response = client._send_request(request)
111+
<HttpResponse: 200 OK>
112+
113+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
114+
115+
:param request: The network request you want to make. Required.
116+
:type request: ~azure.core.rest.HttpRequest
117+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
131118
:return: The response of your network call. Does not do error handling on your response.
132-
:rtype: ~azure.core.pipeline.transport.HttpResponse
119+
:rtype: ~azure.core.rest.HttpResponse
133120
"""
134-
path_format_arguments = {
135-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
136-
}
137-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
138-
stream = kwargs.pop("stream", True)
139-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
140-
return pipeline_response.http_response
121+
122+
request_copy = deepcopy(request)
123+
request_copy.url = self._client.format_url(request_copy.url)
124+
return self._client.send_request(request_copy, **kwargs)
141125

142126
def close(self):
143127
# type: () -> None

0 commit comments

Comments
 (0)