Skip to content

Commit 15479ef

Browse files
AutorestCIAutorestCI
committed
Generated from d4e9a10c23b602709da6ec04f970c7802ca60af3 (#2886)
Got the latest code from official repo master branch and resolved the conflicts.
1 parent 946d5dc commit 15479ef

16 files changed

+20
-354
lines changed

‎azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -231,71 +231,6 @@ def get(
231231
return deserialized
232232
get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
233233

234-
def list_by_subscription(
235-
self, custom_headers=None, raw=False, **operation_config):
236-
"""Lists all availability sets in a subscription.
237-
238-
:param dict custom_headers: headers that will be added to the request
239-
:param bool raw: returns the direct response alongside the
240-
deserialized response
241-
:param operation_config: :ref:`Operation configuration
242-
overrides<msrest:optionsforoperations>`.
243-
:return: An iterator like instance of AvailabilitySet
244-
:rtype:
245-
~azure.mgmt.compute.v2016_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_03_30.models.AvailabilitySet]
246-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
247-
"""
248-
def internal_paging(next_link=None, raw=False):
249-
250-
if not next_link:
251-
# Construct URL
252-
url = self.list_by_subscription.metadata['url']
253-
path_format_arguments = {
254-
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
255-
}
256-
url = self._client.format_url(url, **path_format_arguments)
257-
258-
# Construct parameters
259-
query_parameters = {}
260-
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
261-
262-
else:
263-
url = next_link
264-
query_parameters = {}
265-
266-
# Construct headers
267-
header_parameters = {}
268-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
269-
if self.config.generate_client_request_id:
270-
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
271-
if custom_headers:
272-
header_parameters.update(custom_headers)
273-
if self.config.accept_language is not None:
274-
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
275-
276-
# Construct and send request
277-
request = self._client.get(url, query_parameters)
278-
response = self._client.send(
279-
request, header_parameters, stream=False, **operation_config)
280-
281-
if response.status_code not in [200]:
282-
exp = CloudError(response)
283-
exp.request_id = response.headers.get('x-ms-request-id')
284-
raise exp
285-
286-
return response
287-
288-
# Deserialize response
289-
deserialized = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
290-
291-
if raw:
292-
header_dict = {}
293-
client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
294-
return client_raw_response
295-
296-
return deserialized
297-
list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
298-
299234
def list(
300235
self, resource_group_name, custom_headers=None, raw=False, **operation_config):
301236
"""Lists all availability sets in a resource group.

‎azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -232,71 +232,6 @@ def get(
232232
return deserialized
233233
get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
234234

235-
def list_by_subscription(
236-
self, custom_headers=None, raw=False, **operation_config):
237-
"""Lists all availability sets in a subscription.
238-
239-
:param dict custom_headers: headers that will be added to the request
240-
:param bool raw: returns the direct response alongside the
241-
deserialized response
242-
:param operation_config: :ref:`Operation configuration
243-
overrides<msrest:optionsforoperations>`.
244-
:return: An iterator like instance of AvailabilitySet
245-
:rtype:
246-
~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySet]
247-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
248-
"""
249-
def internal_paging(next_link=None, raw=False):
250-
251-
if not next_link:
252-
# Construct URL
253-
url = self.list_by_subscription.metadata['url']
254-
path_format_arguments = {
255-
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
256-
}
257-
url = self._client.format_url(url, **path_format_arguments)
258-
259-
# Construct parameters
260-
query_parameters = {}
261-
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
262-
263-
else:
264-
url = next_link
265-
query_parameters = {}
266-
267-
# Construct headers
268-
header_parameters = {}
269-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
270-
if self.config.generate_client_request_id:
271-
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
272-
if custom_headers:
273-
header_parameters.update(custom_headers)
274-
if self.config.accept_language is not None:
275-
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
276-
277-
# Construct and send request
278-
request = self._client.get(url, query_parameters)
279-
response = self._client.send(
280-
request, header_parameters, stream=False, **operation_config)
281-
282-
if response.status_code not in [200]:
283-
exp = CloudError(response)
284-
exp.request_id = response.headers.get('x-ms-request-id')
285-
raise exp
286-
287-
return response
288-
289-
# Deserialize response
290-
deserialized = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
291-
292-
if raw:
293-
header_dict = {}
294-
client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
295-
return client_raw_response
296-
297-
return deserialized
298-
list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
299-
300235
def list(
301236
self, resource_group_name, custom_headers=None, raw=False, **operation_config):
302237
"""Lists all availability sets in a resource group.

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

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -231,71 +231,6 @@ def get(
231231
return deserialized
232232
get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
233233

234-
def list_by_subscription(
235-
self, custom_headers=None, raw=False, **operation_config):
236-
"""Lists all availability sets in a subscription.
237-
238-
:param dict custom_headers: headers that will be added to the request
239-
:param bool raw: returns the direct response alongside the
240-
deserialized response
241-
:param operation_config: :ref:`Operation configuration
242-
overrides<msrest:optionsforoperations>`.
243-
:return: An iterator like instance of AvailabilitySet
244-
:rtype:
245-
~azure.mgmt.compute.v2017_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_03_30.models.AvailabilitySet]
246-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
247-
"""
248-
def internal_paging(next_link=None, raw=False):
249-
250-
if not next_link:
251-
# Construct URL
252-
url = self.list_by_subscription.metadata['url']
253-
path_format_arguments = {
254-
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
255-
}
256-
url = self._client.format_url(url, **path_format_arguments)
257-
258-
# Construct parameters
259-
query_parameters = {}
260-
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
261-
262-
else:
263-
url = next_link
264-
query_parameters = {}
265-
266-
# Construct headers
267-
header_parameters = {}
268-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
269-
if self.config.generate_client_request_id:
270-
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
271-
if custom_headers:
272-
header_parameters.update(custom_headers)
273-
if self.config.accept_language is not None:
274-
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
275-
276-
# Construct and send request
277-
request = self._client.get(url, query_parameters)
278-
response = self._client.send(
279-
request, header_parameters, stream=False, **operation_config)
280-
281-
if response.status_code not in [200]:
282-
exp = CloudError(response)
283-
exp.request_id = response.headers.get('x-ms-request-id')
284-
raise exp
285-
286-
return response
287-
288-
# Deserialize response
289-
deserialized = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
290-
291-
if raw:
292-
header_dict = {}
293-
client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
294-
return client_raw_response
295-
296-
return deserialized
297-
list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
298-
299234
def list(
300235
self, resource_group_name, custom_headers=None, raw=False, **operation_config):
301236
"""Lists all availability sets in a resource group.

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

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -301,71 +301,6 @@ def get(
301301
return deserialized
302302
get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
303303

304-
def list_by_subscription(
305-
self, custom_headers=None, raw=False, **operation_config):
306-
"""Lists all availability sets in a subscription.
307-
308-
:param dict custom_headers: headers that will be added to the request
309-
:param bool raw: returns the direct response alongside the
310-
deserialized response
311-
:param operation_config: :ref:`Operation configuration
312-
overrides<msrest:optionsforoperations>`.
313-
:return: An iterator like instance of AvailabilitySet
314-
:rtype:
315-
~azure.mgmt.compute.v2017_12_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_12_01.models.AvailabilitySet]
316-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
317-
"""
318-
def internal_paging(next_link=None, raw=False):
319-
320-
if not next_link:
321-
# Construct URL
322-
url = self.list_by_subscription.metadata['url']
323-
path_format_arguments = {
324-
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
325-
}
326-
url = self._client.format_url(url, **path_format_arguments)
327-
328-
# Construct parameters
329-
query_parameters = {}
330-
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
331-
332-
else:
333-
url = next_link
334-
query_parameters = {}
335-
336-
# Construct headers
337-
header_parameters = {}
338-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
339-
if self.config.generate_client_request_id:
340-
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
341-
if custom_headers:
342-
header_parameters.update(custom_headers)
343-
if self.config.accept_language is not None:
344-
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
345-
346-
# Construct and send request
347-
request = self._client.get(url, query_parameters)
348-
response = self._client.send(
349-
request, header_parameters, stream=False, **operation_config)
350-
351-
if response.status_code not in [200]:
352-
exp = CloudError(response)
353-
exp.request_id = response.headers.get('x-ms-request-id')
354-
raise exp
355-
356-
return response
357-
358-
# Deserialize response
359-
deserialized = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
360-
361-
if raw:
362-
header_dict = {}
363-
client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
364-
return client_raw_response
365-
366-
return deserialized
367-
list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
368-
369304
def list(
370305
self, resource_group_name, custom_headers=None, raw=False, **operation_config):
371306
"""Lists all availability sets in a resource group.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ class StorageAccountTypes(str, Enum):
213213

214214
standard_lrs = "Standard_LRS"
215215
premium_lrs = "Premium_LRS"
216-
standard_ssd_lrs = "StandardSSD_LRS"
217216

218217

219218
class PassNames(str, Enum):

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414

1515
class DiskSku(Model):
16-
"""The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
16+
"""The disks sku name. Can be Standard_LRS or Premium_LRS.
1717
1818
Variables are only populated by the server, and will be ignored when
1919
sending a request.
2020
2121
:param name: The sku name. Possible values include: 'Standard_LRS',
22-
'Premium_LRS', 'StandardSSD_LRS'
22+
'Premium_LRS'
2323
:type name: str or
2424
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
2525
:ivar tier: The sku tier. Default value: "Standard" .

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414

1515
class DiskSku(Model):
16-
"""The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
16+
"""The disks sku name. Can be Standard_LRS or Premium_LRS.
1717
1818
Variables are only populated by the server, and will be ignored when
1919
sending a request.
2020
2121
:param name: The sku name. Possible values include: 'Standard_LRS',
22-
'Premium_LRS', 'StandardSSD_LRS'
22+
'Premium_LRS'
2323
:type name: str or
2424
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
2525
:ivar tier: The sku tier. Default value: "Standard" .

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ class ImageDataDisk(Model):
3737
machine image. <br><br> This value cannot be larger than 1023 GB
3838
:type disk_size_gb: int
3939
:param storage_account_type: Specifies the storage account type for the
40-
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
41-
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
42-
'StandardSSD_LRS'
40+
managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
41+
values include: 'Standard_LRS', 'Premium_LRS'
4342
:type storage_account_type: str or
4443
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
4544
"""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ class ImageDataDisk(Model):
3737
machine image. <br><br> This value cannot be larger than 1023 GB
3838
:type disk_size_gb: int
3939
:param storage_account_type: Specifies the storage account type for the
40-
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
41-
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
42-
'StandardSSD_LRS'
40+
managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
41+
values include: 'Standard_LRS', 'Premium_LRS'
4342
:type storage_account_type: str or
4443
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
4544
"""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
4343
machine image. <br><br> This value cannot be larger than 1023 GB
4444
:type disk_size_gb: int
4545
:param storage_account_type: Specifies the storage account type for the
46-
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
47-
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
48-
'StandardSSD_LRS'
46+
managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
47+
values include: 'Standard_LRS', 'Premium_LRS'
4948
:type storage_account_type: str or
5049
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
5150
"""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
4343
machine image. <br><br> This value cannot be larger than 1023 GB
4444
:type disk_size_gb: int
4545
:param storage_account_type: Specifies the storage account type for the
46-
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
47-
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
48-
'StandardSSD_LRS'
46+
managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
47+
values include: 'Standard_LRS', 'Premium_LRS'
4948
:type storage_account_type: str or
5049
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
5150
"""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ class ManagedDiskParameters(SubResource):
1818
:param id: Resource Id
1919
:type id: str
2020
:param storage_account_type: Specifies the storage account type for the
21-
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
22-
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
23-
'StandardSSD_LRS'
21+
managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
22+
values include: 'Standard_LRS', 'Premium_LRS'
2423
:type storage_account_type: str or
2524
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
2625
"""

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ class ManagedDiskParameters(SubResource):
1818
:param id: Resource Id
1919
:type id: str
2020
:param storage_account_type: Specifies the storage account type for the
21-
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
22-
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
23-
'StandardSSD_LRS'
21+
managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
22+
values include: 'Standard_LRS', 'Premium_LRS'
2423
:type storage_account_type: str or
2524
~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
2625
"""

0 commit comments

Comments
 (0)