Merge pull request #5909 from Nilambari/preview1

Brooklyn Feature: Point To Site IPSec custom policy set on Gateway

Author: cormacpayne

src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/ZoneTests.cs

@@ -32,35 +32,30 @@ public void TestZoneCrud()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrud()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrud");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudRegistrationVirtualNetwork()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudRegistrationVnet");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudResolutionVirtualNetwork()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudResolutionVnet");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudByVirtualNetworkIds()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudByVirtualNetworkIds");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrudByVirtualNetworkObjects()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-PrivateZoneCrudByVirtualNetworkObjects");

src/ResourceManager/Network/AzureRM.Network.Netcore.psd1

@@ -241,6 +241,11 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
     'Reset-AzureRmVirtualNetworkGateway', 
     'Set-AzureRmVirtualNetworkGatewayDefaultSite', 
     'Remove-AzureRmVirtualNetworkGatewayDefaultSite', 
+	'New-AzureRmVpnClientIpsecPolicy', 
+	'New-AzureRmVpnClientIpsecParameter', 
+	'Set-AzureRmVpnClientIpsecParameter', 
+	'Get-AzureRmVpnClientIpsecParameter'	
+	'Remove-AzureRmVpnClientIpsecParameter',
     'Remove-AzureRmLocalNetworkGateway', 
     'Get-AzureRmLocalNetworkGateway', 'New-AzureRmLocalNetworkGateway', 
     'Set-AzureRmLocalNetworkGateway', 

src/ResourceManager/Network/AzureRM.Network.psd1

@@ -227,6 +227,11 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
                'Add-AzureRmVpnClientRevokedCertificate', 
                'New-AzureRmVpnClientRootCertificate', 
                'New-AzureRmVpnClientRevokedCertificate', 
+               'New-AzureRmVpnClientIpsecPolicy', 
+               'New-AzureRmVpnClientIpsecParameter', 
+               'Set-AzureRmVpnClientIpsecParameter',      
+               'Get-AzureRmVpnClientIpsecParameter', 	
+               'Remove-AzureRmVpnClientIpsecParameter', 	
                'Resize-AzureRmVirtualNetworkGateway', 
                'Remove-AzureRmVpnClientRevokedCertificate', 
                'Remove-AzureRmVpnClientRootCertificate', 

src/ResourceManager/Network/ChangeLog.md

@@ -22,6 +22,16 @@
 
 ## Version 6.1.0
 * Bump up Network SDK version from 18.0.0-preview to 19.0.0-preview
+* Updated below commands for feature: Point to Site IPsec custom policy set/remove on Brooklyn Gateway.
+    - Updated New-AzureRmVirtualNetworkGateway: Added optional parameter -VpnClientIpsecPolicy   [Pass the value from output of newly added command:- New-AzureRmVpnClientIpsecPolicy]
+    - Updated Set-AzureRmVirtualNetworkGateway: Added optional parameter -VpnClientIPsecParameter [Pass the value from output of newly added command:- New-AzureRmVpnClientIpsecPolicy]
+* Added new commands for feature: Point to Site IPsec custom policy set/remove on Brooklyn Gateway.
+    - New-AzureRmVpnClientIpsecPolicy : Added for passing output from this command to existing commands: New-AzureRmVirtualNetworkGateway & Set-AzureRmVirtualNetworkGateway to set Vpn IPSec policy
+    - New-AzureRmVpnClientIpsecParameter
+	- Set-AzureRmVpnClientIpsecParameter
+	- Get-AzureRmVpnClientIpsecParameter
+	- Remove-AzureRmVpnClientIpsecParameter
+* Added a warning note for existing command: Set-AzureRmVirtualNetworkGatewayVpnClientConfig to let users know of its plan of removal in next release.
 * Added cmdlet to create protocol configuration
     - New-AzureRmNetworkWatcherProtocolConfiguration
 * Added cmdlet to add a new circuit connection to an existing express route circuit.

src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

@@ -558,6 +558,9 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayConnectionwithIpsecPoliciesCRUD.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkGatewayP2SAndSKU.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>	
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayVpnDeviceConfigurationScripts.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -618,6 +621,9 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayRouteApiTest.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayVpnCustomIpsecPolicySetTest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>	
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestResourceNavigationLinksOnSubnetCRUD.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.cs

@@ -26,15 +26,15 @@ public VirtualNetworkGatewayConnectionTests(ITestOutputHelper output)
             XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
-        [Fact(Skip = "Rerecord tests")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestVirtualNetworkGatewayConnectionCRUD()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionCRUD");
         }
 
-        [Fact(Skip = "Rerecord tests")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestVirtualNetworkGatewayConnectionSharedKeyCRUD()
@@ -50,7 +50,7 @@ public void TestVirtualNetworkeExpressRouteGatewayConnectionCRUD()
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkeExpressRouteGatewayConnectionCRUD");
         }
 
-        [Fact(Skip = "Rerecord tests")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestVirtualNetworkGatewayConnectionWithBgpCRUD()

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs

@@ -27,7 +27,7 @@ public VirtualNetworkGatewayTests(ITestOutputHelper output)
             XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
         }
 
-        [Fact(Skip = "NRP code to be there to test this scenario, skipping it until NRP is ready")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestVirtualNetworkExpressRouteGatewayCRUD()
@@ -43,7 +43,7 @@ public void TestVirtualNetworkGatewayCRUD()
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayCRUD");
         }
 
-        [Fact(Skip = "Need to record afterwards, failing due to product issue.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestVirtualNetworkGatewayP2SAndSKU()
@@ -65,15 +65,14 @@ public void VirtualNetworkGatewayActiveActiveFeatureTest()
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayActiveActiveFeatureOperations");
         }
 
-        [Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
-        [Trait("Re-record", "ClientRuntime changes")]
+        [Fact]
         [Trait(Category.Owner, Category.brooklynft)]
         public void VirtualNetworkGatewayRouteApiTest()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayBgpRouteApi");
         }
 
-        [Fact(Skip ="Recorded with an older version of network, rerecord #4631")]
+        [Fact]
         [Trait(Category.Owner, Category.brooklynft)]
         public void TestVirtualNetworkGatewayP2SVpnProfile()
         {
@@ -88,5 +87,12 @@ public void VirtualNetworkGatewayIkeV2Test()
         {
             NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayIkeV2");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void VirtualNetworkGatewayVpnCustomIpsecPolicySetTest()
+        {
+            NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayVpnCustomIpsecPolicySet");
+        }
     }
 }