Skip to content

Commit a4fa492

Browse files
committed
Fix: NetworkVirtualApplianceVnetScenarioTest; linter clean;
1 parent f232f11 commit a4fa492

File tree

5 files changed

+6651
-866
lines changed

5 files changed

+6651
-866
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ def _build_arguments_schema(cls, *args, **kwargs):
101101
arg_group="Properties",
102102
help="The delegation for the Virtual Appliance",
103103
)
104-
_args_schema.internet_ingress_public_ips = AAZListArg(
105-
options=["--internet-ingress-public-ips"],
104+
_args_schema.internet_ingress_ips = AAZListArg(
105+
options=["--internet-ingress-ips"],
106106
arg_group="Properties",
107107
help="List of Resource Uri of Public IPs for Internet Ingress Scenario.",
108108
)
@@ -112,7 +112,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
112112
help="Network Profile containing configurations for Public and Private NIC.",
113113
)
114114
_args_schema.nva_interface_configurations = AAZListArg(
115-
options=["--interface-config", "--nva-interface-configurations"],
115+
options=["--interface-configs", "--nva-interface-configurations"],
116116
arg_group="Properties",
117117
help="The NVA in VNet interface configurations",
118118
fmt=AAZListArgFormat(
@@ -154,10 +154,10 @@ def _build_arguments_schema(cls, *args, **kwargs):
154154
help="The service name to which the NVA is delegated.",
155155
)
156156

157-
internet_ingress_public_ips = cls._args_schema.internet_ingress_public_ips
158-
internet_ingress_public_ips.Element = AAZObjectArg()
157+
internet_ingress_ips = cls._args_schema.internet_ingress_ips
158+
internet_ingress_ips.Element = AAZObjectArg()
159159

160-
_element = cls._args_schema.internet_ingress_public_ips.Element
160+
_element = cls._args_schema.internet_ingress_ips.Element
161161
_element.id = AAZResourceIdArg(
162162
options=["id"],
163163
help="Resource Uri of Public Ip",
@@ -371,7 +371,7 @@ def content(self):
371371
properties.set_prop("cloudInitConfiguration", AAZStrType, ".cloud_init_config")
372372
properties.set_prop("cloudInitConfigurationBlobs", AAZListType, ".cloud_init_config_blobs")
373373
properties.set_prop("delegation", AAZObjectType, ".delegation")
374-
properties.set_prop("internetIngressPublicIps", AAZListType, ".internet_ingress_public_ips")
374+
properties.set_prop("internetIngressPublicIps", AAZListType, ".internet_ingress_ips")
375375
properties.set_prop("networkProfile", AAZObjectType, ".network_profile")
376376
properties.set_prop("nvaInterfaceConfigurations", AAZListType, ".nva_interface_configurations")
377377
properties.set_prop("nvaSku", AAZObjectType)

src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/virtual_appliance/_reimage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
4646

4747
_args_schema = cls._args_schema
4848
_args_schema.network_virtual_appliance_name = AAZStrArg(
49-
options=["--network-virtual-appliance-name"],
49+
options=["-n", "--name", "--network-virtual-appliance-name"],
5050
help="The name of Network Virtual Appliance.",
5151
required=True,
5252
id_part="name",

src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/virtual_appliance/_update.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ def _build_arguments_schema(cls, *args, **kwargs):
110110
help="The delegation for the Virtual Appliance",
111111
nullable=True,
112112
)
113-
_args_schema.internet_ingress_public_ips = AAZListArg(
114-
options=["--internet-ingress-public-ips"],
113+
_args_schema.internet_ingress_ips = AAZListArg(
114+
options=["--internet-ingress-ips"],
115115
arg_group="Properties",
116116
help="List of Resource Uri of Public IPs for Internet Ingress Scenario.",
117117
nullable=True,
@@ -123,7 +123,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
123123
nullable=True,
124124
)
125125
_args_schema.nva_interface_configurations = AAZListArg(
126-
options=["--interface-config", "--nva-interface-configurations"],
126+
options=["--interface-configs", "--nva-interface-configurations"],
127127
arg_group="Properties",
128128
help="The NVA in VNet interface configurations",
129129
nullable=True,
@@ -176,12 +176,12 @@ def _build_arguments_schema(cls, *args, **kwargs):
176176
nullable=True,
177177
)
178178

179-
internet_ingress_public_ips = cls._args_schema.internet_ingress_public_ips
180-
internet_ingress_public_ips.Element = AAZObjectArg(
179+
internet_ingress_ips = cls._args_schema.internet_ingress_ips
180+
internet_ingress_ips.Element = AAZObjectArg(
181181
nullable=True,
182182
)
183183

184-
_element = cls._args_schema.internet_ingress_public_ips.Element
184+
_element = cls._args_schema.internet_ingress_ips.Element
185185
_element.id = AAZResourceIdArg(
186186
options=["id"],
187187
help="Resource Uri of Public Ip",
@@ -545,7 +545,7 @@ def _update_instance(self, instance):
545545
properties.set_prop("cloudInitConfiguration", AAZStrType, ".cloud_init_config")
546546
properties.set_prop("cloudInitConfigurationBlobs", AAZListType, ".cloud_init_config_blobs")
547547
properties.set_prop("delegation", AAZObjectType, ".delegation")
548-
properties.set_prop("internetIngressPublicIps", AAZListType, ".internet_ingress_public_ips")
548+
properties.set_prop("internetIngressPublicIps", AAZListType, ".internet_ingress_ips")
549549
properties.set_prop("networkProfile", AAZObjectType, ".network_profile")
550550
properties.set_prop("nvaInterfaceConfigurations", AAZListType, ".nva_interface_configurations")
551551
properties.set_prop("nvaSku", AAZObjectType)

0 commit comments

Comments
 (0)