Merge pull request Azure#9582 from ritwikbasu/master

Add ConnectionProtocol as settable parameter for New-AzVirtualNetwork…

Author: markcowl

ChangeLog.md

@@ -35,6 +35,7 @@
 #### Az.Network
 * Added 'RoutingPreference' to public ip tags
 * Improve examples for 'Get-AzNetworkServiceTag' reference documentation
+* Add ConnectionProtocolType (Ikev1/Ikev2) as a configurable parameter for New-AzVirtualNetworkGatewayConnection
 
 #### Az.PolicyInsights
 * Fix null reference issue in Get-AzPolicyState

src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.ps1

@@ -364,12 +364,13 @@ function Test-VirtualNetworkGatewayConnectionCRUD
       $localnetGateway.Location = $location
 
       # Create & Get VirtualNetworkGatewayConnection
-      $actual = New-AzVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName -location $location -VirtualNetworkGateway1 $vnetGateway -LocalNetworkGateway2 $localnetGateway -ConnectionType IPsec -RoutingWeight 3 -SharedKey abc
+      $actual = New-AzVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName -location $location -VirtualNetworkGateway1 $vnetGateway -LocalNetworkGateway2 $localnetGateway -ConnectionType IPsec -RoutingWeight 3 -SharedKey abc -ConnectionProtocol IKEv1
       $expected = Get-AzVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName
       Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName	
       Assert-AreEqual $expected.Name $actual.Name	
       Assert-AreEqual "IPsec" $expected.ConnectionType
       Assert-AreEqual "3" $expected.RoutingWeight
+	  Assert-AreEqual "IKEv1" $expected.ConnectionProtocol
       #Assert-AreEqual "abc" $expected.SharedKey
 
       # List VirtualNetworkGatewayConnections

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests/TestVirtualNetworkGatewayConnectionCRUD.json

@@ -61,6 +61,9 @@ public class PSVirtualNetworkGatewayConnection : PSTopLevelResource
 
         public bool ExpressRouteGatewayBypass { get; set; }
 
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string ConnectionProtocol { get; set; }
+
         [JsonIgnore]
         public string VirtualNetworkGateway1Text
         {

src/Network/Network/Models/PSVirtualNetworkGatewayConnection.cs

@@ -144,6 +144,15 @@ public class NewAzureVirtualNetworkGatewayConnectionCommand : VirtualNetworkGate
              HelpMessage = "A list of IPSec policies.")]
         public PSIpsecPolicy[] IpsecPolicies { get; set; }
 
+        [Parameter(
+        Mandatory = false,
+        HelpMessage = "Gateway connection protocol:IKEv1/IKEv2")]
+        [ValidateSet(
+            MNM.VirtualNetworkGatewayConnectionProtocol.IKEv1,
+            MNM.VirtualNetworkGatewayConnectionProtocol.IKEv2,
+            IgnoreCase = true)]
+        public string ConnectionProtocol { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
         public SwitchParameter AsJob { get; set; }
 
@@ -186,6 +195,11 @@ private PSVirtualNetworkGatewayConnection CreateVirtualNetworkGatewayConnection(
             vnetGatewayConnection.UsePolicyBasedTrafficSelectors = this.UsePolicyBasedTrafficSelectors;
             vnetGatewayConnection.ExpressRouteGatewayBypass = this.ExpressRouteGatewayBypass.IsPresent;
 
+            if (!string.IsNullOrWhiteSpace(this.ConnectionProtocol))
+            {
+                vnetGatewayConnection.ConnectionProtocol = this.ConnectionProtocol;
+            }
+            
             if (!string.IsNullOrEmpty(this.AuthorizationKey))
             {
                 vnetGatewayConnection.AuthorizationKey = this.AuthorizationKey;

src/Network/Network/VirtualNetworkGatewayConnection/NewAzureVirtualNetworkGatewayConnectionCommand.cs

@@ -20,7 +20,7 @@ New-AzVirtualNetworkGatewayConnection -Name <String> -ResourceGroupName <String>
  [-VirtualNetworkGateway2 <PSVirtualNetworkGateway>] [-LocalNetworkGateway2 <PSLocalNetworkGateway>]
  -ConnectionType <String> [-RoutingWeight <Int32>] [-SharedKey <String>] [-Peer <PSPeering>]
  [-EnableBgp <Boolean>] [-Tag <Hashtable>] [-Force] [-UsePolicyBasedTrafficSelectors <Boolean>]
- [-IpsecPolicies <PSIpsecPolicy[]>] [-AsJob] [-ExpressRouteGatewayBypass]
+ [-IpsecPolicies <PSIpsecPolicy[]>] [-ConnectionProtocol <String>] [-AsJob] [-ExpressRouteGatewayBypass]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -31,7 +31,7 @@ New-AzVirtualNetworkGatewayConnection -Name <String> -ResourceGroupName <String>
  [-VirtualNetworkGateway2 <PSVirtualNetworkGateway>] [-LocalNetworkGateway2 <PSLocalNetworkGateway>]
  -ConnectionType <String> [-RoutingWeight <Int32>] [-SharedKey <String>] [-PeerId <String>]
  [-EnableBgp <Boolean>] [-Tag <Hashtable>] [-Force] [-UsePolicyBasedTrafficSelectors <Boolean>]
- [-IpsecPolicies <PSIpsecPolicy[]>] [-AsJob] [-ExpressRouteGatewayBypass]
+ [-IpsecPolicies <PSIpsecPolicy[]>] [-ConnectionProtocol <String>] [-AsJob] [-ExpressRouteGatewayBypass]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -76,6 +76,22 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -ConnectionProtocol
+Gateway connection protocol:IKEv1/IKEv2
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+Accepted values: IKEv1, IKEv2
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ConnectionType
 
 ```yaml