Skip to content

Commit ecf2941

Browse files
zhangyan133SDKAutoYan Zhang (WICRESOFT NORTH AMERICA LTD)
authored
T1 hanaonazure 2021 03 05 (Azure#17104)
* CodeGen from PR 13166 in Azure/azure-rest-api-specs Enable swagger ci for azure-powershell for some RPs (Azure#13166) * test,version,CHANGELOG Co-authored-by: SDKAuto <sdkautomation@microsoft.com> Co-authored-by: Yan Zhang (WICRESOFT NORTH AMERICA LTD) <v-yanzhang@microsoft.com>
1 parent 5a9c6b8 commit ecf2941

File tree

5 files changed

+294
-124
lines changed

5 files changed

+294
-124
lines changed

sdk/hanaonazure/azure-mgmt-hanaonazure/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Release History
22

3+
## 0.15.0 (2021-03-05)
4+
5+
**Breaking changes**
6+
7+
- Parameter location of model SapMonitor is now required
8+
- Parameter location of model TrackedResource is now required
9+
- Model ErrorResponse has a new signature
10+
311
## 0.14.0 (2020-05-14)
412

513
**Features**

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13+
from ._models_py3 import AzureEntityResource
1314
from ._models_py3 import Display
1415
from ._models_py3 import ErrorResponse, ErrorResponseException
16+
from ._models_py3 import ErrorResponseError
1517
from ._models_py3 import Operation
1618
from ._models_py3 import ProviderInstance
1719
from ._models_py3 import ProxyResource
@@ -20,8 +22,10 @@
2022
from ._models_py3 import Tags
2123
from ._models_py3 import TrackedResource
2224
except (SyntaxError, ImportError):
25+
from ._models import AzureEntityResource
2326
from ._models import Display
2427
from ._models import ErrorResponse, ErrorResponseException
28+
from ._models import ErrorResponseError
2529
from ._models import Operation
2630
from ._models import ProviderInstance
2731
from ._models import ProxyResource
@@ -37,8 +41,10 @@
3741
)
3842

3943
__all__ = [
44+
'AzureEntityResource',
4045
'Display',
4146
'ErrorResponse', 'ErrorResponseException',
47+
'ErrorResponseError',
4248
'Operation',
4349
'ProviderInstance',
4450
'ProxyResource',

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

Lines changed: 137 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,84 @@
1313
from msrest.exceptions import HttpOperationError
1414

1515

16+
class Resource(Model):
17+
"""Resource.
18+
19+
Common fields that are returned in the response for all Azure Resource
20+
Manager resources.
21+
22+
Variables are only populated by the server, and will be ignored when
23+
sending a request.
24+
25+
:ivar id: Fully qualified resource ID for the resource. Ex -
26+
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
27+
:vartype id: str
28+
:ivar name: The name of the resource
29+
:vartype name: str
30+
:ivar type: The type of the resource. E.g.
31+
"Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
32+
:vartype type: str
33+
"""
34+
35+
_validation = {
36+
'id': {'readonly': True},
37+
'name': {'readonly': True},
38+
'type': {'readonly': True},
39+
}
40+
41+
_attribute_map = {
42+
'id': {'key': 'id', 'type': 'str'},
43+
'name': {'key': 'name', 'type': 'str'},
44+
'type': {'key': 'type', 'type': 'str'},
45+
}
46+
47+
def __init__(self, **kwargs):
48+
super(Resource, self).__init__(**kwargs)
49+
self.id = None
50+
self.name = None
51+
self.type = None
52+
53+
54+
class AzureEntityResource(Resource):
55+
"""Entity Resource.
56+
57+
The resource model definition for an Azure Resource Manager resource with
58+
an etag.
59+
60+
Variables are only populated by the server, and will be ignored when
61+
sending a request.
62+
63+
:ivar id: Fully qualified resource ID for the resource. Ex -
64+
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
65+
:vartype id: str
66+
:ivar name: The name of the resource
67+
:vartype name: str
68+
:ivar type: The type of the resource. E.g.
69+
"Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
70+
:vartype type: str
71+
:ivar etag: Resource Etag.
72+
:vartype etag: str
73+
"""
74+
75+
_validation = {
76+
'id': {'readonly': True},
77+
'name': {'readonly': True},
78+
'type': {'readonly': True},
79+
'etag': {'readonly': True},
80+
}
81+
82+
_attribute_map = {
83+
'id': {'key': 'id', 'type': 'str'},
84+
'name': {'key': 'name', 'type': 'str'},
85+
'type': {'key': 'type', 'type': 'str'},
86+
'etag': {'key': 'etag', 'type': 'str'},
87+
}
88+
89+
def __init__(self, **kwargs):
90+
super(AzureEntityResource, self).__init__(**kwargs)
91+
self.etag = None
92+
93+
1694
class CloudError(Model):
1795
"""CloudError.
1896
"""
@@ -79,21 +157,17 @@ def __init__(self, **kwargs):
79157
class ErrorResponse(Model):
80158
"""Describes the format of Error response.
81159
82-
:param code: Error code
83-
:type code: str
84-
:param message: Error message indicating why the operation failed.
85-
:type message: str
160+
:param error: Describes the error object.
161+
:type error: ~azure.mgmt.hanaonazure.models.ErrorResponseError
86162
"""
87163

88164
_attribute_map = {
89-
'code': {'key': 'code', 'type': 'str'},
90-
'message': {'key': 'message', 'type': 'str'},
165+
'error': {'key': 'error', 'type': 'ErrorResponseError'},
91166
}
92167

93168
def __init__(self, **kwargs):
94169
super(ErrorResponse, self).__init__(**kwargs)
95-
self.code = kwargs.get('code', None)
96-
self.message = kwargs.get('message', None)
170+
self.error = kwargs.get('error', None)
97171

98172

99173
class ErrorResponseException(HttpOperationError):
@@ -108,84 +182,79 @@ def __init__(self, deserialize, response, *args):
108182
super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args)
109183

110184

111-
class Operation(Model):
112-
"""HANA operation information.
185+
class ErrorResponseError(Model):
186+
"""Describes the error object.
113187
114188
Variables are only populated by the server, and will be ignored when
115189
sending a request.
116190
117-
:ivar name: The name of the operation being performed on this particular
118-
object. This name should match the action name that appears in RBAC / the
119-
event service.
120-
:vartype name: str
121-
:param display: Displayed HANA operation information
122-
:type display: ~azure.mgmt.hanaonazure.models.Display
191+
:ivar code: Error code
192+
:vartype code: str
193+
:ivar message: Error message indicating why the operation failed.
194+
:vartype message: str
123195
"""
124196

125197
_validation = {
126-
'name': {'readonly': True},
198+
'code': {'readonly': True},
199+
'message': {'readonly': True},
127200
}
128201

129202
_attribute_map = {
130-
'name': {'key': 'name', 'type': 'str'},
131-
'display': {'key': 'display', 'type': 'Display'},
203+
'code': {'key': 'code', 'type': 'str'},
204+
'message': {'key': 'message', 'type': 'str'},
132205
}
133206

134207
def __init__(self, **kwargs):
135-
super(Operation, self).__init__(**kwargs)
136-
self.name = None
137-
self.display = kwargs.get('display', None)
208+
super(ErrorResponseError, self).__init__(**kwargs)
209+
self.code = None
210+
self.message = None
138211

139212

140-
class Resource(Model):
141-
"""The core properties of ARM resources.
213+
class Operation(Model):
214+
"""HANA operation information.
142215
143216
Variables are only populated by the server, and will be ignored when
144217
sending a request.
145218
146-
:ivar id: Fully qualified resource Id for the resource. Ex -
147-
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{resourceName}
148-
:vartype id: str
149-
:ivar name: The name of the resource
219+
:ivar name: The name of the operation being performed on this particular
220+
object. This name should match the action name that appears in RBAC / the
221+
event service.
150222
:vartype name: str
151-
:ivar type: The type of the resource. Ex-
152-
Microsoft.Network/trafficManagerProfiles.
153-
:vartype type: str
223+
:param display: Displayed HANA operation information
224+
:type display: ~azure.mgmt.hanaonazure.models.Display
154225
"""
155226

156227
_validation = {
157-
'id': {'readonly': True},
158228
'name': {'readonly': True},
159-
'type': {'readonly': True},
160229
}
161230

162231
_attribute_map = {
163-
'id': {'key': 'id', 'type': 'str'},
164232
'name': {'key': 'name', 'type': 'str'},
165-
'type': {'key': 'type', 'type': 'str'},
233+
'display': {'key': 'display', 'type': 'Display'},
166234
}
167235

168236
def __init__(self, **kwargs):
169-
super(Resource, self).__init__(**kwargs)
170-
self.id = None
237+
super(Operation, self).__init__(**kwargs)
171238
self.name = None
172-
self.type = None
239+
self.display = kwargs.get('display', None)
173240

174241

175242
class ProxyResource(Resource):
176-
"""The resource model definition for a ARM proxy resource. It will have
177-
everything other than required location and tags.
243+
"""Proxy Resource.
244+
245+
The resource model definition for a Azure Resource Manager proxy resource.
246+
It will not have tags and a location.
178247
179248
Variables are only populated by the server, and will be ignored when
180249
sending a request.
181250
182-
:ivar id: Fully qualified resource Id for the resource. Ex -
183-
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{resourceName}
251+
:ivar id: Fully qualified resource ID for the resource. Ex -
252+
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
184253
:vartype id: str
185254
:ivar name: The name of the resource
186255
:vartype name: str
187-
:ivar type: The type of the resource. Ex-
188-
Microsoft.Network/trafficManagerProfiles.
256+
:ivar type: The type of the resource. E.g.
257+
"Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
189258
:vartype type: str
190259
"""
191260

@@ -211,13 +280,13 @@ class ProviderInstance(ProxyResource):
211280
Variables are only populated by the server, and will be ignored when
212281
sending a request.
213282
214-
:ivar id: Fully qualified resource Id for the resource. Ex -
215-
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{resourceName}
283+
:ivar id: Fully qualified resource ID for the resource. Ex -
284+
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
216285
:vartype id: str
217286
:ivar name: The name of the resource
218287
:vartype name: str
219-
:ivar type: The type of the resource. Ex-
220-
Microsoft.Network/trafficManagerProfiles.
288+
:ivar type: The type of the resource. E.g.
289+
"Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
221290
:vartype type: str
222291
:param provider_instance_type: The type of provider instance.
223292
:type provider_instance_type: str
@@ -260,29 +329,35 @@ def __init__(self, **kwargs):
260329

261330

262331
class TrackedResource(Resource):
263-
"""The resource model definition for a ARM tracked top level resource.
332+
"""Tracked Resource.
333+
334+
The resource model definition for an Azure Resource Manager tracked top
335+
level resource which has 'tags' and a 'location'.
264336
265337
Variables are only populated by the server, and will be ignored when
266338
sending a request.
267339
268-
:ivar id: Fully qualified resource Id for the resource. Ex -
269-
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{resourceName}
340+
All required parameters must be populated in order to send to Azure.
341+
342+
:ivar id: Fully qualified resource ID for the resource. Ex -
343+
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
270344
:vartype id: str
271345
:ivar name: The name of the resource
272346
:vartype name: str
273-
:ivar type: The type of the resource. Ex-
274-
Microsoft.Network/trafficManagerProfiles.
347+
:ivar type: The type of the resource. E.g.
348+
"Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
275349
:vartype type: str
276350
:param tags: Resource tags.
277351
:type tags: dict[str, str]
278-
:param location: The Azure Region where the resource lives
352+
:param location: Required. The geo-location where the resource lives
279353
:type location: str
280354
"""
281355

282356
_validation = {
283357
'id': {'readonly': True},
284358
'name': {'readonly': True},
285359
'type': {'readonly': True},
360+
'location': {'required': True},
286361
}
287362

288363
_attribute_map = {
@@ -305,17 +380,19 @@ class SapMonitor(TrackedResource):
305380
Variables are only populated by the server, and will be ignored when
306381
sending a request.
307382
308-
:ivar id: Fully qualified resource Id for the resource. Ex -
309-
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{resourceName}
383+
All required parameters must be populated in order to send to Azure.
384+
385+
:ivar id: Fully qualified resource ID for the resource. Ex -
386+
/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
310387
:vartype id: str
311388
:ivar name: The name of the resource
312389
:vartype name: str
313-
:ivar type: The type of the resource. Ex-
314-
Microsoft.Network/trafficManagerProfiles.
390+
:ivar type: The type of the resource. E.g.
391+
"Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
315392
:vartype type: str
316393
:param tags: Resource tags.
317394
:type tags: dict[str, str]
318-
:param location: The Azure Region where the resource lives
395+
:param location: Required. The geo-location where the resource lives
319396
:type location: str
320397
:ivar provisioning_state: State of provisioning of the HanaInstance.
321398
Possible values include: 'Accepted', 'Creating', 'Updating', 'Failed',
@@ -349,6 +426,7 @@ class SapMonitor(TrackedResource):
349426
'id': {'readonly': True},
350427
'name': {'readonly': True},
351428
'type': {'readonly': True},
429+
'location': {'required': True},
352430
'provisioning_state': {'readonly': True},
353431
'managed_resource_group_name': {'readonly': True},
354432
'sap_monitor_collector_version': {'readonly': True},

0 commit comments

Comments
 (0)