Skip to content

Commit 8e30da7

Browse files
authored
Add NG of type subnet support (#9244)
1 parent d3a1ab5 commit 8e30da7

20 files changed

+3928
-3438
lines changed

src/network-manager/HISTORY.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
33
Release History
44
===============
5+
3.0.1
6+
+++++
7+
* Add NG of type Subnet support for routing config
58

69
3.0.0
710
+++++

src/network-manager/azext_network_manager/aaz/latest/network/manager/group/_create.py

Lines changed: 17 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": "2022-01-01",
25+
"version": "2024-07-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2022-01-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2024-07-01"],
2828
]
2929
}
3030

@@ -70,6 +70,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
7070
arg_group="Properties",
7171
help="A description of the network group.",
7272
)
73+
_args_schema.member_type = AAZStrArg(
74+
options=["--member-type"],
75+
arg_group="Properties",
76+
help="The type of the group member.",
77+
enum={"Subnet": "Subnet", "VirtualNetwork": "VirtualNetwork"},
78+
)
7379
return cls._args_schema
7480

7581
def _execute_operations(self):
@@ -141,7 +147,7 @@ def url_parameters(self):
141147
def query_parameters(self):
142148
parameters = {
143149
**self.serialize_query_param(
144-
"api-version", "2022-01-01",
150+
"api-version", "2024-07-01",
145151
required=True,
146152
),
147153
}
@@ -174,6 +180,7 @@ def content(self):
174180
properties = _builder.get(".properties")
175181
if properties is not None:
176182
properties.set_prop("description", AAZStrType, ".description")
183+
properties.set_prop("memberType", AAZStrType, ".member_type")
177184

178185
return self.serialize_content(_content_value)
179186

@@ -217,10 +224,17 @@ def _build_schema_on_200_201(cls):
217224

218225
properties = cls._schema_on_200_201.properties
219226
properties.description = AAZStrType()
227+
properties.member_type = AAZStrType(
228+
serialized_name="memberType",
229+
)
220230
properties.provisioning_state = AAZStrType(
221231
serialized_name="provisioningState",
222232
flags={"read_only": True},
223233
)
234+
properties.resource_guid = AAZStrType(
235+
serialized_name="resourceGuid",
236+
flags={"read_only": True},
237+
)
224238

225239
system_data = cls._schema_on_200_201.system_data
226240
system_data.created_at = AAZStrType(

src/network-manager/azext_network_manager/aaz/latest/network/manager/group/_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": "2022-01-01",
26+
"version": "2024-07-01",
2727
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2022-01-01"],
28+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2024-07-01"],
2929
]
3030
}
3131

@@ -160,7 +160,7 @@ def query_parameters(self):
160160
"force", self.ctx.args.force,
161161
),
162162
**self.serialize_query_param(
163-
"api-version", "2022-01-01",
163+
"api-version", "2024-07-01",
164164
required=True,
165165
),
166166
}

src/network-manager/azext_network_manager/aaz/latest/network/manager/group/_list.py

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

2424
_aaz_info = {
25-
"version": "2022-01-01",
25+
"version": "2024-07-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups", "2022-01-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups", "2024-07-01"],
2828
]
2929
}
3030

@@ -139,7 +139,7 @@ def query_parameters(self):
139139
"$top", self.ctx.args.top,
140140
),
141141
**self.serialize_query_param(
142-
"api-version", "2022-01-01",
142+
"api-version", "2024-07-01",
143143
required=True,
144144
),
145145
}
@@ -203,10 +203,17 @@ def _build_schema_on_200(cls):
203203

204204
properties = cls._schema_on_200.value.Element.properties
205205
properties.description = AAZStrType()
206+
properties.member_type = AAZStrType(
207+
serialized_name="memberType",
208+
)
206209
properties.provisioning_state = AAZStrType(
207210
serialized_name="provisioningState",
208211
flags={"read_only": True},
209212
)
213+
properties.resource_guid = AAZStrType(
214+
serialized_name="resourceGuid",
215+
flags={"read_only": True},
216+
)
210217

211218
system_data = cls._schema_on_200.value.Element.system_data
212219
system_data.created_at = AAZStrType(

src/network-manager/azext_network_manager/aaz/latest/network/manager/group/_show.py

Lines changed: 10 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": "2022-01-01",
25+
"version": "2024-07-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2022-01-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2024-07-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", "2022-01-01",
133+
"api-version", "2024-07-01",
134134
required=True,
135135
),
136136
}
@@ -185,10 +185,17 @@ def _build_schema_on_200(cls):
185185

