Skip to content

Commit 5ffb787

Browse files
Gizachew-EshetieGizachew Eshetie
andauthored
PowerShell Live Test Fix for Firewall (#21387)
* Fixed failing tests * Live test changes * live tests fix due to location * reverted snat changes --------- Co-authored-by: Gizachew Eshetie <[email protected]>
1 parent 274c8af commit 5ffb787

14 files changed

+5907
-10946
lines changed

src/Network/Network.Test/ScenarioTests/AzureFirewallIpGroupTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ function Test-AzureFirewallIpGroup
3434
{
3535
# Setup
3636
$rgname = Get-ResourceGroupName
37-
$rglocation = Get-ProviderLocation ResourceManagement "eastus2euap"
38-
$location = Get-ProviderLocation ResourceManagement "eastus2euap"
39-
$ipGroupLocation = Get-ProviderLocation ResourceManagement "eastus2euap"
37+
$rglocation = Get-ProviderLocation ResourceManagement "eastus"
38+
$location = Get-ProviderLocation ResourceManagement "eastus"
39+
$ipGroupLocation = Get-ProviderLocation ResourceManagement "eastus"
4040
$ipGroupName1 = Get-ResourceName
4141
$ipGroupName2 = Get-ResourceName
4242

@@ -125,7 +125,7 @@ function Test-AzureFirewallIpGroup
125125
$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Static -Sku Standard
126126

127127
# Create AzureFirewall (with no rules, ThreatIntel is in Alert mode by default)
128-
$azureFirewall = New-AzFirewall –Name $azureFirewallName -ResourceGroupName $rgname -Location $location -VirtualNetworkName $vnetName -PublicIpName $publicIpName
128+
$azureFirewall = New-AzFirewall –Name $azureFirewallName -ResourceGroupName $rgname -Location $location -VirtualNetwork $vnet -PublicIpAddress $publicip
129129

130130
#
131131
# Application Rule Section

src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function Test-AzureFirewallPolicyCRUD {
2222
$azureFirewallPolicyName = Get-ResourceName
2323
$azureFirewallPolicyAsJobName = Get-ResourceName
2424
$resourceTypeParent = "Microsoft.Network/FirewallPolicies"
25-
$location = "eastus2euap"
25+
$location = "westus2"
2626

2727
$ruleGroupName = Get-ResourceName
2828

@@ -269,7 +269,7 @@ function Test-AzureFirewallPolicyWithThreatIntelWhitelistCRUD {
269269
$azureFirewallPolicyName = Get-ResourceName
270270
$azureFirewallPolicyAsJobName = Get-ResourceName
271271
$resourceTypeParent = "Microsoft.Network/FirewallPolicies"
272-
$location = "eastus2euap"
272+
$location = "westus2"
273273

274274
$ruleGroupName = Get-ResourceName
275275
$threatIntelWhiteListIp1 = "20.3.4.5"
@@ -332,7 +332,7 @@ function Test-AzureFirewallPolicyWithDNSSettings {
332332
$azureFirewallPolicyName = Get-ResourceName
333333
$azureFirewallPolicyAsJobName = Get-ResourceName
334334
$resourceTypeParent = "Microsoft.Network/FirewallPolicies"
335-
$location = "eastus2euap"
335+
$location = "westus2"
336336
$dnsServers = @("10.10.10.1", "20.20.20.2")
337337

338338
try {
@@ -425,7 +425,7 @@ function Test-AzureFirewallPolicyWithSQLSetting {
425425
$rgname = Get-ResourceGroupName
426426
$azureFirewallPolicyName = Get-ResourceName
427427
$azureFirewallPolicyName2 = Get-ResourceName
428-
$location = "eastus2euap"
428+
$location = "westus2"
429429

430430
try {
431431

@@ -451,7 +451,7 @@ function Test-AzureFirewallPolicyWithSQLSetting {
451451
$disallowSql = New-AzFirewallPolicySqlSetting
452452
$azureFirewallPolicy = Set-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname -Location $location -SqlSetting $disallowSql
453453
$getAzureFirewallPolicy = Get-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname
454-
Assert-Null $getAzureFirewallPolicy.SqlSetting.AllowSqlRedirect
454+
Assert-AreEqual false $getAzureFirewallPolicy.SqlSetting.AllowSqlRedirect
455455

456456
# test set AzureFirewallPolicy with sql redirect
457457
$azureFirewallPolicy = Set-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname -Location $location -SqlSetting $allowSql
@@ -489,7 +489,7 @@ function Test-AzureFirewallPolicyCRUDWithNetworkRuleDestinationFQDNs {
489489
$azureFirewallPolicyName = Get-ResourceName
490490
$azureFirewallPolicyAsJobName = Get-ResourceName
491491
$resourceTypeParent = "Microsoft.Network/FirewallPolicies"
492-
$location = "eastus2euap"
492+
$location = "westus2"
493493
$dnsServers = @("10.10.10.1", "20.20.20.2")
494494

495495
$ruleGroupName = Get-ResourceName
@@ -610,8 +610,8 @@ function Test-AzureFirewallPolicyWithIpGroups {
610610
$azureFirewallPolicyName = Get-ResourceName
611611
$azureFirewallPolicyAsJobName = Get-ResourceName
612612
$resourceTypeParent = "Microsoft.Network/FirewallPolicies"
613-
$location = "eastus2euap"
614-
$ipGroupLocation = Get-ProviderLocation ResourceManagement "eastus2euap"
613+
$location = "westus2"
614+
$ipGroupLocation = Get-ProviderLocation ResourceManagement "westus2"
615615
$ipGroupName1 = Get-ResourceName
616616
$ipGroupName2 = Get-ResourceName
617617

src/Network/Network.Test/ScenarioTests/AzureFirewallTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,10 +525,10 @@ function Test-AzureFirewallCRUDWithZones {
525525
$vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
526526

527527
# Create public ip
528-
$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Static -Sku Standard
528+
$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Static -Sku Standard -Zone 1, 2, 3
529529

530530
# Create AzureFirewall (with no rules, ThreatIntel is in Alert mode by default)
531-
$azureFirewall = New-AzFirewall –Name $azureFirewallName -ResourceGroupName $rgname -Location $location -VirtualNetworkName $vnetName -PublicIpName $publicIpName -Zone 1, 2, 3
531+
$azureFirewall = New-AzFirewall –Name $azureFirewallName -ResourceGroupName $rgname -Location $location -VirtualNetwork $vnet -PublicIpAddress $publicip -Zone 1, 2, 3
532532

533533
# Get AzureFirewall
534534
$getAzureFirewall = Get-AzFirewall -name $azureFirewallName -ResourceGroupName $rgname
@@ -1236,8 +1236,8 @@ function Test-AzureFirewallVirtualHubCRUDWithZones {
12361236
$rgname = Get-ResourceGroupName
12371237
$azureFirewallName = Get-ResourceName
12381238
$resourceTypeParent = "Microsoft.Network/AzureFirewalls"
1239-
$policyLocation = Get-ProviderLocation $resourceTypeParent "eastus2euap"
1240-
$location = Get-ProviderLocation $resourceTypeParent "eastus2euap"
1239+
$policyLocation = Get-ProviderLocation $resourceTypeParent "eastus"
1240+
$location = Get-ProviderLocation $resourceTypeParent "eastus"
12411241
$azureFirewallPolicyName = Get-ResourceName
12421242
$skuName = "AZFW_Hub"
12431243
$skuTier = "Standard"

0 commit comments

Comments
 (0)