Skip to content

Commit 278bd87

Browse files
danlopedanlope
authored
AVNM, IPAM, VNV updates for 2024-05-01 swagger (#8187)
* Updating resource name regex pattern to latest * sec admin config and rule updates * Update version in HISTORY.rst * Updated version in setup.py * resolve missing_parameter_help * passed tests * marked stable * change version from 1.3.0 to 1.4.0 to try and resolve CI error 'release-version-block' * updating version to expected 1.3.1
1 parent f52ad8c commit 278bd87

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+7594
-1798
lines changed

‎src/network-manager/HISTORY.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
33
Release History
44
===============
5+
1.3.1
6+
+++++
7+
* Fix argument regex requirement (fix: https://github.com/Azure/azure-rest-api-specs/pull/31130)
8+
* Stable version
9+
510
1.3.0
611
+++++
712
* Add new cmd `az network manager ipam-pool`

‎src/network-manager/azext_network_manager/aaz/latest/network/manager/ipam_pool/__cmd_group.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
@register_command_group(
1515
"network manager ipam-pool",
16-
is_preview=True,
1716
)
1817
class __CMDGroup(AAZCommandGroup):
1918
"""Manage IPAM pool with network.

‎src/network-manager/azext_network_manager/aaz/latest/network/manager/ipam_pool/_create.py‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
@register_command(
1515
"network manager ipam-pool create",
16-
is_preview=True,
1716
)
1817
class Create(AAZCommand):
1918
"""Create the Pool resource.
@@ -23,16 +22,17 @@ class Create(AAZCommand):
2322
"""
2423

2524
_aaz_info = {
26-
"version": "2024-01-01-preview",
25+
"version": "2024-05-01",
2726
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}", "2024-01-01-preview"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}", "2024-05-01"],
2928
]
3029
}
3130

31+
AZ_SUPPORT_NO_WAIT = True
32+
3233
def _handler(self, command_args):
3334
super()._handler(command_args)
34-
self._execute_operations()
35-
return self._output()
35+
return self.build_lro_poller(self._execute_operations, self._output)
3636

3737
_args_schema = None
3838

@@ -50,15 +50,15 @@ def _build_arguments_schema(cls, *args, **kwargs):
5050
help="The name of the network manager.",
5151
required=True,
5252
fmt=AAZStrArgFormat(
53-
pattern="^[a-zA-Z0-9-]*$",
53+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
5454
),
5555
)
5656
_args_schema.pool_name = AAZStrArg(
5757
options=["-n", "--name", "--pool-name"],
5858
help="IP Address Manager Pool resource name.",
5959
required=True,
6060
fmt=AAZStrArgFormat(
61-
pattern="^[a-zA-Z0-9-]*$",
61+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
6262
),
6363
)
6464
_args_schema.resource_group = AAZResourceGroupNameArg(
@@ -116,7 +116,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
116116

117117
def _execute_operations(self):
118118
self.pre_operations()
119-
self.IpamPoolsCreate(ctx=self.ctx)()
119+
yield self.IpamPoolsCreate(ctx=self.ctx)()
120120
self.post_operations()
121121

122122
@register_callback
@@ -137,8 +137,24 @@ class IpamPoolsCreate(AAZHttpOperation):
137137
def __call__(self, *args, **kwargs):
138138
request = self.make_request()
139139
session = self.client.send_request(request=request, stream=False, **kwargs)
140+
if session.http_response.status_code in [202]:
141+
return self.client.build_lro_polling(
142+
self.ctx.args.no_wait,
143+
session,
144+
self.on_200_201,
145+
self.on_error,
146+
lro_options={"final-state-via": "azure-async-operation"},
147+
path_format_arguments=self.url_parameters,
148+
)
140149
if session.http_response.status_code in [200, 201]:
141-
return self.on_200_201(session)
150+
return self.client.build_lro_polling(
151+
self.ctx.args.no_wait,
152+
session,
153+
self.on_200_201,
154+
self.on_error,
155+
lro_options={"final-state-via": "azure-async-operation"},
156+
path_format_arguments=self.url_parameters,
157+
)
142158

143159
return self.on_error(session.http_response)
144160

@@ -183,7 +199,7 @@ def url_parameters(self):
183199
def query_parameters(self):
184200
parameters = {
185201
**self.serialize_query_param(
186-
"api-version", "2024-01-01-preview",
202+
"api-version", "2024-05-01",
187203
required=True,
188204
),
189205
}

‎src/network-manager/azext_network_manager/aaz/latest/network/manager/ipam_pool/_delete.py‎

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

1414
@register_command(
1515
"network manager ipam-pool delete",
16-
is_preview=True,
1716
confirmation="Are you sure you want to perform this operation?",
1817
)
1918
class Delete(AAZCommand):
@@ -24,9 +23,9 @@ class Delete(AAZCommand):
2423
"""
2524

2625
_aaz_info = {
27-
"version": "2024-01-01-preview",
26+
"version": "2024-05-01",
2827
"resources": [
29-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}", "2024-01-01-preview"],
28+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}", "2024-05-01"],
3029
]
3130
}
3231

