Skip to content

Commit a60b3d5

Browse files
AutorestCIAutorestCI
authored
[AutoPR compute/resource-manager] Swagger change for listing virtual machines in a subscription by location (#3418)
* Generated from 3be1a911d16b8296adaedaa7f947fbdd04e85d19 Updated compute.json * Generated from ae050a8fdd8c727b1344880df360fc78188bbd56 Merge branch 'master' into locations_virtualMachines * Generated from f8fd0b64d1e5cdcbac402960aea82d5f0b2838a0 Merge branch 'master' into locations_virtualMachines
1 parent 06b1027 commit a60b3d5

File tree

10 files changed

+294
-18
lines changed

10 files changed

+294
-18
lines changed

‎azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py

+69
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,75 @@ def get_extensions(
108108
return deserialized
109109
get_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions'}
110110

111+
def list_by_location(
112+
self, location, custom_headers=None, raw=False, **operation_config):
113+
"""Gets all the virtual machines under the specified subscription for the
114+
specified location.
115+
116+
:param location: The location for which virtual machines under the
117+
subscription are queried.
118+
:type location: str
119+
:param dict custom_headers: headers that will be added to the request
120+
:param bool raw: returns the direct response alongside the
121+
deserialized response
122+
:param operation_config: :ref:`Operation configuration
123+
overrides<msrest:optionsforoperations>`.
124+
:return: An iterator like instance of VirtualMachine
125+
:rtype:
126+
~azure.mgmt.compute.v2017_03_30.models.VirtualMachinePaged[~azure.mgmt.compute.v2017_03_30.models.VirtualMachine]
127+
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
128+
"""
129+
def internal_paging(next_link=None, raw=False):
130+
131+
if not next_link:
132+
# Construct URL
133+
url = self.list_by_location.metadata['url']
134+
path_format_arguments = {
135+
'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
136+
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
137+
}
138+
url = self._client.format_url(url, **path_format_arguments)
139+
140+
# Construct parameters
141+
query_parameters = {}
142+
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
143+
144+
else:
145+
url = next_link
146+
query_parameters = {}
147+
148+
# Construct headers
149+
header_parameters = {}
150+
header_parameters['Accept'] = 'application/json'
151+
if self.config.generate_client_request_id:
152+
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
153+
if custom_headers:
154+
header_parameters.update(custom_headers)
155+
if self.config.accept_language is not None:
156+
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
157+
158+
# Construct and send request
159+
request = self._client.get(url, query_parameters, header_parameters)
160+
response = self._client.send(request, stream=False, **operation_config)
161+
162+
if response.status_code not in [200]:
163+
exp = CloudError(response)
164+
exp.request_id = response.headers.get('x-ms-request-id')
165+
raise exp
166+
167+
return response
168+
169+
# Deserialize response
170+
deserialized = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
171+
172+
if raw:
173+
header_dict = {}
174+
client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
175+
return client_raw_response
176+
177+
return deserialized
178+
list_by_location.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/virtualMachines'}
179+
111180

112181
def _capture_initial(
113182
self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py

+69
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,75 @@ def get_extensions(
108108
return deserialized
109109
get_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions'}
110110

111+
def list_by_location(
112+
self, location, custom_headers=None, raw=False, **operation_config):
113+
"""Gets all the virtual machines under the specified subscription for the
114+
specified location.
115+
116+
:param location: The location for which virtual machines under the
117+
subscription are queried.
118+
:type location: str
119+
:param dict custom_headers: headers that will be added to the request
120+
:param bool raw: returns the direct response alongside the
121+
deserialized response
122+
:param operation_config: :ref:`Operation configuration
123+
overrides<msrest:optionsforoperations>`.
124+
:return: An iterator like instance of VirtualMachine
125+
:rtype:
126+
~azure.mgmt.compute.v2017_12_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2017_12_01.models.VirtualMachine]
127+
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
128+
"""
129+
def internal_paging(next_link=None, raw=False):
130+
131+
if not next_link:
132+
# Construct URL
133+
url = self.list_by_location.metadata['url']
134+
path_format_arguments = {
135+
'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
136+
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
137+
}
138+
url = self._client.format_url(url, **path_format_arguments)
139+
140+
# Construct parameters
141+
query_parameters = {}
142+
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
143+
144+
else:
145+
url = next_link
146+
query_parameters = {}
147+
148+
# Construct headers
149+
header_parameters = {}
150+
header_parameters['Accept'] = 'application/json'
151+
if self.config.generate_client_request_id:
152+
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
153+
if custom_headers:
154+
header_parameters.update(custom_headers)
155+
if self.config.accept_language is not None:
156+
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
157+
158+
# Construct and send request
159+
request = self._client.get(url, query_parameters, header_parameters)
160+
response = self._client.send(request, stream=False, **operation_config)
161+
162+
if response.status_code not in [200]:
163+
exp = CloudError(response)
164+
exp.request_id = response.headers.get('x-ms-request-id')
165+
raise exp
166+
167+
return response
168+
169+
# Deserialize response
170+
deserialized = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
171+
172+
if raw:
173+
header_dict = {}
174+
client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
175+
return client_raw_response
176+
177+
return deserialized
178+
list_by_location.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/virtualMachines'}
179+
111180

112181
def _capture_initial(
113182
self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):

‎azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
from .operations.virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
2020
from .operations.virtual_machine_images_operations import VirtualMachineImagesOperations
2121
from .operations.usage_operations import UsageOperations
22+
from .operations.virtual_machines_operations import VirtualMachinesOperations
2223
from .operations.virtual_machine_sizes_operations import VirtualMachineSizesOperations
2324
from .operations.images_operations import ImagesOperations
24-
from .operations.virtual_machines_operations import VirtualMachinesOperations
2525
from .operations.virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
2626
from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
2727
from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
@@ -85,12 +85,12 @@ class ComputeManagementClient(SDKClient):
8585
:vartype virtual_machine_images: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations
8686
:ivar usage: Usage operations
8787
:vartype usage: azure.mgmt.compute.v2018_04_01.operations.UsageOperations
88+
:ivar virtual_machines: VirtualMachines operations
89+
:vartype virtual_machines: azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations
8890
:ivar virtual_machine_sizes: VirtualMachineSizes operations
8991
:vartype virtual_machine_sizes: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations
9092
:ivar images: Images operations
9193
:vartype images: azure.mgmt.compute.v2018_04_01.operations.ImagesOperations
92-
:ivar virtual_machines: VirtualMachines operations
93-
:vartype virtual_machines: azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations
9494
:ivar virtual_machine_scale_sets: VirtualMachineScaleSets operations
9595
:vartype virtual_machine_scale_sets: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations
9696
:ivar virtual_machine_scale_set_extensions: VirtualMachineScaleSetExtensions operations
@@ -141,12 +141,12 @@ def __init__(
141141
self._client, self.config, self._serialize, self._deserialize)
142142
self.usage = UsageOperations(
143143
self._client, self.config, self._serialize, self._deserialize)
144+
self.virtual_machines = VirtualMachinesOperations(
145+
self._client, self.config, self._serialize, self._deserialize)
144146
self.virtual_machine_sizes = VirtualMachineSizesOperations(
145147
self._client, self.config, self._serialize, self._deserialize)
146148
self.images = ImagesOperations(
147149
self._client, self.config, self._serialize, self._deserialize)
148-
self.virtual_machines = VirtualMachinesOperations(
149-
self._client, self.config, self._serialize, self._deserialize)
150150
self.virtual_machine_scale_sets = VirtualMachineScaleSetsOperations(
151151
self._client, self.config, self._serialize, self._deserialize)
152152
self.virtual_machine_scale_set_extensions = VirtualMachineScaleSetExtensionsOperations(

‎azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@
295295
from .availability_set_paged import AvailabilitySetPaged
296296
from .virtual_machine_size_paged import VirtualMachineSizePaged
297297
from .usage_paged import UsagePaged
298-
from .image_paged import ImagePaged
299298
from .virtual_machine_paged import VirtualMachinePaged
299+
from .image_paged import ImagePaged
300300
from .virtual_machine_scale_set_paged import VirtualMachineScaleSetPaged
301301
from .virtual_machine_scale_set_sku_paged import VirtualMachineScaleSetSkuPaged
302302
from .upgrade_operation_historical_status_info_paged import UpgradeOperationHistoricalStatusInfoPaged
@@ -480,8 +480,8 @@
480480
'AvailabilitySetPaged',
481481
'VirtualMachineSizePaged',
482482
'UsagePaged',
483-
'ImagePaged',
484483
'VirtualMachinePaged',
484+
'ImagePaged',
485485
'VirtualMachineScaleSetPaged',
486486
'VirtualMachineScaleSetSkuPaged',
487487
'UpgradeOperationHistoricalStatusInfoPaged',

‎azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
from .virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
1616
from .virtual_machine_images_operations import VirtualMachineImagesOperations
1717
from .usage_operations import UsageOperations
18+
from .virtual_machines_operations import VirtualMachinesOperations
1819
from .virtual_machine_sizes_operations import VirtualMachineSizesOperations
1920
from .images_operations import ImagesOperations
20-
from .virtual_machines_operations import VirtualMachinesOperations
2121
from .virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
2222
from .virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
2323
from .virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
@@ -34,9 +34,9 @@
3434
'VirtualMachineExtensionsOperations',
3535
'VirtualMachineImagesOperations',
3636
'UsageOperations',
37+
'VirtualMachinesOperations',
3738
'VirtualMachineSizesOperations',
3839
'ImagesOperations',
39-
'VirtualMachinesOperations',
4040
'VirtualMachineScaleSetsOperations',
4141
'VirtualMachineScaleSetExtensionsOperations',
4242
'VirtualMachineScaleSetRollingUpgradesOperations',

‎azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py

+69
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,75 @@ def __init__(self, client, config, serializer, deserializer):
3939

4040
self.config = config
4141

42+
def list_by_location(
43+
self, location, custom_headers=None, raw=False, **operation_config):
44+
"""Gets all the virtual machines under the specified subscription for the
45+
specified location.
46+
47+
:param location: The location for which virtual machines under the
48+
subscription are queried.
49+
:type location: str
50+
:param dict custom_headers: headers that will be added to the request
51+
:param bool raw: returns the direct response alongside the
52+
deserialized response
53+
:param operation_config: :ref:`Operation configuration
54+
overrides<msrest:optionsforoperations>`.
55+
:return: An iterator like instance of VirtualMachine
56+
:rtype:
57+
~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
58+
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
59+
"""
60+
def internal_paging(next_link=None, raw=False):
61+
62+
if not next_link:
63+
# Construct URL
64+
url = self.list_by_location.metadata['url']
65+
path_format_arguments = {
66+
'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
67+
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
68+
}
69+
url = self._client.format_url(url, **path_format_arguments)
70+
71+
# Construct parameters
72+
query_parameters = {}
73+
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
74+
75+
else:
76+
url = next_link
77+
query_parameters = {}
78+
79+
# Construct headers
80+
header_parameters = {}
81+
header_parameters['Accept'] = 'application/json'
82+
if self.config.generate_client_request_id:
83+
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
84+
if custom_headers:
85+
header_parameters.update(custom_headers)
86+
if self.config.accept_language is not None:
87+
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
88+
89+
# Construct and send request
90+
request = self._client.get(url, query_parameters, header_parameters)
91+
response = self._client.send(request, stream=False, **operation_config)
92+
93+
if response.status_code not in [200]:
94+
exp = CloudError(response)
95+
exp.request_id = response.headers.get('x-ms-request-id')
96+
raise exp
97+
98+
return response
99+
100+
# Deserialize response
101+
deserialized = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
102+
103+
if raw:
104+
header_dict = {}
105+
client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
106+
return client_raw_response
107+
108+
return deserialized
109+
list_by_location.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/virtualMachines'}
110+
42111

43112
def _capture_initial(
44113
self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
from .operations.virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
2020
from .operations.virtual_machine_images_operations import VirtualMachineImagesOperations
2121
from .operations.usage_operations import UsageOperations
22+
from .operations.virtual_machines_operations import VirtualMachinesOperations
2223
from .operations.virtual_machine_sizes_operations import VirtualMachineSizesOperations
2324
from .operations.images_operations import ImagesOperations
24-
from .operations.virtual_machines_operations import VirtualMachinesOperations
2525
from .operations.virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
2626
from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
2727
from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
@@ -88,12 +88,12 @@ class ComputeManagementClient(SDKClient):
8888
:vartype virtual_machine_images: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineImagesOperations
8989
:ivar usage: Usage operations
9090
:vartype usage: azure.mgmt.compute.v2018_06_01.operations.UsageOperations
91+
:ivar virtual_machines: VirtualMachines operations
92+
:vartype virtual_machines: azure.mgmt.compute.v2018_06_01.operations.VirtualMachinesOperations
9193
:ivar virtual_machine_sizes: VirtualMachineSizes operations
9294
:vartype virtual_machine_sizes: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineSizesOperations
9395
:ivar images: Images operations
9496
:vartype images: azure.mgmt.compute.v2018_06_01.operations.ImagesOperations
95-
:ivar virtual_machines: VirtualMachines operations
96-
:vartype virtual_machines: azure.mgmt.compute.v2018_06_01.operations.VirtualMachinesOperations
9797
:ivar virtual_machine_scale_sets: VirtualMachineScaleSets operations
9898
:vartype virtual_machine_scale_sets: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetsOperations
9999
:ivar virtual_machine_scale_set_extensions: VirtualMachineScaleSetExtensions operations
@@ -150,12 +150,12 @@ def __init__(
150150
self._client, self.config, self._serialize, self._deserialize)
151151
self.usage = UsageOperations(
152152
self._client, self.config, self._serialize, self._deserialize)
153+
self.virtual_machines = VirtualMachinesOperations(
154+
self._client, self.config, self._serialize, self._deserialize)
153155
self.virtual_machine_sizes = VirtualMachineSizesOperations(
154156
self._client, self.config, self._serialize, self._deserialize)
155157
self.images = ImagesOperations(
156158
self._client, self.config, self._serialize, self._deserialize)
157-
self.virtual_machines = VirtualMachinesOperations(
158-
self._client, self.config, self._serialize, self._deserialize)
159159
self.virtual_machine_scale_sets = VirtualMachineScaleSetsOperations(
160160
self._client, self.config, self._serialize, self._deserialize)
161161
self.virtual_machine_scale_set_extensions = VirtualMachineScaleSetExtensionsOperations(

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@
343343
from .availability_set_paged import AvailabilitySetPaged
344344
from .virtual_machine_size_paged import VirtualMachineSizePaged
345345
from .usage_paged import UsagePaged
346-
from .image_paged import ImagePaged
347346
from .virtual_machine_paged import VirtualMachinePaged
347+
from .image_paged import ImagePaged
348348
from .virtual_machine_scale_set_paged import VirtualMachineScaleSetPaged
349349
from .virtual_machine_scale_set_sku_paged import VirtualMachineScaleSetSkuPaged
350350
from .upgrade_operation_historical_status_info_paged import UpgradeOperationHistoricalStatusInfoPaged
@@ -562,8 +562,8 @@
562562
'AvailabilitySetPaged',
563563
'VirtualMachineSizePaged',
564564
'UsagePaged',
565-
'ImagePaged',
566565
'VirtualMachinePaged',
566+
'ImagePaged',
567567
'VirtualMachineScaleSetPaged',
568568
'VirtualMachineScaleSetSkuPaged',
569569
'UpgradeOperationHistoricalStatusInfoPaged',

0 commit comments

Comments
 (0)