Skip to content

Commit 26442d8

Browse files
author
SDKAuto
committed
CodeGen from PR 12162 in Azure/azure-rest-api-specs
Swagger Linting Fix (Azure#12162) * Fix Linting Issuing * no message * fix description * add description and object back * test to resolve model validation test (cherry picked from commit ab273dfc0d5897683c128ee15da4babafa7a85ba)
1 parent d1a132d commit 26442d8

File tree

4 files changed

+85
-62
lines changed

4 files changed

+85
-62
lines changed

sdk/powerbidedicated/azure-mgmt-powerbidedicated/azure/mgmt/powerbidedicated/models/__init__.py

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from ._models_py3 import DedicatedCapacityAdministrators
1717
from ._models_py3 import DedicatedCapacityUpdateParameters
1818
from ._models_py3 import ErrorResponse, ErrorResponseException
19+
from ._models_py3 import ErrorResponseError
1920
from ._models_py3 import Operation
2021
from ._models_py3 import OperationDisplay
2122
from ._models_py3 import Resource
@@ -30,6 +31,7 @@
3031
from ._models import DedicatedCapacityAdministrators
3132
from ._models import DedicatedCapacityUpdateParameters
3233
from ._models import ErrorResponse, ErrorResponseException
34+
from ._models import ErrorResponseError
3335
from ._models import Operation
3436
from ._models import OperationDisplay
3537
from ._models import Resource
@@ -52,6 +54,7 @@
5254
'DedicatedCapacityAdministrators',
5355
'DedicatedCapacityUpdateParameters',
5456
'ErrorResponse', 'ErrorResponseException',
57+
'ErrorResponseError',
5558
'Operation',
5659
'OperationDisplay',
5760
'Resource',

sdk/powerbidedicated/azure-mgmt-powerbidedicated/azure/mgmt/powerbidedicated/models/_models.py

+24-8
Original file line numberDiff line numberDiff line change
@@ -232,21 +232,17 @@ def __init__(self, **kwargs):
232232
class ErrorResponse(Model):
233233
"""Describes the format of Error response.
234234
235-
:param code: Error code
236-
:type code: str
237-
:param message: Error message indicating why the operation failed.
238-
:type message: str
235+
:param error: The error object
236+
:type error: ~azure.mgmt.powerbidedicated.models.ErrorResponseError
239237
"""
240238

241239
_attribute_map = {
242-
'code': {'key': 'code', 'type': 'str'},
243-
'message': {'key': 'message', 'type': 'str'},
240+
'error': {'key': 'error', 'type': 'ErrorResponseError'},
244241
}
245242

246243
def __init__(self, **kwargs):
247244
super(ErrorResponse, self).__init__(**kwargs)
248-
self.code = kwargs.get('code', None)
249-
self.message = kwargs.get('message', None)
245+
self.error = kwargs.get('error', None)
250246

251247

252248
class ErrorResponseException(HttpOperationError):
@@ -261,6 +257,26 @@ def __init__(self, deserialize, response, *args):
261257
super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args)
262258

263259

260+
class ErrorResponseError(Model):
261+
"""The error object.
262+
263+
:param code: Error code
264+
:type code: str
265+
:param message: Error message indicating why the operation failed.
266+
:type message: str
267+
"""
268+
269+
_attribute_map = {
270+
'code': {'key': 'code', 'type': 'str'},
271+
'message': {'key': 'message', 'type': 'str'},
272+
}
273+
274+
def __init__(self, **kwargs):
275+
super(ErrorResponseError, self).__init__(**kwargs)
276+
self.code = kwargs.get('code', None)
277+
self.message = kwargs.get('message', None)
278+
279+
264280
class Operation(Model):
265281
"""Capacities REST API operation.
266282

sdk/powerbidedicated/azure-mgmt-powerbidedicated/azure/mgmt/powerbidedicated/models/_models_py3.py

+25-9
Original file line numberDiff line numberDiff line change
@@ -232,21 +232,17 @@ def __init__(self, *, sku=None, tags=None, administration=None, **kwargs) -> Non
232232
class ErrorResponse(Model):
233233
"""Describes the format of Error response.
234234
235-
:param code: Error code
236-
:type code: str
237-
:param message: Error message indicating why the operation failed.
238-
:type message: str
235+
:param error: The error object
236+
:type error: ~azure.mgmt.powerbidedicated.models.ErrorResponseError
239237
"""
240238

241239
_attribute_map = {
242-
'code': {'key': 'code', 'type': 'str'},
243-
'message': {'key': 'message', 'type': 'str'},
240+
'error': {'key': 'error', 'type': 'ErrorResponseError'},
244241
}
245242

246-
def __init__(self, *, code: str=None, message: str=None, **kwargs) -> None:
243+
def __init__(self, *, error=None, **kwargs) -> None:
247244
super(ErrorResponse, self).__init__(**kwargs)
248-
self.code = code
249-
self.message = message
245+
self.error = error
250246

251247

252248
class ErrorResponseException(HttpOperationError):
@@ -261,6 +257,26 @@ def __init__(self, deserialize, response, *args):
261257
super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args)
262258

263259

260+
class ErrorResponseError(Model):
261+
"""The error object.
262+
263+
:param code: Error code
264+
:type code: str
265+
:param message: Error message indicating why the operation failed.
266+
:type message: str
267+
"""
268+
269+
_attribute_map = {
270+
'code': {'key': 'code', 'type': 'str'},
271+
'message': {'key': 'message', 'type': 'str'},
272+
}
273+
274+
def __init__(self, *, code: str=None, message: str=None, **kwargs) -> None:
275+
super(ErrorResponseError, self).__init__(**kwargs)
276+
self.code = code
277+
self.message = message
278+
279+
264280
class Operation(Model):
265281
"""Capacities REST API operation.
266282

