Merge pull request Azure#15207 from network-february

[Do not squash] merge network features to master
fenwickt · Jun 8, 2021 · f1f2eff · f1f2eff
2 parents 6353626 + 57c6fc1
commit f1f2eff
Show file tree

Hide file tree

Showing 140 changed files with 26,769 additions and 9,151 deletions.
diff --git a/src/Accounts/Accounts/AzureRmAlias/Mappings.json b/src/Accounts/Accounts/AzureRmAlias/Mappings.json
@@ -1494,6 +1494,7 @@
     "Set-AzLoadBalancerBackendAddressPool": "Set-AzureRmLoadBalancerBackendAddressPool",
     "New-AzLoadBalancerBackendAddressPool": "New-AzureRmLoadBalancerBackendAddressPool",
     "Remove-AzLoadBalancerBackendAddressPool": "Remove-AzureRmLoadBalancerBackendAddressPool",
+    "New-AzLoadBalancerBackendAddressPoolTunnelInterfaceConfig": "New-AzureRmLoadBalancerBackendAddressPoolTunnelInterfaceConfig",
     "New-AzLoadBalancerBackendAddressConfig": "New-AzureRmLoadBalancerBackendAddressConfig",
     "Get-AzLoadBalancerBackendAddressPoolConfig": "Get-AzureRmLoadBalancerBackendAddressPoolConfig",
     "Add-AzLoadBalancerBackendAddressPoolConfig": "Add-AzureRmLoadBalancerBackendAddressPoolConfig",

diff --git a/src/Batch/Batch.Test/Batch.Test.csproj b/src/Batch/Batch.Test/Batch.Test.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj b/src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Compute/Compute.Test/Compute.Test.csproj b/src/Compute/Compute.Test/Compute.Test.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="47.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ContainerRegistry/ContainerRegistry.Test/ContainerRegistry.Test.csproj b/src/ContainerRegistry/ContainerRegistry.Test/ContainerRegistry.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.ContainerRegistry" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0">
       <NoWarn>NU1608</NoWarn>

diff --git a/src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj b/src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="3.0.0" />
 </ItemGroup>
 </Project>
diff --git a/src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj b/src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Dns/Dns.Test/Dns.Test.csproj b/src/Dns/Dns.Test/Dns.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HDInsight/HDInsight.Test/HDInsight.Test.csproj b/src/HDInsight/HDInsight.Test/HDInsight.Test.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Azure.Management.HDInsight.Job" Version="2.0.7" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
     <PackageReference Include="Microsoft.Azure.Management.ManagedServiceIdentity" Version="0.11.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
   </ItemGroup>
 

diff --git a/src/HPCCache/HPCCache.Test/HPCCache.Test.csproj b/src/HPCCache/HPCCache.Test/HPCCache.Test.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.11.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.5.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 

diff --git a/src/KeyVault/KeyVault.Test/KeyVault.Test.csproj b/src/KeyVault/KeyVault.Test/KeyVault.Test.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -26,4 +26,3 @@
   </ItemGroup>
 
 </Project>
-
diff --git a/src/Monitor/Monitor.Test/Monitor.Test.csproj b/src/Monitor/Monitor.Test/Monitor.Test.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.3-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
   </ItemGroup>
 

diff --git a/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj b/src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.12.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Network/Network.Test/Network.Test.csproj b/src/Network/Network.Test/Network.Test.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.4.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />

diff --git a/src/Network/Network.Test/ScenarioTests/ApplicationGatewayTests.ps1 b/src/Network/Network.Test/ScenarioTests/ApplicationGatewayTests.ps1
@@ -3297,7 +3297,7 @@ function Test-ApplicationGatewayCRUDWithMutualAuthentication
 		$gwSubnet = Get-AzVirtualNetworkSubnetConfig -Name $gwSubnetName -VirtualNetwork $vnet
 
 		# Create public ip
-		$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Static -sku Standard
+		$publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -Zone 1,2 -AllocationMethod Static -sku Standard
 
 		# Create ip configuration
 		$gipconfig = New-AzApplicationGatewayIPConfiguration -Name $gipconfigname -Subnet $gwSubnet
@@ -3343,10 +3343,9 @@ function Test-ApplicationGatewayCRUDWithMutualAuthentication
 		$sslProfiles = Get-AzApplicationGatewaySslProfile -ApplicationGateway $getgw
 		Assert-AreEqual $sslProfiles.Count 1
 		Assert-AreEqual $sslProfiles[0].Id $sslProfile01.Id