@@ -53,7 +52,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
5352
required=True,
5453
id_part="name",
5554
fmt=AAZStrArgFormat(
56-
pattern="^[a-zA-Z0-9-]*$",
55+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
5756
),
5857
)
5958
_args_schema.pool_name = AAZStrArg(
@@ -62,7 +61,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
6261
required=True,
6362
id_part="child_name_1",
6463
fmt=AAZStrArgFormat(
65-
pattern="^[a-zA-Z0-9-]*$",
64+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
6665
),
6766
)
6867
_args_schema.resource_group = AAZResourceGroupNameArg(
@@ -160,7 +159,7 @@ def url_parameters(self):
160159
def query_parameters(self):
161160
parameters = {
162161
**self.serialize_query_param(
163-
"api-version", "2024-01-01-preview",
162+
"api-version", "2024-05-01",
164163
required=True,
165164
),
166165
}

‎src/network-manager/azext_network_manager/aaz/latest/network/manager/ipam_pool/_get_pool_usage.py‎

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

1414
@register_command(
1515
"network manager ipam-pool get-pool-usage",
16-
is_preview=True,
1716
)
1817
class GetPoolUsage(AAZCommand):
1918
"""Get the Pool Usage.
@@ -23,9 +22,9 @@ class GetPoolUsage(AAZCommand):
2322
"""
2423

2524
_aaz_info = {
26-
"version": "2024-01-01-preview",
25+
"version": "2024-05-01",
2726
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}/getpoolusage", "2024-01-01-preview"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}/getpoolusage", "2024-05-01"],
2928
]
3029
}
3130

@@ -51,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
5150
required=True,
5251
id_part="name",
5352
fmt=AAZStrArgFormat(
54-
pattern="^[a-zA-Z0-9-]*$",
53+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
5554
),
5655
)
5756
_args_schema.pool_name = AAZStrArg(
@@ -60,7 +59,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
6059
required=True,
6160
id_part="child_name_1",
6261
fmt=AAZStrArgFormat(
63-
pattern="^[a-zA-Z0-9-]*$",
62+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
6463
),
6564
)
6665
_args_schema.resource_group = AAZResourceGroupNameArg(
@@ -137,7 +136,7 @@ def url_parameters(self):
137136
def query_parameters(self):
138137
parameters = {
139138
**self.serialize_query_param(
140-
"api-version", "2024-01-01-preview",
139+
"api-version", "2024-05-01",
141140
required=True,
142141
),
143142
}

‎src/network-manager/azext_network_manager/aaz/latest/network/manager/ipam_pool/_list.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
@register_command(
1515
"network manager ipam-pool list",
16-
is_preview=True,
1716
)
1817
class List(AAZCommand):
1918
"""List list of Pool resources at Network Manager level.
@@ -23,9 +22,9 @@ class List(AAZCommand):
2322
"""
2423

2524
_aaz_info = {
26-
"version": "2024-01-01-preview",
25+
"version": "2024-05-01",
2726
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools", "2024-01-01-preview"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools", "2024-05-01"],
2928
]
3029
}
3130