sdk/powerbidedicated/azure-mgmt-powerbidedicated/azure/mgmt/powerbidedicated/operations/_capacities_operations.py

+33-45
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import uuid
1313
from msrest.pipeline import ClientRawResponse
14-
from msrestazure.azure_exceptions import CloudError
1514
from msrest.polling import LROPoller, NoPolling
1615
from msrestazure.polling.arm_polling import ARMPolling
1716

@@ -60,7 +59,8 @@ def get_details(
6059
:return: DedicatedCapacity or ClientRawResponse if raw=true
6160
:rtype: ~azure.mgmt.powerbidedicated.models.DedicatedCapacity or
6261
~msrest.pipeline.ClientRawResponse
63-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
62+
:raises:
63+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
6464
"""
6565
# Construct URL
6666
url = self.get_details.metadata['url']
@@ -90,9 +90,7 @@ def get_details(
9090
response = self._client.send(request, stream=False, **operation_config)
9191

9292
if response.status_code not in [200]:
93-
exp = CloudError(response)
94-
exp.request_id = response.headers.get('x-ms-request-id')
95-
raise exp
93+
raise models.ErrorResponseException(self._deserialize, response)
9694

9795
deserialized = None
9896
if response.status_code == 200:
@@ -140,9 +138,7 @@ def _create_initial(
140138
response = self._client.send(request, stream=False, **operation_config)
141139

142140
if response.status_code not in [200, 201]:
143-
exp = CloudError(response)
144-
exp.request_id = response.headers.get('x-ms-request-id')
145-
raise exp
141+
raise models.ErrorResponseException(self._deserialize, response)
146142

147143
deserialized = None
148144

@@ -184,7 +180,8 @@ def create(
184180
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.powerbidedicated.models.DedicatedCapacity]
185181
or
186182
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.powerbidedicated.models.DedicatedCapacity]]
187-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
183+
:raises:
184+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
188185
"""
189186
raw_result = self._create_initial(
190187
resource_group_name=resource_group_name,
@@ -243,9 +240,7 @@ def _delete_initial(
243240
response = self._client.send(request, stream=False, **operation_config)
244241

245242
if response.status_code not in [200, 202, 204]:
246-
exp = CloudError(response)
247-
exp.request_id = response.headers.get('x-ms-request-id')
248-
raise exp
243+
raise models.ErrorResponseException(self._deserialize, response)
249244

250245
if raw:
251246
client_raw_response = ClientRawResponse(None, response)
@@ -271,7 +266,8 @@ def delete(
271266
ClientRawResponse<None> if raw==True
272267
:rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
273268
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
274-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
269+
:raises:
270+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
275271
"""
276272
raw_result = self._delete_initial(
277273
resource_group_name=resource_group_name,
@@ -330,9 +326,7 @@ def _update_initial(
330326
response = self._client.send(request, stream=False, **operation_config)
331327

332328
if response.status_code not in [200, 202]:
333-
exp = CloudError(response)
334-
exp.request_id = response.headers.get('x-ms-request-id')
335-
raise exp
329+
raise models.ErrorResponseException(self._deserialize, response)
336330

337331
deserialized = None
338332

@@ -373,7 +367,8 @@ def update(
373367
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.powerbidedicated.models.DedicatedCapacity]
374368
or
375369
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.powerbidedicated.models.DedicatedCapacity]]
376-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
370+
:raises:
371+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
377372
"""
378373
raw_result = self._update_initial(
379374
resource_group_name=resource_group_name,
@@ -432,9 +427,7 @@ def _suspend_initial(
432427
response = self._client.send(request, stream=False, **operation_config)
433428

434429
if response.status_code not in [200, 202]:
435-
exp = CloudError(response)
436-
exp.request_id = response.headers.get('x-ms-request-id')
437-
raise exp
430+
raise models.ErrorResponseException(self._deserialize, response)
438431

439432
if raw:
440433
client_raw_response = ClientRawResponse(None, response)
@@ -460,7 +453,8 @@ def suspend(
460453
ClientRawResponse<None> if raw==True
461454
:rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
462455
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
463-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
456+
:raises:
457+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
464458
"""
465459
raw_result = self._suspend_initial(
466460
resource_group_name=resource_group_name,
@@ -514,9 +508,7 @@ def _resume_initial(
514508
response = self._client.send(request, stream=False, **operation_config)
515509

516510
if response.status_code not in [200, 202]:
517-
exp = CloudError(response)
518-
exp.request_id = response.headers.get('x-ms-request-id')
519-
raise exp
511+
raise models.ErrorResponseException(self._deserialize, response)
520512

521513
if raw:
522514
client_raw_response = ClientRawResponse(None, response)
@@ -542,7 +534,8 @@ def resume(
542534
ClientRawResponse<None> if raw==True
543535
:rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
544536
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
545-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
537+
:raises:
538+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
546539
"""
547540
raw_result = self._resume_initial(
548541
resource_group_name=resource_group_name,
@@ -582,7 +575,8 @@ def list_by_resource_group(
582575
:return: An iterator like instance of DedicatedCapacity
583576
:rtype:
584577
~azure.mgmt.powerbidedicated.models.DedicatedCapacityPaged[~azure.mgmt.powerbidedicated.models.DedicatedCapacity]
585-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
578+
:raises:
579+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
586580
"""
587581
def prepare_request(next_link=None):
588582
if not next_link:
@@ -622,9 +616,7 @@ def internal_paging(next_link=None):
622616
response = self._client.send(request, stream=False, **operation_config)
623617

624618
if response.status_code not in [200]:
625-
exp = CloudError(response)
626-
exp.request_id = response.headers.get('x-ms-request-id')
627-
raise exp
619+
raise models.ErrorResponseException(self._deserialize, response)
628620

629621
return response
630622

@@ -649,7 +641,8 @@ def list(
649641
:return: An iterator like instance of DedicatedCapacity
650642
:rtype:
651643
~azure.mgmt.powerbidedicated.models.DedicatedCapacityPaged[~azure.mgmt.powerbidedicated.models.DedicatedCapacity]
652-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
644+
:raises:
645+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
653646
"""
654647
def prepare_request(next_link=None):
655648
if not next_link:
@@ -688,9 +681,7 @@ def internal_paging(next_link=None):
688681
response = self._client.send(request, stream=False, **operation_config)
689682

690683
if response.status_code not in [200]:
691-
exp = CloudError(response)
692-
exp.request_id = response.headers.get('x-ms-request-id')
693-
raise exp
684+
raise models.ErrorResponseException(self._deserialize, response)
694685

695686
return response
696687

@@ -717,7 +708,8 @@ def list_skus(
717708
:rtype:
718709
~azure.mgmt.powerbidedicated.models.SkuEnumerationForNewResourceResult
719710
or ~msrest.pipeline.ClientRawResponse
720-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
711+
:raises:
712+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
721713
"""
722714
# Construct URL
723715
url = self.list_skus.metadata['url']
@@ -745,9 +737,7 @@ def list_skus(
745737
response = self._client.send(request, stream=False, **operation_config)
746738

747739
if response.status_code not in [200]:
748-
exp = CloudError(response)
749-
exp.request_id = response.headers.get('x-ms-request-id')
750-
raise exp
740+
raise models.ErrorResponseException(self._deserialize, response)
751741

752742
deserialized = None
753743
if response.status_code == 200:
@@ -781,7 +771,8 @@ def list_skus_for_capacity(
781771
:rtype:
782772
~azure.mgmt.powerbidedicated.models.SkuEnumerationForExistingResourceResult
783773
or ~msrest.pipeline.ClientRawResponse
784-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
774+
:raises:
775+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
785776
"""
786777
# Construct URL
787778
url = self.list_skus_for_capacity.metadata['url']
@@ -811,9 +802,7 @@ def list_skus_for_capacity(
811802
response = self._client.send(request, stream=False, **operation_config)
812803

813804
if response.status_code not in [200]:
814-
exp = CloudError(response)
815-
exp.request_id = response.headers.get('x-ms-request-id')
816-
raise exp
805+
raise models.ErrorResponseException(self._deserialize, response)
817806

818807
deserialized = None
819808
if response.status_code == 200:
@@ -846,7 +835,8 @@ def check_name_availability(
846835
:rtype:
847836
~azure.mgmt.powerbidedicated.models.CheckCapacityNameAvailabilityResult
848837
or ~msrest.pipeline.ClientRawResponse
849-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
838+
:raises:
839+
:class:`ErrorResponseException<azure.mgmt.powerbidedicated.models.ErrorResponseException>`
850840
"""
851841
capacity_parameters = models.CheckCapacityNameAvailabilityParameters(name=name, type=type)
852842

@@ -881,9 +871,7 @@ def check_name_availability(
881871
response = self._client.send(request, stream=False, **operation_config)
882872

883873
if response.status_code not in [200]:
884-
exp = CloudError(response)
885-
exp.request_id = response.headers.get('x-ms-request-id')
886-
raise exp
874+
raise models.ErrorResponseException(self._deserialize, response)
887875

888876
deserialized = None
889877
if response.status_code == 200:

0 commit comments

Comments
 (0)