Skip to content

Commit eab3022

Browse files
committed
Small nit2
1 parent e4279c1 commit eab3022

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

src/azure-firewall/azext_firewall/tests/latest/test_azure_firewall_scenario.py

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,46 +1009,46 @@ def test_azure_firewall_policy_with_sql(self, resource_group):
10091009
self.cmd('network firewall policy update -g {rg} -n {policy} --sql False',
10101010
checks=self.check('sql.allowSqlRedirect', False))
10111011

1012-
# @AllowLargeResponse(size_kb=10240)
1013-
# @ResourceGroupPreparer(name_prefix="cli_test_firewall_basic_sku_", location="westus")
1014-
# def test_firewall_basic_sku(self):
1015-
# self.kwargs.update({
1016-
# "firewall_name": self.create_random_name("firewall-", 16),
1017-
# "vnet_name": self.create_random_name("vnet-", 12),
1018-
# "conf_name": self.create_random_name("ipconfig-", 16),
1019-
# "m_conf_name": self.create_random_name("ipconfig-", 16),
1020-
# "m_public_ip_name": self.create_random_name("public-ip-", 16),
1021-
# "vwan": self.create_random_name("vwan-", 12),
1022-
# "vhub": self.create_random_name("vhub-", 12),
1023-
# })
1024-
1025-
# with self.assertRaisesRegex(ValidationError, "When creating Basic SKU firewall, both --m-conf-name and --m-public-ip-address should be provided."):
1026-
# self.cmd("network firewall create -n {firewall_name} -g {rg} --sku AZFW_VNet --tier Basic")
1027-
1028-
# self.cmd("network vnet create -n {vnet_name} -g {rg} --address-prefixes 10.0.0.0/16 --subnet-name AzureFirewallSubnet --subnet-prefixes 10.0.0.0/24")
1029-
# self.cmd("network vnet subnet create -n AzureFirewallManagementSubnet -g {rg} --vnet-name {vnet_name} --address-prefixes 10.0.1.0/24")
1030-
# self.cmd("network public-ip create -n {m_public_ip_name} -g {rg} --sku Standard")
1031-
1032-
# self.cmd(
1033-
# "network firewall create -n {firewall_name} -g {rg} --sku AZFW_VNet --tier Basic --vnet-name {vnet_name} "
1034-
# "--conf-name {conf_name} --m-conf-name {m_conf_name} --m-public-ip {m_public_ip_name}",
1035-
# checks=[
1036-
# self.check("name", "{firewall_name}"),
1037-
# self.check("sku.tier", "Basic")
1038-
# ]
1039-
# )
1040-
# self.cmd("network firewall delete -n {firewall_name} -g {rg}")
1041-
1042-
# self.cmd("extension add -n virtual-wan")
1043-
# self.cmd("network vwan create -n {vwan} -g {rg} --type Standard")
1044-
# self.cmd('network vhub create -n {vhub} -g {rg} --vwan {vwan} --address-prefix 10.0.0.0/24 -l westus --sku Standard')
1045-
# self.cmd(
1046-
# "network firewall create -n {firewall_name} -g {rg} --vhub {vhub} --public-ip-count 2 --sku AZFW_Hub --tier Basic",
1047-
# checks=[
1048-
# self.check("name", "{firewall_name}"),
1049-
# self.check("sku.name", "AZFW_Hub")
1050-
# ]
1051-
# )
1012+
@AllowLargeResponse(size_kb=10240)
1013+
@ResourceGroupPreparer(name_prefix="cli_test_firewall_basic_sku_", location="westus")
1014+
def test_firewall_basic_sku(self):
1015+
self.kwargs.update({
1016+
"firewall_name": self.create_random_name("firewall-", 16),
1017+
"vnet_name": self.create_random_name("vnet-", 12),
1018+
"conf_name": self.create_random_name("ipconfig-", 16),
1019+
"m_conf_name": self.create_random_name("ipconfig-", 16),
1020+
"m_public_ip_name": self.create_random_name("public-ip-", 16),
1021+
"vwan": self.create_random_name("vwan-", 12),
1022+
"vhub": self.create_random_name("vhub-", 12),
1023+
})
1024+
1025+
with self.assertRaisesRegex(ValidationError, "When creating Basic SKU firewall, both --m-conf-name and --m-public-ip-address should be provided."):
1026+
self.cmd("network firewall create -n {firewall_name} -g {rg} --sku AZFW_VNet --tier Basic")
1027+
1028+
self.cmd("network vnet create -n {vnet_name} -g {rg} --address-prefixes 10.0.0.0/16 --subnet-name AzureFirewallSubnet --subnet-prefixes 10.0.0.0/24")
1029+
self.cmd("network vnet subnet create -n AzureFirewallManagementSubnet -g {rg} --vnet-name {vnet_name} --address-prefixes 10.0.1.0/24")
1030+
self.cmd("network public-ip create -n {m_public_ip_name} -g {rg} --sku Standard")
1031+
1032+
self.cmd(
1033+
"network firewall create -n {firewall_name} -g {rg} --sku AZFW_VNet --tier Basic --vnet-name {vnet_name} "
1034+
"--conf-name {conf_name} --m-conf-name {m_conf_name} --m-public-ip {m_public_ip_name}",
1035+
checks=[
1036+
self.check("name", "{firewall_name}"),
1037+
self.check("sku.tier", "Basic")
1038+
]
1039+
)
1040+
self.cmd("network firewall delete -n {firewall_name} -g {rg}")
1041+
1042+
self.cmd("extension add -n virtual-wan")
1043+
self.cmd("network vwan create -n {vwan} -g {rg} --type Standard")
1044+
self.cmd('network vhub create -n {vhub} -g {rg} --vwan {vwan} --address-prefix 10.0.0.0/24 -l westus --sku Standard')
1045+
self.cmd(
1046+
"network firewall create -n {firewall_name} -g {rg} --vhub {vhub} --public-ip-count 2 --sku AZFW_Hub --tier Basic",
1047+
checks=[
1048+
self.check("name", "{firewall_name}"),
1049+
self.check("sku.name", "AZFW_Hub")
1050+
]
1051+
)
10521052

10531053
@AllowLargeResponse(size_kb=10240)
10541054
@ResourceGroupPreparer(name_prefix="cli_test_firewall_vhub_create_with_public_ip", location="westus")

0 commit comments

Comments
 (0)