Merge branch 'network-may' into master

Author: markcowl

src/GuestConfiguration/GuestConfiguration/Az.GuestConfiguration.psd1

@@ -1,9 +1,9 @@
 #
-# Module manifest for module 'PSGet_Az.GuestConfiguration'
+# Module manifest for module 'Az.GuestConfiguration'
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 3/18/2019
+# Generated on: 7/9/2019
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.10.5'
+ModuleVersion = '0.10.6'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -107,12 +107,13 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '- Fixed cmdlets failure when a subscription has an incorrect format initiative definition for GuestConfiguration category.'
+        ReleaseNotes = '* Fixed the inconsistency of compliance status reporting when Policy is non-compliant due to parameter updates scenario.
+* Quering data from PolicyInsights RP to get the updated compliance status.  '
 
         # Prerelease string of this module
         # Prerelease = ''
 
-        # Flag to indicate whether the module requires explicit user acceptance for install/update
+        # Flag to indicate whether the module requires explicit user acceptance for install/update/save
         # RequireLicenseAcceptance = $false
 
         # External dependent modules of this module

src/GuestConfiguration/GuestConfiguration/ChangeLog.md

@@ -18,8 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-    * Fixed the inconsistency of compliance status reporting when Policy is non-compliant due to parameter updates scenario.
-    * Quering data from PolicyInsights RP to get the updated compliance status.  
+
+## Version 0.10.6
+* Fixed the inconsistency of compliance status reporting when Policy is non-compliant due to parameter updates scenario.
+* Quering data from PolicyInsights RP to get the updated compliance status.  
 
 ## Version 0.10.5
 - Fixed cmdlets failure when a subscription has an incorrect format initiative definition for GuestConfiguration category.

src/GuestConfiguration/GuestConfiguration/Properties/AssemblyInfo.cs

@@ -25,5 +25,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("d28548d3-2673-4508-a28b-a69e0470faf7")]
 
-[assembly: AssemblyVersion("0.10.5")]
-[assembly: AssemblyFileVersion("0.10.5")]
+[assembly: AssemblyVersion("0.10.6")]
+[assembly: AssemblyFileVersion("0.10.6")]

src/Network/Network.Test/ScenarioTests/AvailablePrivateEndpointTypeTests.cs

@@ -27,7 +27,7 @@ public AvailablePrivateEndpointTypeTests(Xunit.Abstractions.ITestOutputHelper ou
 
         [Fact(Skip = "TODO: record")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.wanrpdev)]
