Merge pull request #10386 from number213/merge-network

Merge Network release branch into master

Author: wyunchi-ms

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

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>
 
 </Project>

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="30.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

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="19.16.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

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="19.16.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>
 
 </Project>

src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrud.json

@@ -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="2.4.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkIds.json

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
   </ItemGroup>
 
 </Project>

src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkObjects.json

@@ -83,7 +83,7 @@ function Test-VolumeCrud
     # create the list of protocol types
     $protocolTypes = New-Object string[] 2
     $protocolTypes[0] = "NFSv3"
-    $protocolTypes[1] = "NFSv4"
+    $protocolTypes[1] = "NFSv4.1"
 
     try
     {
@@ -112,8 +112,8 @@ function Test-VolumeCrud
         Assert-NotNull $retrievedVolume.ExportPolicy
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '0.0.0.0/0'
         Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
-        Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
-        Assert-AreEqual $retrievedVolume.ProtocolTypes[1] 'NFSv4.1'
+        Assert-AreEqual $retrievedVolume.ProtocolTypes[0] $protocolTypes[0]
+        Assert-AreEqual $retrievedVolume.ProtocolTypes[1] $protocolTypes[1]
         Assert-NotNull $retrievedVolume.MountTargets
 
         # create second volume and check using the confirm flag
@@ -298,4 +298,4 @@ function Test-VolumePipelines
         # Cleanup
         Clean-ResourceGroup $resourceGroup
     }
-}
+}

src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudRegistrationVirtualNetwork.json

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.17.0-preview" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="30.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />

src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudResolutionVirtualNetwork.json

@@ -34,12 +34,14 @@ class NrpTeamAlias
         // Split into subsets due to tests' long running time
         // Cortex and LocalNetworkGateway tests
         public const string brooklynft = "brooklynft";
-        // VirtualNetworkGatewayConnection tests
+        // First part of VirtualNetworkGatewayConnection tests
         public const string brooklynft_subset1 = "brooklynft_subset1";
         // First half of VirtualNetworkGateway tests
         public const string brooklynft_subset2 = "brooklynft_subset2";
         // Second half of VirtualNetworkGateway tests
         public const string brooklynft_subset3 = "brooklynft_subset3";
+        // Second part of VirtualNetworkGatewayConnection tests
+        public const string brooklynft_subset4 = "brooklynft_subset4";
 
         // Azure Network Analytics Dev Team
         public const string netanalyticsdev = "netanalyticsdev";
@@ -49,5 +51,8 @@ class NrpTeamAlias
 
         //Azure NRP Firewall dev team
         public const string azurefirewall = "azurefirewall";
+
+        // Azure NRP bastion dev team
+        public const string bastion = "bastion";
     }
 }

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

@@ -1,48 +1,37 @@
-// <auto-generated>
-// Copyright (c) Microsoft and contributors.  All rights reserved.
-// 
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//   http://www.apache.org/licenses/LICENSE-2.0
-// 
+// http://www.apache.org/licenses/LICENSE-2.0
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// 
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// 
-// 
-// Warning: This code was generated by a tool.
-// 
-// Changes to this file may cause incorrect behavior and will be lost if the
-// code is regenerated.
-// 
-// For documentation on code generator please visit
-//   https://aka.ms/nrp-code-generation
-// Please contact [email protected] if you need to make changes to this file.
-// </auto-generated>
+// ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Network.Test.ScenarioTests;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Commands.Network.Test.ScenarioTests
 {
-    public class UsageTestsGenerated : NetworkTestRunner
+    public class AzureFirewallPolicyTests : NetworkTestRunner
     {
-        public UsageTestsGenerated(Xunit.Abstractions.ITestOutputHelper output)
+        public AzureFirewallPolicyTests(ITestOutputHelper output)
             : base(output)
         {
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.wanrpdev)]
-        public void TestUsageCRUDMinimalParameters()
+        [Trait(Category.Owner, NrpTeamAlias.azurefirewall)]
+        public void TestAzureFirewallPolicyCRUD()
         {
-            TestRunner.RunTestScript("Test-UsageCRUDMinimalParameters");
+            TestRunner.RunTestScript("Test-AzureFirewallPolicyCRUD");
         }
     }
 }

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