186186
properties = cls._schema_on_200.properties
187187
properties.description = AAZStrType()
188+
properties.member_type = AAZStrType(
189+
serialized_name="memberType",
190+
)
188191
properties.provisioning_state = AAZStrType(
189192
serialized_name="provisioningState",
190193
flags={"read_only": True},
191194
)
195+
properties.resource_guid = AAZStrType(
196+
serialized_name="resourceGuid",
197+
flags={"read_only": True},
198+
)
192199

193200
system_data = cls._schema_on_200.system_data
194201
system_data.created_at = AAZStrType(

src/network-manager/azext_network_manager/aaz/latest/network/manager/group/_update.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class Update(AAZCommand):
1919
"""
2020

2121
_aaz_info = {
22-
"version": "2022-01-01",
22+
"version": "2024-07-01",
2323
"resources": [
24-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2022-01-01"],
24+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2024-07-01"],
2525
]
2626
}
2727

@@ -72,6 +72,13 @@ def _build_arguments_schema(cls, *args, **kwargs):
7272
help="A description of the network group.",
7373
nullable=True,
7474
)
75+
_args_schema.member_type = AAZStrArg(
76+
options=["--member-type"],
77+
arg_group="Properties",
78+
help="The type of the group member.",
79+
nullable=True,
80+
enum={"Subnet": "Subnet", "VirtualNetwork": "VirtualNetwork"},
81+
)
7582
return cls._args_schema
7683

7784
def _execute_operations(self):
@@ -156,7 +163,7 @@ def url_parameters(self):
156163
def query_parameters(self):
157164
parameters = {
158165
**self.serialize_query_param(
159-
"api-version", "2022-01-01",
166+
"api-version", "2024-07-01",
160167
required=True,
161168
),
162169
}
@@ -243,7 +250,7 @@ def url_parameters(self):
243250
def query_parameters(self):
244251
parameters = {
245252
**self.serialize_query_param(
246-
"api-version", "2022-01-01",
253+
"api-version", "2024-07-01",
247254
required=True,
248255
),
249256
}
@@ -309,6 +316,7 @@ def _update_instance(self, instance):
309316
properties = _builder.get(".properties")
310317
if properties is not None:
311318
properties.set_prop("description", AAZStrType, ".description")
319+
properties.set_prop("memberType", AAZStrType, ".member_type")
312320

313321
return _instance_value
314322

@@ -362,10 +370,17 @@ def _build_schema_network_group_read(cls, _schema):
362370

363371
properties = _schema_network_group_read.properties
364372
properties.description = AAZStrType()
373+
properties.member_type = AAZStrType(
374+
serialized_name="memberType",
375+
)
365376
properties.provisioning_state = AAZStrType(
366377
serialized_name="provisioningState",
367378
flags={"read_only": True},
368379
)
380+
properties.resource_guid = AAZStrType(
381+
serialized_name="resourceGuid",
382+
flags={"read_only": True},
383+
)
369384

370385
system_data = _schema_network_group_read.system_data
371386
system_data.created_at = AAZStrType(

src/network-manager/azext_network_manager/aaz/latest/network/manager/group/_wait.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Wait(AAZWaitCommand):
2020

2121
_aaz_info = {
2222
"resources": [
23-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2022-01-01"],
23+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/networkgroups/{}", "2024-07-01"],
2424
]
2525
}
2626

@@ -126,7 +126,7 @@ def url_parameters(self):
126126
def query_parameters(self):
127127
parameters = {
128128
**self.serialize_query_param(
129-
"api-version", "2022-01-01",
129+
"api-version", "2024-07-01",
130130
required=True,
131131
),
132132
}
@@ -181,10 +181,17 @@ def _build_schema_on_200(cls):
181181

182182
properties = cls._schema_on_200.properties
183183
properties.description = AAZStrType()
184+
properties.member_type = AAZStrType(
185+
serialized_name="memberType",
186+
)
184187
properties.provisioning_state = AAZStrType(
185188
serialized_name="provisioningState",
186189
flags={"read_only": True},
187190
)
191+
properties.resource_guid = AAZStrType(
192+
serialized_name="resourceGuid",
193+
flags={"read_only": True},
194+
)
188195

189196
system_data = cls._schema_on_200.system_data
190197
system_data.created_at = AAZStrType(

0 commit comments

Comments
 (0)