Skip to content

Commit a3fb697

Browse files
Jing-songJing-song
authored
upgrade api (#7082)
1 parent a44482d commit a3fb697

33 files changed

+1004
-444
lines changed

‎src/stack-hci/HISTORY.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
Release History
44
===============
55

6+
1.1.0
7+
++++++
8+
* Upgrade api-version to 2023-08-01
9+
* `az stack-hci arc-setting create/update`: Add new properties `serviceConfigurations` for `--connectivity-properties` to support setting service configurations
10+
611
1.0.0
712
++++++
813
* `az stack-hci extension create`: change `--settings/--protected-settings` as custom properties

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_consent_and_install_default_extension.py‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class ConsentAndInstallDefaultExtension(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2023-03-01",
25+
"version": "2023-08-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/consentandinstalldefaultextensions", "2023-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/consentandinstalldefaultextensions", "2023-08-01"],
2828
]
2929
}
3030

@@ -130,7 +130,7 @@ def url_parameters(self):
130130
def query_parameters(self):
131131
parameters = {
132132
**self.serialize_query_param(
133-
"api-version", "2023-03-01",
133+
"api-version", "2023-08-01",
134134
required=True,
135135
),
136136
}
@@ -218,6 +218,21 @@ def _build_schema_on_200(cls):
218218

219219
connectivity_properties = cls._schema_on_200.properties.connectivity_properties
220220
connectivity_properties.enabled = AAZBoolType()
221+
connectivity_properties.service_configurations = AAZListType(
222+
serialized_name="serviceConfigurations",
223+
)
224+
225+
service_configurations = cls._schema_on_200.properties.connectivity_properties.service_configurations
226+
service_configurations.Element = AAZObjectType()
227+
228+
_element = cls._schema_on_200.properties.connectivity_properties.service_configurations.Element
229+
_element.port = AAZIntType(
230+
flags={"required": True},
231+
)
232+
_element.service_name = AAZStrType(
233+
serialized_name="serviceName",
234+
flags={"required": True},
235+
)
221236

222237
default_extensions = cls._schema_on_200.properties.default_extensions
223238
default_extensions.Element = AAZObjectType()

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_create.py‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Create(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2023-03-01",
25+
"version": "2023-08-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}", "2023-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}", "2023-08-01"],
2828
]
2929
}
3030

@@ -97,6 +97,26 @@ def _build_arguments_schema(cls, *args, **kwargs):
9797
options=["enabled"],
9898
help="True indicates ARC connectivity is enabled",
9999
)
100+
connectivity_properties.service_configurations = AAZListArg(
101+
options=["service-configurations"],
102+
help="Service configurations associated with the connectivity resource. They are only processed by the server if 'enabled' property is set to 'true'.",
103+
)
104+
105+
service_configurations = cls._args_schema.connectivity_properties.service_configurations
106+
service_configurations.Element = AAZObjectArg()
107+
108+
_element = cls._args_schema.connectivity_properties.service_configurations.Element
109+
_element.port = AAZIntArg(
110+
options=["port"],
111+
help="The port on which service is enabled.",
112+
required=True,
113+
)
114+
_element.service_name = AAZStrArg(
115+
options=["service-name"],
116+
help="Name of the service.",
117+
required=True,
118+
enum={"WAC": "WAC"},
119+
)
100120
return cls._args_schema
101121

102122
def _execute_operations(self):
@@ -168,7 +188,7 @@ def url_parameters(self):
168188
def query_parameters(self):
169189
parameters = {
170190
**self.serialize_query_param(
171-
"api-version", "2023-03-01",
191+
"api-version", "2023-08-01",
172192
required=True,
173193
),
174194
}
@@ -207,6 +227,16 @@ def content(self):
207227
connectivity_properties = _builder.get(".properties.connectivityProperties")
208228
if connectivity_properties is not None:
209229
connectivity_properties.set_prop("enabled", AAZBoolType, ".enabled")
230+
connectivity_properties.set_prop("serviceConfigurations", AAZListType, ".service_configurations")
231+
232+
service_configurations = _builder.get(".properties.connectivityProperties.serviceConfigurations")
233+
if service_configurations is not None:
234+
service_configurations.set_elements(AAZObjectType, ".")
235+
236+
_elements = _builder.get(".properties.connectivityProperties.serviceConfigurations[]")
237+
if _elements is not None:
238+
_elements.set_prop("port", AAZIntType, ".port", typ_kwargs={"flags": {"required": True}})
239+
_elements.set_prop("serviceName", AAZStrType, ".service_name", typ_kwargs={"flags": {"required": True}})
210240

211241
return self.serialize_content(_content_value)
212242

@@ -283,6 +313,21 @@ def _build_schema_on_200(cls):
283313

284314
connectivity_properties = cls._schema_on_200.properties.connectivity_properties
285315
connectivity_properties.enabled = AAZBoolType()
316+
connectivity_properties.service_configurations = AAZListType(
317+
serialized_name="serviceConfigurations",
318+
)
319+
320+
service_configurations = cls._schema_on_200.properties.connectivity_properties.service_configurations
321+
service_configurations.Element = AAZObjectType()
322+
323+
_element = cls._schema_on_200.properties.connectivity_properties.service_configurations.Element
324+
_element.port = AAZIntType(
325+
flags={"required": True},
326+
)
327+
_element.service_name = AAZStrType(
328+
serialized_name="serviceName",
329+
flags={"required": True},
330+
)
286331

