Skip to content

Commit df875b0

Browse files
VeryEarlyv-shhattMikhailTryakhovtejasshah7litchiyangMSFT
authored
Sync network-july with master branch (#13478)
* re-record test cases for network api upgrade * upgrade network SDK version * Add TranslatedFqdn option for Azure Firewall Policy NAT Rule * update azvirtualrouter * Add Get-AzVirtualRouterPeerAdvertisedRoute and Get-AzVirtualRouterPeerLearnedRoute with warning messageVr peer * re-record failed test case * suppress static analysis issue * OOB release Az.Network-4.2.0 * fix changelog Co-authored-by: Ranjani Hatti <[email protected]> Co-authored-by: Mikhail <[email protected]> Co-authored-by: tejasshah7 <[email protected]> Co-authored-by: litchiyangMSFT <[email protected]>
1 parent 8bd6a19 commit df875b0

File tree

313 files changed

+41340
-28357
lines changed

Some content is hidden

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

313 files changed

+41340
-28357
lines changed

‎src/Batch/Batch.Test/Batch.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
1919
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
20-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.4.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="39.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
7+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
88
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="1.2.1" />
99
</ItemGroup>
1010
</Project>

‎src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Dns/Dns.Test/Dns.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/HDInsight/HDInsight.Test/HDInsight.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.Azure.Management.HDInsight.Job" Version="2.0.7" />
1717
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
1818
<PackageReference Include="Microsoft.Azure.Management.ManagedServiceIdentity" Version="0.11.0" />
19-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
19+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
2020
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
2121
</ItemGroup>
2222

‎src/HPCCache/HPCCache.Test/HPCCache.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.11.0-preview" />
1919
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.5.0" />
20-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
2121
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
2222
</ItemGroup>
2323

‎src/KeyVault/KeyVault.Test/KeyVault.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1515
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Monitor/Monitor.Test/Monitor.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.2-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
16-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
16+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1717
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
1818
</ItemGroup>
1919

‎src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.7.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Network/Network.Test/Network.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.2.0" />
1818
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
1919
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
2020
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />

‎src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,13 @@ public void TestAzureFirewallPolicyWithIpGroups()
6565
{
6666
TestRunner.RunTestScript("Test-AzureFirewallPolicyWithIpGroups");
6767
}
68+
69+
[Fact]
70+
[Trait(Category.AcceptanceType, Category.CheckIn)]
71+
[Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
72+
public void TestAzureFirewallPolicyCRUDWithNatRuleTranslatedFQDN()
73+
{
74+
TestRunner.RunTestScript("Test-AzureFirewallPolicyCRUDWithNatRuleTranslatedFQDN");
75+
}
6876
}
6977
}

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

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,3 +756,121 @@ function Test-AzureFirewallPolicyWithIpGroups {
756756
Clean-ResourceGroup $rgname
757757
}
758758
}
759+
760+
<#
761+
.SYNOPSIS
762+
Tests function Test-AzureFirewallPolicyCRUDWithNatRuleTranslatedFQDN.
763+
#>
764+
function Test-AzureFirewallPolicyCRUDWithNatRuleTranslatedFQDN {
765+
# Setup
766+
$rgname = Get-ResourceGroupName
767+
$azureFirewallPolicyName = Get-ResourceName
768+
$azureFirewallPolicyAsJobName = Get-ResourceName
769+
$resourceTypeParent = "Microsoft.Network/FirewallPolicies"
770+
$location = "canadacentral"
771+
772+
$ruleGroupName = Get-ResourceName
773+
774+
# AzureFirewallPolicyNatRuleCollection
775+
$natRcName = "natRc"
776+
$natRcPriority = 100
777+
$natRcActionType = "Dnat"
778+
779+
# AzureFirewallPolicyNatRule 1
780+
$natRule1Name = "natRule"
781+
$natRule1Desc = "desc1"
782+
$natRule1SourceAddress1 = "10.0.0.0"
783+
$natRule1SourceAddress2 = "111.1.0.0/24"
784+
$natRule1Protocol1 = "UDP"
785+
$natRule1Protocol2 = "TCP"
786+
$natRule1DestinationAddress1 = "10.10.10.1"
787+
$natRule1DestinationPort1 = "90"
788+
$natRule1TranslatedFqdn = "server1.internal.com"
789+
$natRule1TranslatedPort = "91"
790+
791+
$pipelineRcPriority = 154
792+
793+
try {
794+
# Create the resource group
795+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $location -Tags @{ testtag = "testval" }
796+
797+
# Create AzureFirewallPolicy
798+
$azureFirewallPolicy = New-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname -Location $location
799+
800+
# Get AzureFirewallPolicy
801+
$getAzureFirewallPolicy = Get-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname
802+
803+
#verification
804+
Assert-AreEqual $rgName $getAzureFirewallPolicy.ResourceGroupName
805+
Assert-AreEqual $azureFirewallPolicyName $getAzureFirewallPolicy.Name
806+
Assert-NotNull $getAzureFirewallPolicy.Location
807+
Assert-AreEqual (Normalize-Location $location) $getAzureFirewallPolicy.Location
808+
Assert-AreEqual "Alert" $getAzureFirewallPolicy.ThreatIntelMode
809+
810+
# Create NAT rule
811+
$natRule = New-AzFirewallPolicyNatRule -Name $natRule1Name -Description $natRule1Desc -Protocol $natRule1Protocol1, $natRule1Protocol2 -SourceAddress $natRule1SourceAddress1, $natRule1SourceAddress2 -DestinationAddress $natRule1DestinationAddress1 -DestinationPort $natRule1DestinationPort1 -TranslatedFqdn $natRule1TranslatedFqdn -TranslatedPort $natRule1TranslatedPort
812+
813+
# Create a NAT Rule Collection
814+
$natRc = New-AzFirewallPolicyNatRuleCollection -Name $natRcName -ActionType $natRcActionType -Priority $natRcPriority -Rule $natRule
815+
816+
New-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -Priority 100 -RuleCollection $natRc -FirewallPolicyObject $azureFirewallPolicy
817+
818+
# Set AzureFirewallPolicy
819+
Set-AzFirewallPolicy -InputObject $azureFirewallPolicy
820+
# Get AzureFirewallPolicy
821+
$getAzureFirewallPolicy = Get-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgName
822+
823+
# verification
824+
Assert-AreEqual $rgName $getAzureFirewallPolicy.ResourceGroupName
825+
Assert-AreEqual $azureFirewallPolicyName $getAzureFirewallPolicy.Name
826+
Assert-NotNull $getAzureFirewallPolicy.Location
827+
Assert-AreEqual $location $getAzureFirewallPolicy.Location
828+
829+
# Check rule collection groups count
830+
Assert-AreEqual 1 @($getAzureFirewallPolicy.RuleCollectionGroups).Count
831+
832+
$getRg = Get-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -AzureFirewallPolicy $getAzureFirewallPolicy
833+
834+
Assert-AreEqual 1 @($getRg.properties.ruleCollection).Count
835+
836+
$natRuleCollection = $getRg.Properties.GetRuleCollectionByName($natRcName)
837+
838+
# Verify NAT rule collection and NAT rule
839+
$natRule = $natRuleCollection.GetRuleByName($natRule1Name)
840+
841+
Assert-AreEqual $natRcName $natRuleCollection.Name
842+
Assert-AreEqual $natRcPriority $natRuleCollection.Priority
843+
844+
Assert-AreEqual $natRule1Name $natRule.Name
845+
846+
Assert-AreEqual 2 $natRule.SourceAddresses.Count
847+
Assert-AreEqual $natRule1SourceAddress1 $natRule.SourceAddresses[0]
848+
Assert-AreEqual $natRule1SourceAddress2 $natRule.SourceAddresses[1]
849+
850+
Assert-AreEqual 1 $natRule.DestinationAddresses.Count
851+
852+
Assert-AreEqual 2 $natRule.Protocols.Count
853+
Assert-AreEqual $natRule1Protocol1 $natRule.Protocols[0]
854+
Assert-AreEqual $natRule1Protocol2 $natRule.Protocols[1]
855+
856+
Assert-AreEqual 1 $natRule.DestinationPorts.Count
857+
Assert-AreEqual $natRule1DestinationPort1 $natRule.DestinationPorts[0]
858+
859+
Assert-AreEqual $natRule1TranslatedFqdn $natRule.TranslatedFqdn
860+
Assert-AreEqual $natRule1TranslatedPort $natRule.TranslatedPort
861+
862+
863+
$testPipelineRg = Get-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -AzureFirewallPolicyName $getAzureFirewallPolicy.Name -ResourceGroupName $rgname
864+
$testPipelineRg|Set-AzFirewallPolicyRuleCollectionGroup -Priority $pipelineRcPriority
865+
$testPipelineRg = Get-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -AzureFirewallPolicyName $getAzureFirewallPolicy.Name -ResourceGroupName $rgname
866+
Assert-AreEqual $pipelineRcPriority $testPipelineRg.properties.Priority
867+
868+
$azureFirewallPolicyAsJob = New-AzFirewallPolicy -Name $azureFirewallPolicyAsJobName -ResourceGroupName $rgname -Location $location -AsJob
869+
$result = $azureFirewallPolicyAsJob | Wait-Job
870+
Assert-AreEqual "Completed" $result.State
871+
}
872+
finally {
873+
# Cleanup
874+
Clean-ResourceGroup $rgname
875+
}
876+
}

‎src/Network/Network.Test/ScenarioTests/LoadBalancerTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2437,7 +2437,7 @@ function Test-CreateSubresourcesOnEmptyLoadBalancer
24372437
Assert-NotNull $ipConfig
24382438

24392439
$lb = Add-AzLoadBalancerBackendAddressPoolConfig -Name $poolName -LoadBalancer $lb
2440-
$lb = Add-AzLoadBalancerProbeConfig -Name $probeName -LoadBalancer $lb -Port 2000 -IntervalInSeconds 60 -ProbeCount 3
2440+
$lb = Add-AzLoadBalancerProbeConfig -Name $probeName -LoadBalancer $lb -Port 2000 -IntervalInSeconds 60 -ProbeCount 3 -Protocol Tcp
24412441
$lb = Add-AzLoadBalancerRuleConfig -Name $ruleName -LoadBalancer $lb -FrontendIpConfiguration $ipConfig -Protocol Tcp -FrontendPort 1024 -BackendPort 2048
24422442
$lb = Add-AzLoadBalancerInboundNatRuleConfig -Name $natRuleName -LoadBalancer $lb -FrontendIpConfiguration $ipConfig -FrontendPort 128 -BackendPort 256
24432443

0 commit comments

Comments
 (0)