-        Assert-AreEqual $sslProfile01.TrustedClientCertificates.Count 1
-        Assert-AreEqual $sslProfiles.TrustedClientCertificates[0].Id $trustedClient01.Id
+		Assert-AreEqual $sslProfile01.TrustedClientCertificates.Count 1
+		Assert-AreEqual $sslProfiles.TrustedClientCertificates[0].Id $trustedClient01.Id
 
-        $trustedClient01 = Get-AzApplicationGatewayTrustedClientCertificate -Name $trustedClientCert01Name -ApplicationGateway $getgw 
 		$trustedClients = Get-AzApplicationGatewayTrustedClientCertificate -ApplicationGateway $getgw
 		Assert-AreEqual $trustedClients.Count 1
 		Assert-AreEqual $trustedClients[0].Id $trustedClient01.Id
@@ -3424,4 +3423,4 @@ function Test-ApplicationGatewayCRUDWithMutualAuthentication
 		# Cleanup
 		Clean-ResourceGroup $rgname
 	}
-}
+}
diff --git a/src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.cs b/src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.cs
@@ -132,5 +132,13 @@ public void TestAzureFirewallPolicyPremiumWithTerminateTLSEnabledAndTargetUrls()
         {
             TestRunner.RunTestScript("Test-AzureFirewallPolicyPremiumWithTerminateTLSEnabledAndTargetUrls");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
+        public void TestAzureFirewallPolicyPrivateRangeCRUD()
+        {
+            TestRunner.RunTestScript("Test-AzureFirewallPolicyPrivateRangeCRUD");
+        }
     }
 }
diff --git a/src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.ps1 b/src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.ps1
@@ -1417,4 +1417,48 @@ function Test-AzureFirewallPolicyPremiumFeatures {
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Tests AzureFirewall Policy PrivateRange
+#>
+function Test-AzureFirewallPolicyPrivateRangeCRUD {
+    $rgname = Get-ResourceGroupName
+    $azureFirewallPolicyName = Get-ResourceName
+    $resourceTypeParent = "Microsoft.Network/FirewallPolicies"
+    $location = "westus2"
+    $vnetName = Get-ResourceName
+    $privateRange2 = @("IANAPrivateRanges", "0.0.0.0/0", "66.92.0.0/16")
+    $privateRange1 = @("3.3.0.0/24", "98.0.0.0/8")
+    $privateRange2Translated = @("0.0.0.0/0", "66.92.0.0/16", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10")
+
+    try {
+
+        # Create the resource group
+        $resourceGroup = New-AzResourceGroup -Name $rgname -Location $location -Tags @{ testtag = "testval" }
+
+        # Create AzureFirewallPolicy (with no rules, ThreatIntel is in Alert mode by default)
+        $azureFirewallPolicy = New-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname -Location $location -PrivateRange $privateRange1
+
+        # Get AzureFirewallPolicy
+        $getAzureFirewallPolicy = Get-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname
+
+        #verification
+        Assert-AreEqual $rgName $getAzureFirewallPolicy.ResourceGroupName
+        Assert-AreEqual $azureFirewallPolicyName $getAzureFirewallPolicy.Name
+        Assert-NotNull $getAzureFirewallPolicy.Location
+        Assert-AreEqual (Normalize-Location $location) $getAzureFirewallPolicy.Location
+        Assert-AreEqualArray $privateRange1 $getAzureFirewallPolicy.PrivateRange
+
+        # Modify
+        $azureFirewallPolicy.PrivateRange = $privateRange2
+        Set-AzFirewallPolicy -InputObject $azureFirewallPolicy
+        $getAzureFirewallPolicy = Get-AzFirewallPolicy -Name $azureFirewallPolicyName -ResourceGroupName $rgname
+        Assert-AreEqualArray $privateRange2Translated $getAzureFirewallPolicy.PrivateRange
+    }
+    finally {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
 }
diff --git a/src/Network/Network.Test/ScenarioTests/LoadBalancerTests.cs b/src/Network/Network.Test/ScenarioTests/LoadBalancerTests.cs
@@ -248,5 +248,29 @@ public void TestCreateSubresourcesOnEmptyLoadBalancer()
         {
             TestRunner.RunTestScript("Test-CreateSubresourcesOnEmptyLoadBalancer");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.slbdev)]
+        public void TestGatewayLoadBalancerProviderOnePool()
+        {
+            TestRunner.RunTestScript("Test-GatewayLoadBalancer-ProviderOnePool");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.slbdev)]
+        public void TestGatewayLoadBalancerProviderTwoPool()
+        {
+            TestRunner.RunTestScript("Test-GatewayLoadBalancer-ProviderTwoPool");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.slbdev)]
+        public void TestGatewayLoadBalancerConsumerLb()
+        {
+            TestRunner.RunTestScript("Test-GatewayLoadBalancer-ConsumerLb");
+        }
     }
 }