Skip to content

Commit 28133fd

Browse files
authored
{Network} Fix --sku argument to accept StandardV2 value (#32050)
1 parent 66ceec4 commit 28133fd

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

src/azure-cli/azure/cli/command_modules/network/_params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ def load_arguments(self, _):
613613

614614
with self.argument_context('network public-ip create') as c:
615615
c.argument('name', completer=None)
616-
c.argument('sku', help='Name of a public IP address SKU', arg_type=get_enum_type(["Basic", "Standard"]), default="Standard")
616+
c.argument('sku', help='Name of a public IP address SKU', arg_type=get_enum_type(["Basic", "Standard", "StandardV2"]), default="Standard")
617617
c.argument('tier', help='Tier of a public IP address SKU and Global tier is only supported for standard SKU public IP addresses', arg_type=get_enum_type(["Regional", "Global"]))
618618
c.ignore('dns_name_type')
619619
c.argument('edge_zone', edge_zone)

src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/nat/gateway/_create.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
8484
help="A reference to the source virtual network using this nat gateway resource.",
8585
)
8686
cls._build_args_sub_resource_create(_args_schema.source_vnet)
87+
_args_schema.sku = AAZStrArg(
88+
options=["--sku"],
89+
help="Name of Nat Gateway SKU.",
90+
default="Standard",
91+
enum={"Standard": "Standard", "StandardV2": "StandardV2"},
92+
)
8793
_args_schema.tags = AAZDictArg(
8894
options=["--tags"],
8995
help="Space-separated tags: key[=value] [key[=value] ...].",
@@ -126,20 +132,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
126132
zone.Element = AAZStrArg()
127133

128134
# define Arg Group "Parameters"
129-
130-
_args_schema = cls._args_schema
131-
_args_schema.sku = AAZObjectArg(
132-
options=["--sku"],
133-
arg_group="Parameters",
134-
help="The nat gateway SKU.",
135-
)
136-
137-
sku = cls._args_schema.sku
138-
sku.name = AAZStrArg(
139-
options=["name"],
140-
help="Name of Nat Gateway SKU.",
141-
enum={"Standard": "Standard", "StandardV2": "StandardV2"},
142-
)
143135
return cls._args_schema
144136

145137
_args_sub_resource_create = None
@@ -268,7 +260,7 @@ def content(self):
268260
)
269261
_builder.set_prop("location", AAZStrType, ".location")
270262
_builder.set_prop("properties", AAZObjectType, typ_kwargs={"flags": {"client_flatten": True}})
271-
_builder.set_prop("sku", AAZObjectType, ".sku")
263+
_builder.set_prop("sku", AAZObjectType)
272264
_builder.set_prop("tags", AAZDictType, ".tags")
273265
_builder.set_prop("zones", AAZListType, ".zone")
274266

@@ -307,7 +299,7 @@ def content(self):
307299

308300
sku = _builder.get(".sku")
309301
if sku is not None:
310-
sku.set_prop("name", AAZStrType, ".name")
302+
sku.set_prop("name", AAZStrType, ".sku")
311303

312304
tags = _builder.get(".tags")
313305
if tags is not None:

src/azure-cli/azure/cli/command_modules/network/operations/nat.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
3737
)
3838
args_schema.pip_addresses._registered = False
3939
args_schema.pip_prefixes._registered = False
40-
args_schema.sku._registered = False
4140
return args_schema
4241

4342
def pre_operations(self):

0 commit comments

Comments
 (0)