+        [Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
         public void TestAvailablePrivateEndpointTypeCRUD()
         {
             TestRunner.RunTestScript("Test-AvailablePrivateEndpointTypeCRUD");

src/Network/Network.Test/ScenarioTests/NetworkCloudExceptionTests.ps1

@@ -30,7 +30,7 @@ function Test-NotFound
         New-AzResourceGroup -Name $rgName -Location $location
 
         # Get PublicIpAddress that doesn't exist
-        Assert-ThrowsLike { $ip = Get-AzPublicIpAddress -ResourceGroupName $rgName -Name $resourceName } "*was not found.*StatusCode:*404*ReasonPhrase:*Not Found*OperationID :*";
+        Assert-ThrowsLike { $ip = Get-AzPublicIpAddress -ResourceGroupName $rgName -Name $resourceName } "*was not found.*";
     }
     finally
     {
@@ -57,7 +57,7 @@ function Test-InvalidName
         # Create the resource group
         New-AzResourceGroup -Name $rgName -Location $location
 
-        Assert-ThrowsLike { $ip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $resourceInvalidName -Location $location -AllocationMethod Dynamic } "*Resource name ! is invalid.*StatusCode: 400*ReasonPhrase: Bad Request*OperationID :*";
+        Assert-ThrowsLike { $ip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $resourceInvalidName -Location $location -AllocationMethod Dynamic } "*Resource name ! is invalid.*";
     }
     finally
     {
@@ -89,7 +89,7 @@ function Test-DuplicateResource
         $subnet = New-AzVirtualNetworkSubnetConfig -Name $resourceName -AddressPrefix $subnetAddressPrefix
         $vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $resourceName -Location $location -AddressPrefix $vnetAddressPrefix -Subnet $subnet
         $vnet.Subnets.Add($subnet);
-        Assert-ThrowsLike { Set-AzVirtualNetwork -VirtualNetwork $vnet } "*Cannot parse the request.*StatusCode: 400*ReasonPhrase: Bad Request*OperationID*";
+        Assert-ThrowsLike { Set-AzVirtualNetwork -VirtualNetwork $vnet } "*Cannot parse the request.*";
     }
     finally
     {
@@ -121,7 +121,7 @@ function Test-IntersectAddressSpace
         $subnet = New-AzVirtualNetworkSubnetConfig -Name $resourceName -AddressPrefix $subnetAddressPrefix
         $vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $resourceName -Location $location -AddressPrefix $vnetAddressPrefix -Subnet $subnet
         Add-AzVirtualNetworkSubnetConfig -Name "${resourceName}2" -AddressPrefix $subnetAddressPrefix -VirtualNetwork $vnet
-        Assert-ThrowsLike { Set-AzVirtualNetwork -VirtualNetwork $vnet } "*Subnet*is not valid in virtual network*StatusCode: 400*ReasonPhrase: Bad Request*OperationID*";
+        Assert-ThrowsLike { Set-AzVirtualNetwork -VirtualNetwork $vnet } "*Subnet*is not valid in virtual network*";
     }
     finally
     {

src/Network/Network.Test/ScenarioTests/NetworkSecurityGroupTests.ps1

@@ -275,10 +275,11 @@ function Test-NetworkSecurityGroup-MultiValuedRules
 
         # Create SecurityRule
         $securityRule1 = New-AzNetworkSecurityRuleConfig -Name $securityRule1Name -Description "desciption" -Protocol Tcp -SourcePortRange 23-45,80-90 -DestinationPortRange 46-56,70-80 -SourceAddressPrefix 10.10.20.0/24,192.168.0.0/24 -DestinationAddressPrefix 10.10.30.0/24,192.168.2.0/24 -Access Allow -Priority 123 -Direction Inbound
-		$securityRule2 = New-AzNetworkSecurityRuleConfig -Name $securityRule2Name -Description "desciption" -Protocol Tcp -SourcePortRange 10-20,30-40 -DestinationPortRange 10-20,30-40 -SourceAddressPrefix Storage -DestinationAddressPrefix Storage -Access Allow -Priority 120 -Direction Inbound
+        $securityRule2 = New-AzNetworkSecurityRuleConfig -Name $securityRule2Name -Description "desciption" -Protocol Tcp -SourcePortRange 10-20,30-40 -DestinationPortRange 10-20,30-40 -SourceAddressPrefix Storage -DestinationAddressPrefix Storage -Access Allow -Priority 120 -Direction Inbound
+        $securityRule3 = New-AzNetworkSecurityRuleConfig -Name $securityRule3Name -Description "desciption" -Protocol Icmp -SourcePortRange 50-60,100-110 -DestinationPortRange 120-130,131-140 -SourceAddressPrefix Storage -DestinationAddressPrefix Storage -Access Allow -Priority 125 -Direction Inbound
 
         # Create NetworkSecurityGroup
-        $nsg = New-AzNetworkSecurityGroup -name $nsgName -ResourceGroupName $rgname -Location $location -SecurityRules $securityRule1,$securityRule2
+        $nsg = New-AzNetworkSecurityGroup -name $nsgName -ResourceGroupName $rgname -Location $location -SecurityRules $securityRule1,$securityRule2,$securityRule3
 
         # Get NetworkSecurityGroup
         $getNsg = Get-AzNetworkSecurityGroup -name $nsgName -ResourceGroupName $rgName
@@ -288,7 +289,7 @@ function Test-NetworkSecurityGroup-MultiValuedRules
         Assert-AreEqual $nsgName $getNsg.Name
         Assert-NotNull $getNsg.Location
         Assert-NotNull $getNsg.Etag
-        Assert-AreEqual 2 @($getNsg.SecurityRules).Count
+        Assert-AreEqual 3 @($getNsg.SecurityRules).Count
         Assert-AreEqual 6 @($getNsg.DefaultSecurityRules).Count
         Assert-AreEqual "AllowVnetInBound" $getNsg.DefaultSecurityRules[0].Name
         Assert-AreEqual "AllowAzureLoadBalancerInBound" $getNsg.DefaultSecurityRules[1].Name
@@ -335,6 +336,23 @@ function Test-NetworkSecurityGroup-MultiValuedRules
         Assert-AreEqual "120" $getNsg.SecurityRules[1].Priority
         Assert-AreEqual "Inbound" $getNsg.SecurityRules[1].Direction
 
+        # verify rule 3
+        Assert-AreEqual "desciption" $getNsg.SecurityRules[2].Description
+        Assert-AreEqual "Icmp" $getNsg.SecurityRules[2].Protocol
+        Assert-AreEqual 2 @($getNsg.SecurityRules[2].SourcePortRange).Count
+        Assert-AreEqual "50-60" $getNsg.SecurityRules[2].SourcePortRange[0]
+        Assert-AreEqual "100-110" $getNsg.SecurityRules[2].SourcePortRange[1]
+        Assert-AreEqual 2 @($getNsg.SecurityRules[2].DestinationPortRange).Count
+        Assert-AreEqual "120-130" $getNsg.SecurityRules[2].DestinationPortRange[0]
+        Assert-AreEqual "131-140" $getNsg.SecurityRules[2].DestinationPortRange[1]
+        Assert-AreEqual 1 @($getNsg.SecurityRules[2].SourceAddressPrefix).Count
+        Assert-AreEqual "Storage" $getNsg.SecurityRules[2].SourceAddressPrefix[0]
+        Assert-AreEqual 1 @($getNsg.SecurityRules[2].DestinationAddressPrefix).Count
+        Assert-AreEqual "Storage" $getNsg.SecurityRules[2].DestinationAddressPrefix[0]
+        Assert-AreEqual "Allow" $getNsg.SecurityRules[2].Access
+        Assert-AreEqual "125" $getNsg.SecurityRules[2].Priority
+        Assert-AreEqual "Inbound" $getNsg.SecurityRules[2].Direction
+
         # list
         $list = Get-AzNetworkSecurityGroup -ResourceGroupName $rgname
         Assert-AreEqual 1 @($list).Count

src/Network/Network.Test/ScenarioTests/NetworkWatcherAPITests.ps1

@@ -505,7 +505,8 @@ function Test-PacketCapture
         Assert-AreEqual $pc1.Filters[0].RemoteIPAddress 127.0.0.1-127.0.0.255
         Assert-AreEqual $pc1.Filters[1].LocalIPAddress 127.0.0.1;127.0.0.5
         Assert-AreEqual $pc1.StorageLocation.FilePath C:\tmp\Capture.cap
-        Assert-AreEqual $pcList.Count 2
+
+        $currentCount = $pcList.Count;
 
         #Stop packet capture
         $job = Stop-AzNetworkWatcherPacketCapture -NetworkWatcher $nw -PacketCaptureName $pcName1 -AsJob
@@ -520,7 +521,7 @@ function Test-PacketCapture
 
         #List packet captures
         $pcList = Get-AzNetworkWatcherPacketCapture -NetworkWatcher $nw
-        Assert-AreEqual $pcList.Count 1
+        Assert-AreEqual $pcList.Count ($currentCount - 1)
 
         #Remove packet capture
         Remove-AzNetworkWatcherPacketCapture -NetworkWatcher $nw -PacketCaptureName $pcName2

src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.ps1

@@ -223,7 +223,7 @@ function Test-subnetDelegationCRUD
         $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" } 
 
         # Create a delegation
-        $delegation = New-AzDelegation -Name "sqlDelegation" -ServiceName "Microsoft.Sql/servers"
+        $delegation = New-AzDelegation -Name "sqlDelegation" -ServiceName "Microsoft.Sql/managedInstances"
 
         # Create the Virtual Network
         $subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24 -delegation $delegation
@@ -253,7 +253,7 @@ function Test-subnetDelegationCRUD
         $vnetExpected = Get-AzvirtualNetwork -Name $vnetName -ResourceGroupName $rgname
         Assert-AreEqual 2 @($vnetExpected.Subnets).Count
         Assert-AreEqual 1 @($vnetExpected.Subnets[0].Delegations).Count
-		Assert-AreEqual "Microsoft.Sql/servers" $vnetExpected.Subnets[0].Delegations[0].ServiceName
+		Assert-AreEqual "Microsoft.Sql/managedInstances" $vnetExpected.Subnets[0].Delegations[0].ServiceName
         Assert-AreEqual 1 @($vnetExpected.Subnets[1].Delegations).Count
 		Assert-AreEqual "Microsoft.Netapp/volumes" $vnetExpected.Subnets[1].Delegations[0].ServiceName
 

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkCloudExceptionTests/TestDuplicateResource.json

@@ -18,6 +18,11 @@
         - Additional information about change #1
 --->
 ## Upcoming Release
+* Enable ICMP protocol for network security rule configurations
+    - Updated cmdlets
+        - Add-AzNetworkSecurityRuleConfig
+        - New-AzNetworkSecurityRuleConfig
+        - Set-AzNetworkSecurityRuleConfig
 
 ## Version 1.11.0
 * Added `RoutingPreference` to public ip tags

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkCloudExceptionTests/TestIntersectAddressSpace.json

@@ -39,6 +39,7 @@ public class AzureNetworkSecurityRuleConfigBase : NetworkBaseCmdlet
         [ValidateSet(
             MNM.SecurityRuleProtocol.Tcp,
             MNM.SecurityRuleProtocol.Udp,
+            MNM.SecurityRuleProtocol.Icmp,
             MNM.SecurityRuleProtocol.Asterisk,
             IgnoreCase = true)]
         [ValidateNotNullOrEmpty]