287332
default_extensions = cls._schema_on_200.properties.default_extensions
288333
default_extensions.Element = AAZObjectType()

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_create_identity.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class CreateIdentity(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2023-03-01",
25+
"version": "2023-08-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/createarcidentity", "2023-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/createarcidentity", "2023-08-01"],
2828
]
2929
}
3030

@@ -147,7 +147,7 @@ def url_parameters(self):
147147
def query_parameters(self):
148148
parameters = {
149149
**self.serialize_query_param(
150-
"api-version", "2023-03-01",
150+
"api-version", "2023-08-01",
151151
required=True,
152152
),
153153
}

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_delete.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class Delete(AAZCommand):
2323
"""
2424

2525
_aaz_info = {
26-
"version": "2023-03-01",
26+
"version": "2023-08-01",
2727
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}", "2023-03-01"],
28+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}", "2023-08-01"],
2929
]
3030
}
3131

@@ -153,7 +153,7 @@ def url_parameters(self):
153153
def query_parameters(self):
154154
parameters = {
155155
**self.serialize_query_param(
156-
"api-version", "2023-03-01",
156+
"api-version", "2023-08-01",
157157
required=True,
158158
),
159159
}

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_generate_password.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class GeneratePassword(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2023-03-01",
25+
"version": "2023-08-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/generatepassword", "2023-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/generatepassword", "2023-08-01"],
2828
]
2929
}
3030

@@ -130,7 +130,7 @@ def url_parameters(self):
130130
def query_parameters(self):
131131
parameters = {
132132
**self.serialize_query_param(
133-
"api-version", "2023-03-01",
133+
"api-version", "2023-08-01",
134134
required=True,
135135
),
136136
}

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_initialize_disable_proces.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class InitializeDisableProces(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2023-03-01",
25+
"version": "2023-08-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/initializedisableprocess", "2023-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}/initializedisableprocess", "2023-08-01"],
2828
]
2929
}
3030

@@ -143,7 +143,7 @@ def url_parameters(self):
143143
def query_parameters(self):
144144
parameters = {
145145
**self.serialize_query_param(
146-
"api-version", "2023-03-01",
146+
"api-version", "2023-08-01",
147147
required=True,
148148
),
149149
}

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_list.py‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@ class List(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2023-03-01",
25+
"version": "2023-08-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings", "2023-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings", "2023-08-01"],
2828
]
2929
}
3030

31+
AZ_SUPPORT_PAGINATION = True
32+
3133
def _handler(self, command_args):
3234
super()._handler(command_args)
3335
return self.build_paging(self._execute_operations, self._output)
@@ -119,7 +121,7 @@ def url_parameters(self):
119121
def query_parameters(self):
120122
parameters = {
121123
**self.serialize_query_param(
122-
"api-version", "2023-03-01",
124+
"api-version", "2023-08-01",
123125
required=True,
124126
),
125127
}
@@ -219,6 +221,21 @@ def _build_schema_on_200(cls):
219221

220222
connectivity_properties = cls._schema_on_200.value.Element.properties.connectivity_properties
221223
connectivity_properties.enabled = AAZBoolType()
224+
connectivity_properties.service_configurations = AAZListType(
225+
serialized_name="serviceConfigurations",
226+
)
227+
228+
service_configurations = cls._schema_on_200.value.Element.properties.connectivity_properties.service_configurations
229+
service_configurations.Element = AAZObjectType()
230+
231+
_element = cls._schema_on_200.value.Element.properties.connectivity_properties.service_configurations.Element
232+
_element.port = AAZIntType(
233+
flags={"required": True},
234+
)
235+
_element.service_name = AAZStrType(
236+
serialized_name="serviceName",
237+
flags={"required": True},
238+
)
222239

223240
default_extensions = cls._schema_on_200.value.Element.properties.default_extensions
224241
default_extensions.Element = AAZObjectType()

‎src/stack-hci/azext_stack_hci/aaz/latest/stack_hci/arc_setting/_show.py‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Show(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2023-03-01",
25+
"version": "2023-08-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}", "2023-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.azurestackhci/clusters/{}/arcsettings/{}", "2023-08-01"],
2828
]
2929
}
3030

@@ -130,7 +130,7 @@ def url_parameters(self):
130130
def query_parameters(self):
131131
parameters = {
132132
**self.serialize_query_param(
133-
"api-version", "2023-03-01",
133+
"api-version", "2023-08-01",
134134
required=True,
135135
),
136136
}
@@ -218,6 +218,21 @@ def _build_schema_on_200(cls):
218218

219219
connectivity_properties = cls._schema_on_200.properties.connectivity_properties
220220
connectivity_properties.enabled = AAZBoolType()
221+
connectivity_properties.service_configurations = AAZListType(
222+
serialized_name="serviceConfigurations",
223+
)
224+
225+
service_configurations = cls._schema_on_200.properties.connectivity_properties.service_configurations
226+
service_configurations.Element = AAZObjectType()
227+
228+
_element = cls._schema_on_200.properties.connectivity_properties.service_configurations.Element
229+
_element.port = AAZIntType(
230+
flags={"required": True},
231+
)
232+
_element.service_name = AAZStrType(
233+
serialized_name="serviceName",
234+
flags={"required": True},
235+
)
221236

222237
default_extensions = cls._schema_on_200.properties.default_extensions
223238
default_extensions.Element = AAZObjectType()

0 commit comments

Comments
 (0)