@@ -51,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
5150
help="The name of the network manager.",
5251
required=True,
5352
fmt=AAZStrArgFormat(
54-
pattern="^[a-zA-Z0-9-]*$",
53+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
5554
),
5655
)
5756
_args_schema.resource_group = AAZResourceGroupNameArg(
@@ -162,7 +161,7 @@ def query_parameters(self):
162161
"top", self.ctx.args.top,
163162
),
164163
**self.serialize_query_param(
165-
"api-version", "2024-01-01-preview",
164+
"api-version", "2024-05-01",
166165
required=True,
167166
),
168167
}

‎src/network-manager/azext_network_manager/aaz/latest/network/manager/ipam_pool/_list_associated_resource.py‎

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

1414
@register_command(
1515
"network manager ipam-pool list-associated-resource",
16-
is_preview=True,
1716
)
1817
class ListAssociatedResource(AAZCommand):
1918
"""List Associated Resource in the Pool.
@@ -23,9 +22,9 @@ class ListAssociatedResource(AAZCommand):
2322
"""
2423

2524
_aaz_info = {
26-
"version": "2024-01-01-preview",
25+
"version": "2024-05-01",
2726
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}/listassociatedresources", "2024-01-01-preview"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}/listassociatedresources", "2024-05-01"],
2928
]
3029
}
3130

@@ -51,15 +50,15 @@ def _build_arguments_schema(cls, *args, **kwargs):
5150
help="The name of the network manager.",
5251
required=True,
5352
fmt=AAZStrArgFormat(
54-
pattern="^[a-zA-Z0-9-]*$",
53+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
5554
),
5655
)
5756
_args_schema.pool_name = AAZStrArg(
5857
options=["-n", "--name", "--pool-name"],
5958
help="Pool resource name.",
6059
required=True,
6160
fmt=AAZStrArgFormat(
62-
pattern="^[a-zA-Z0-9-]*$",
61+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
6362
),
6463
)
6564
_args_schema.resource_group = AAZResourceGroupNameArg(
@@ -137,7 +136,7 @@ def url_parameters(self):
137136
def query_parameters(self):
138137
parameters = {
139138
**self.serialize_query_param(
140-
"api-version", "2024-01-01-preview",
139+
"api-version", "2024-05-01",
141140
required=True,
142141
),
143142
}

‎src/network-manager/azext_network_manager/aaz/latest/network/manager/ipam_pool/_show.py‎

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

1414
@register_command(
1515
"network manager ipam-pool show",
16-
is_preview=True,
1716
)
1817
class Show(AAZCommand):
1918
"""Get the specific Pool resource.
@@ -23,9 +22,9 @@ class Show(AAZCommand):
2322
"""
2423

2524
_aaz_info = {
26-
"version": "2024-01-01-preview",
25+
"version": "2024-05-01",
2726
"resources": [
28-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}", "2024-01-01-preview"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/networkmanagers/{}/ipampools/{}", "2024-05-01"],
2928
]
3029
}
3130

@@ -51,7 +50,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
5150
required=True,
5251
id_part="name",
5352
fmt=AAZStrArgFormat(
54-
pattern="^[a-zA-Z0-9-]*$",
53+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
5554
),
5655
)
5756
_args_schema.pool_name = AAZStrArg(
@@ -60,7 +59,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
6059
required=True,
6160
id_part="child_name_1",
6261
fmt=AAZStrArgFormat(
63-
pattern="^[a-zA-Z0-9-]*$",
62+
pattern="^[0-9a-zA-Z]([0-9a-zA-Z_.-]{0,62}[0-9a-zA-Z_])?$",
6463
),
6564
)
6665
_args_schema.resource_group = AAZResourceGroupNameArg(
@@ -137,7 +136,7 @@ def url_parameters(self):
137136
def query_parameters(self):
138137
parameters = {
139138
**self.serialize_query_param(
140-
"api-version", "2024-01-01-preview",
139+
"api-version", "2024-05-01",
141140
required=True,
142141
),
143142
}

0 commit comments

Comments
 (0)