@@ -0,0 +1,217 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+<#
+.SYNOPSIS
+Tests AzureFirewallPolicyCRUD.
+#>
+function Test-AzureFirewallPolicyCRUD {
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $azureFirewallPolicyName = Get-ResourceName
+    $azureFirewallPolicyAsJobName = Get-ResourceName
+    $resourceTypeParent = "Microsoft.Network/FirewallPolicies"
+    $location = "westcentralus"
+
+    $ruleGroupName = Get-ResourceName
+
+    # AzureFirewallPolicyApplicationRuleCollection
+    $appRcName = "appRc"
+    $appRcPriority = 400
+    $appRcActionType = "Allow"
+
+    $pipelineRcPriority = 154
+
+    # AzureFirewallPolicyApplicationRuleCollection 2
+    $appRc2Name = "appRc2"
+    $appRc2Priority = 300
+    $appRc2ActionType = "Deny"
+
+    # AzureFirewallPolicyApplicationRule 1
+    $appRule1Name = "appRule"
+    $appRule1Desc = "desc1"
+    $appRule1Fqdn1 = "*google.com"
+    $appRule1Fqdn2 = "*microsoft.com"
+    $appRule1Protocol1 = "http:80"
+    $appRule1Port1 = 80
+    $appRule1ProtocolType1 = "http"
+    $appRule1Protocol2 = "https:443"
+    $appRule1Port2 = 443
+    $appRule1ProtocolType2 = "https"
+    $appRule1SourceAddress1 = "192.168.0.0/16"
+
+    # AzureFirewallPolicyApplicationRule 2
+    $appRule2Name = "appRule2"
+    $appRule2Fqdn1 = "*bing.com"
+    $appRule2Protocol1 = "http:8080"
+    $appRule2Protocol2 = "https:443"
+    $appRule2Port1 = 8080
+    $appRule2ProtocolType1 = "http"
+    $appRule2SourceAddress1 = "192.168.0.0/16"
+
+    # AzureFirewallPolicyNetworkRuleCollection
+    $networkRcName = "networkRc"
+    $networkRcPriority = 200
+    $networkRcActionType = "Deny"
+
+    # AzureFirewallPolicyNetworkRule 1
+    $networkRule1Name = "networkRule"
+    $networkRule1Desc = "desc1"
+    $networkRule1SourceAddress1 = "10.0.0.0"
+    $networkRule1SourceAddress2 = "111.1.0.0/24"
+    $networkRule1DestinationAddress1 = "*"
+    $networkRule1Protocol1 = "UDP"
+    $networkRule1Protocol2 = "TCP"
+    $networkRule1Protocol3 = "ICMP"
+    $networkRule1DestinationPort1 = "90"
+
+    # AzureFirewallPolicyNatRuleCollection
+    $natRcName = "natRc"
+    $natRcPriority = 200
+    $natRcActionType = "Dnat"
+
+    # AzureFirewallPolicyNatRule 1
+    $natRule1Name = "natRule"
+    $natRule1Desc = "desc1"
+    $natRule1SourceAddress1 = "10.0.0.0"
+    $natRule1SourceAddress2 = "111.1.0.0/24"
+    $natRule1DestinationAddress1 = "1.2.3.4"
+    $natRule1Protocol1 = "UDP"
+    $natRule1Protocol2 = "TCP"
+    $natRule1DestinationPort1 = "90"
+    $natRule1TranslatedAddress = "10.1.2.3"
+    $natRule1TranslatedPort = "91"
+
+    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 
+
+        # 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-AreEqual "Alert" $getAzureFirewallPolicy.ThreatIntelMode
+
+
+        #Create Application Rules
+        $appRule = New-AzFirewallPolicyApplicationRule -Name $appRule1Name -Description $appRule1Desc -Protocol $appRule1Protocol1, $appRule1Protocol2 -TargetFqdn $appRule1Fqdn1, $appRule1Fqdn2 -SourceAddress $appRule1SourceAddress1
+        $appRule2 = New-AzFirewallPolicyApplicationRule -Name $appRule2Name -Description $appRule1Desc -Protocol $appRule2Protocol1, $appRule2Protocol2 -TargetFqdn $appRule2Fqdn1 -SourceAddress $appRule2SourceAddress1
+
+        # Create Network Rule Condition
+        $networkRule = New-AzFirewallPolicyNetworkRule -Name $networkRule1Name -Description $networkRule1Desc -Protocol $networkRule1Protocol1, $networkRule1Protocol2 -SourceAddress $networkRule1SourceAddress1, $networkRule1SourceAddress2 -DestinationAddress $networkRule1DestinationAddress1 -DestinationPort $networkRule1DestinationPort1
+
+        # Create Filter Rule with 2 rules
+        $appRc = New-AzFirewallPolicyFilterRuleCollection -Name $appRcName -Priority $appRcPriority -Rule $appRule, $appRule2 -ActionType $appRcActionType
+        # Create a second Filter Rule Collection with 1 rule
+        $appRc2 = New-AzFirewallPolicyFilterRuleCollection -Name $appRc2Name -Priority $appRc2Priority -Rule $networkRule -ActionType $appRc2ActionType
+
+        # Create a NAT rule
+        $natRc = New-AzFirewallPolicyNatRuleCollection -Name $networkRcName -Priority $natRcPriority -Rule $networkRule -TranslatedAddress $natRule1TranslatedAddress -TranslatedPort $natRule1TranslatedPort -ActionType $natRcActionType
+
+        New-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -Priority 100 -RuleCollection $appRc, $appRc2, $natRc -FirewallPolicyObject $azureFirewallPolicy
+
+
+        # # Update ThreatIntel mode
+        $azureFirewallPolicy.ThreatIntelMode = "Deny"
+        # Set AzureFirewallPolicy
+        Set-AzFirewallPolicy -InputObject $azureFirewallPolicy
+        # 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 $location $getAzureFirewallPolicy.Location
+        Assert-AreEqual "Deny" $getAzureFirewallPolicy.ThreatIntelMode
+
+        # # Check rule groups count
+        Assert-AreEqual 1 @($getAzureFirewallPolicy.RuleCollectionGroups).Count
+
+        $getRg = Get-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -AzureFirewallPolicy $getAzureFirewallPolicy
+
+        Assert-AreEqual 3 @($getRg.properties.ruleCollection).Count
+
+        $filterRuleCollection1 = $getRg.Properties.GetRuleCollectionByName($appRcName)
+        $natRuleCollection = $getRg.Properties.GetRuleCollectionByName($networkRcName)
+
+        # Verify filter Rule1 
+        Assert-AreEqual $appRcName $filterRuleCollection1.Name
+        Assert-AreEqual $appRcPriority $filterRuleCollection1.Priority
+        Assert-AreEqual $appRcActionType $filterRuleCollection1.Action.Type
+        Assert-AreEqual 2 $filterRuleCollection1.Rules.Count
+
+        $appRule = $filterRuleCollection1.GetRuleByName($appRule1Name)
+        # Verify application rule 1
+        Assert-AreEqual $appRule1Name $appRule.Name
+
+        Assert-AreEqual 1 $appRule.SourceAddresses.Count
+        Assert-AreEqual $appRule1SourceAddress1 $appRule.SourceAddresses[0]
+
+        Assert-AreEqual 2 $appRule.Protocols.Count 
+        Assert-AreEqual $appRule1ProtocolType1 $appRule.Protocols[0].ProtocolType
+        Assert-AreEqual $appRule1ProtocolType2 $appRule.Protocols[1].ProtocolType
+        Assert-AreEqual $appRule1Port1 $appRule.Protocols[0].Port
+        Assert-AreEqual $appRule1Port2 $appRule.Protocols[1].Port
+
+        Assert-AreEqual 2 $appRule.TargetFqdns.Count 
+        Assert-AreEqual $appRule1Fqdn1 $appRule.TargetFqdns[0]
+        Assert-AreEqual $appRule1Fqdn2 $appRule.TargetFqdns[1]
+
+        # Verify NAT rule collection and NAT rule)
+        $natRule = $natRuleCollection.GetRuleByName($networkRcName)
+
+        Assert-AreEqual $networkRcName $natRuleCollection.Name
+        Assert-AreEqual $natRcPriority $natRuleCollection.Priority
+
+        Assert-AreEqual $networkRule1Name $natRule.Name
+
+        Assert-AreEqual 2 $natRule.SourceAddresses.Count 
+        Assert-AreEqual $natRule1SourceAddress1 $natRule.SourceAddresses[0]
+        Assert-AreEqual $natRule1SourceAddress2 $natRule.SourceAddresses[1]
+
+        Assert-AreEqual 1 $natRule.DestinationAddresses.Count 
+
+        Assert-AreEqual 2 $natRule.Protocols.Count 
+        Assert-AreEqual $networkRule1Protocol1 $natRule.Protocols[0]
+        Assert-AreEqual $networkRule1Protocol2 $natRule.Protocols[1]
+
+        Assert-AreEqual 1 $natRule.DestinationPorts.Count 
+        Assert-AreEqual $natRule1DestinationPort1 $natRule.DestinationPorts[0]
+
+        Assert-AreEqual $natRule1TranslatedAddress $natRuleCollection.TranslatedAddress
+        Assert-AreEqual $natRule1TranslatedPort $natRuleCollection.TranslatedPort
+
+
+        $testPipelineRg = Get-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -AzureFirewallPolicyName $getAzureFirewallPolicy.Name -ResourceGroupName $rgname
+        $testPipelineRg|Set-AzFirewallPolicyRuleCollectionGroup -Priority $pipelineRcPriority
+        $testPipelineRg = Get-AzFirewallPolicyRuleCollectionGroup -Name $ruleGroupName -AzureFirewallPolicyName $getAzureFirewallPolicy.Name -ResourceGroupName $rgname
+        Assert-AreEqual $pipelineRcPriority $testPipelineRg.properties.Priority 
+
+        $azureFirewallPolicyAsJob = New-AzFirewallPolicy -Name $azureFirewallPolicyAsJobName -ResourceGroupName $rgname -Location $location -AsJob
+        $result = $azureFirewallPolicyAsJob | Wait-Job
+        Assert-AreEqual "Completed" $result.State;
+    }
+    finally {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}