Add IPv6 support to VirtualHub and enableOnlyIpv6Peering to HubVnetConnection

src/Network/Network.Management.Sdk/Generated/Models/HubVirtualNetworkConnection.cs

@@ -138,5 +138,11 @@ public HubVirtualNetworkConnection()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "properties.enableInternetSecurity")]
         public bool? EnableInternetSecurity {get; set; }
+
+        /// <summary>
+        /// Gets or sets enable only IPv6 peering for this connection.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "properties.enableOnlyIpv6Peering")]
+        public string EnableOnlyIpv6Peering {get; set; }
     }
 }

src/Network/Network.Management.Sdk/Generated/Models/VirtualHub.cs

@@ -218,6 +218,12 @@ public VirtualHub()
         [Newtonsoft.Json.JsonProperty(PropertyName = "properties.addressPrefix")]
         public string AddressPrefix {get; set; }
 
+        /// <summary>
+        /// Gets or sets IPv6 address-prefix for this VirtualHub.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "properties.addressPrefixV6")]
+        public string AddressPrefixV6 {get; set; }
+
         /// <summary>
         /// Gets or sets the routeTable associated with this virtual hub.
         /// </summary>
@@ -273,6 +279,12 @@ public VirtualHub()
         [Newtonsoft.Json.JsonProperty(PropertyName = "properties.virtualRouterIps")]
         public System.Collections.Generic.IList<string> VirtualRouterIps {get; set; }
 
+        /// <summary>
+        /// Gets or sets virtualRouter IPv6 IPs.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "properties.virtualRouterIpsV6")]
+        public System.Collections.Generic.IList<string> VirtualRouterIpsV6 {get; set; }
+
         /// <summary>
         /// Gets or sets flag to control transit for VirtualRouter hub.
         /// </summary>

src/Network/Network.Test/ScenarioTests/CortexTests.cs

@@ -51,6 +51,22 @@ public void TestConnectionPolicyCRUD()
             TestRunner.RunTestScript("Test-ConnectionPolicyCRUD");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
+        public void TestVirtualHubIPv6CRUD()
+        {
+            TestRunner.RunTestScript("Test-VirtualHubIPv6CRUD");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.virtualwan)]
+        public void TestVirtualHubEnableOnlyIpv6PeeringCRUD()
+        {
+            TestRunner.RunTestScript("Test-VirtualHubEnableOnlyIpv6PeeringCRUD");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, NrpTeamAlias.virtualwan)]

src/Network/Network.Test/ScenarioTests/CortexTests.ps1

@@ -2126,3 +2126,82 @@ function Test-ConnectionPolicyCRUD
         Clean-ResourceGroup $rgName
     }
 }
+
+function Test-VirtualHubIPv6CRUD
+{
+    # Setup
+    $rgName = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement "centraluseuap"
+    $virtualWanName = Get-ResourceName
+    $virtualHubName = Get-ResourceName
+
+    try
+    {
+        # Create the resource group
+        $resourceGroup = New-AzResourceGroup -Name $rgName -Location $rglocation
+
+        # Create the Virtual Wan
+        $createdVirtualWan = New-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Location $rglocation -AllowVnetToVnetTraffic -AllowBranchToBranchTraffic
+        $virtualWan = Get-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName
+        Assert-AreEqual $rgName $virtualWan.ResourceGroupName
+        Assert-AreEqual $virtualWanName $virtualWan.Name
+
+        # Create the Virtual Hub without IPv6 address prefix
+        $createdVirtualHub = New-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Location $rglocation -AddressPrefix "192.168.1.0/24" -VirtualWan $virtualWan
+
+		# Update the Virtual Hub to add an IPv6 address prefix
+        $updatedVirtualHub = Update-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -AddressPrefixV6 "2001:db8::/56"
+
+        $virtualHub = Get-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
+        Assert-AreEqual $rgName $virtualHub.ResourceGroupName
+        Assert-AreEqual $virtualHubName $virtualHub.Name
+        Assert-AreEqual "192.168.1.0/24" $virtualHub.AddressPrefix
+        Assert-AreEqual "2001:db8::/56" $virtualHub.AddressPrefixV6
+    }
+    finally
+    {
+        Clean-ResourceGroup $rgName
+    }
+}
+
+function Test-VirtualHubEnableOnlyIpv6PeeringCRUD
+{
+    # Setup
+    $rgName = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement "centraluseuap"
+    $virtualWanName = Get-ResourceName
+    $virtualHubName = Get-ResourceName
+    $remoteVirtualNetworkName = Get-ResourceName
+    $hubVnetConnectionName = Get-ResourceName
+
+    try
+    {
+        # Create the resource group
+        $resourceGroup = New-AzResourceGroup -Name $rgName -Location $rglocation
+
+        # Create the Virtual Wan
+        $createdVirtualWan = New-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName -Location $rglocation -AllowVnetToVnetTraffic -AllowBranchToBranchTraffic
+        $virtualWan = Get-AzVirtualWan -ResourceGroupName $rgName -Name $virtualWanName
+        Assert-AreEqual $rgName $virtualWan.ResourceGroupName
+        Assert-AreEqual $virtualWanName $virtualWan.Name
+
+        # Create the Virtual Hub with IPv6 address prefix
+        $createdVirtualHub = New-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName -Location $rglocation -AddressPrefix "192.168.1.0/24" -AddressPrefixV6 "2001:db8::/56" -VirtualWan $virtualWan
+        $virtualHub = Get-AzVirtualHub -ResourceGroupName $rgName -Name $virtualHubName
+        Assert-AreEqual $rgName $virtualHub.ResourceGroupName
+        Assert-AreEqual $virtualHubName $virtualHub.Name
+
+        # Create a remote VNet
+        $remoteVirtualNetwork = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $remoteVirtualNetworkName -Location $rglocation -AddressPrefix "10.0.1.0/24"
+
+        # Create a Hub Virtual Network Connection with EnableOnlyIpv6Peering
+        New-AzVirtualHubVnetConnection -ResourceGroupName $rgName -ParentResourceName $virtualHubName -Name $hubVnetConnectionName -RemoteVirtualNetwork $remoteVirtualNetwork -EnableOnlyIpv6Peering "Enabled"
+        $hubVnetConnection = Get-AzVirtualHubVnetConnection -ResourceGroupName $rgName -ParentHubName $virtualHubName -Name $hubVnetConnectionName
+        Assert-AreEqual $hubVnetConnectionName $hubVnetConnection.Name
+        Assert-AreEqual "Enabled" $hubVnetConnection.EnableOnlyIpv6Peering
+    }
+    finally
+    {
+        Clean-ResourceGroup $rgName
+    }
+}

src/Network/Network/ChangeLog.md

@@ -19,6 +19,10 @@
 --->
 
 ## Upcoming Release
+* Added IPv6 support to Virtual Hub and Hub Virtual Network Connection cmdlets
+    - `New-AzVirtualHub`: Added `-AddressPrefixV6` parameter to specify the IPv6 address prefix for the VirtualHub.
+    - `Update-AzVirtualHub`: Added `-AddressPrefixV6` parameter to update the IPv6 address prefix for the VirtualHub.
+    - `New-AzVirtualHubVnetConnection`: Added `-EnableOnlyIpv6Peering` parameter to enable only IPv6 peering for the connection.
 * Added new cmdlets for ConnectionPolicy management under VirtualHub
     - `Get-AzConnectionPolicy`: Retrieve one or all ConnectionPolicy resources under a VirtualHub
     - `New-AzConnectionPolicy`: Create a new ConnectionPolicy under a VirtualHub

src/Network/Network/Cortex/HubVnetConnection/NewAzureRmHubVirtualNetworkConnectionCommand.cs

@@ -135,6 +135,13 @@ public class NewHubVirtualNetworkConnectionCommand : HubVnetConnectionBaseCmdlet
             HelpMessage = "Enable internet security for this connection")]
         public bool? EnableInternetSecurityFlag { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "Enable only IPv6 peering for this connection.")]
+        [ValidateSet("Enabled", "Disabled", IgnoreCase = true)]
+        [PSArgumentCompleter("Enabled", "Disabled")]
+        public string EnableOnlyIpv6Peering { get; set; }
+
         [Parameter(
            Mandatory = false,
            HelpMessage = "The routing configuration for this HubVirtualnNetwork connection")]
@@ -191,6 +198,11 @@ public override void Execute()
                 hubVnetConnection.RoutingConfiguration = NetworkResourceManagerProfile.Mapper.Map<MNM.RoutingConfiguration>(RoutingConfiguration);
             }
 
+            if (!string.IsNullOrWhiteSpace(this.EnableOnlyIpv6Peering))
+            {
+                hubVnetConnection.EnableOnlyIpv6Peering = this.EnableOnlyIpv6Peering;
+            }
+
             List<string> resourceIds = new List<string>();
             resourceIds.Add(hubVnetConnection.RemoteVirtualNetwork.Id);
             var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);

src/Network/Network/Cortex/VirtualHub/NewAzureRmVirtualHubCommand.cs

@@ -126,6 +126,11 @@ public class NewAzureRmVirtualHubCommand : VirtualHubBaseCmdlet
         HelpMessage = "Autoscale configuration for the hub router")]
         public PSVirtualRouterAutoScaleConfiguration VirtualRouterAutoScaleConfiguration { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "The IPv6 address space string for this virtual hub.")]
+        public string AddressPrefixV6 { get; set; }
+
         [Parameter(
             Mandatory = false,
             HelpMessage = "Run cmdlet in the background")]
@@ -176,6 +181,7 @@ public override void Execute()
                         Name = this.Name,
                         VirtualWan = new PSResourceId() { Id = resolvedVirtualWan.Id },
                         AddressPrefix = this.AddressPrefix,
+                        AddressPrefixV6 = this.AddressPrefixV6,
                         Location = this.Location,
                         VirtualRouterAsn = this.VirtualRouterAsn,
                         VirtualRouterAutoScaleConfiguration = this.VirtualRouterAutoScaleConfiguration

src/Network/Network/Cortex/VirtualHub/UpdateAzureRmVirtualHubCommand.cs

@@ -131,6 +131,11 @@ public class UpdateAzureRmVirtualHubCommand : VirtualHubBaseCmdlet
             HelpMessage = "Autoscale configuration for the hub router")]
         public PSVirtualRouterAutoScaleConfiguration VirtualRouterAutoScaleConfiguration { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "The IPv6 address space string for this virtual hub.")]
+        public string AddressPrefixV6 { get; set; }
+
         [Parameter(
             Mandatory = false,
             HelpMessage = "Run cmdlet in the background")]
@@ -171,6 +176,12 @@ public override void Execute()
                 virtualHubToUpdate.AddressPrefix = this.AddressPrefix;
             }
 
+            //// Update IPv6 address prefix, if specified
+            if (!string.IsNullOrWhiteSpace(this.AddressPrefixV6))
+            {
+                virtualHubToUpdate.AddressPrefixV6 = this.AddressPrefixV6;
+            }
+
             //// HubVirtualNetworkConnections
             List<PSHubVirtualNetworkConnection> hubVnetConnectionList = null;
             if (this.HubVnetConnection != null)

src/Network/Network/Models/Cortex/PSHubVirtualNetworkConnection.cs

@@ -28,6 +28,9 @@ public class PSHubVirtualNetworkConnection : PSChildResource
         [Ps1Xml(Label = "Internet Security Enabled", Target = ViewControl.Table)]
         public bool EnableInternetSecurity { get; set; }
 
+        [Ps1Xml(Label = "Enable Only IPv6 Peering", Target = ViewControl.Table)]
+        public string EnableOnlyIpv6Peering { get; set; }
+
         public PSRoutingConfiguration RoutingConfiguration { get; set; }
 
         [JsonIgnore]

src/Network/Network/Models/Cortex/PSVirtualHub.cs

@@ -50,13 +50,18 @@ public class PSVirtualHub : PSTopLevelResource
 
         public List<string> VirtualRouterIps { get; set; }
 
+        public List<string> VirtualRouterIpsV6 { get; set; }
+
         public PSVirtualRouterAutoScaleConfiguration VirtualRouterAutoScaleConfiguration { get; set; }
 
         public SwitchParameter AllowBranchToBranchTraffic { get; set; }
 
         [Ps1Xml(Label = "Address Prefix", Target = ViewControl.Table)]
         public string AddressPrefix { get; set; }
 
+        [Ps1Xml(Label = "Address Prefix V6", Target = ViewControl.Table)]
+        public string AddressPrefixV6 { get; set; }
+
         [Ps1Xml(Label = "Provisioning State", Target = ViewControl.Table)]
         public string ProvisioningState { get; set; }
 

src/Network/Network/help/New-AzVirtualHub.md

@@ -15,7 +15,7 @@ Creates an Azure VirtualHub resource.
 ### ByVirtualWanObject (Default)
 ```
 New-AzVirtualHub -ResourceGroupName <String> -Name <String> -VirtualWan <PSVirtualWan> -AddressPrefix <String>
- -Location <String> [-HubVnetConnection <PSHubVirtualNetworkConnection[]>]
+ [-AddressPrefixV6 <String>] -Location <String> [-HubVnetConnection <PSHubVirtualNetworkConnection[]>]
  [-RouteTable <PSVirtualHubRouteTable>] [-Tag <Hashtable>] [-Sku <String>] [-PreferredRoutingGateway <String>]
  [-HubRoutingPreference <String>] [-VirtualRouterAsn <UInt32>]
  [-VirtualRouterAutoScaleConfiguration <PSVirtualRouterAutoScaleConfiguration>] [-AsJob]
@@ -26,7 +26,7 @@ New-AzVirtualHub -ResourceGroupName <String> -Name <String> -VirtualWan <PSVirtu
 ### ByVirtualWanResourceId
 ```
 New-AzVirtualHub -ResourceGroupName <String> -Name <String> -VirtualWanId <String> -AddressPrefix <String>
- -Location <String> [-HubVnetConnection <PSHubVirtualNetworkConnection[]>]
+ [-AddressPrefixV6 <String>] -Location <String> [-HubVnetConnection <PSHubVirtualNetworkConnection[]>]
  [-RouteTable <PSVirtualHubRouteTable>] [-Tag <Hashtable>] [-Sku <String>] [-PreferredRoutingGateway <String>]
  [-HubRoutingPreference <String>] [-VirtualRouterAsn <UInt32>]
  [-VirtualRouterAutoScaleConfiguration <PSVirtualRouterAutoScaleConfiguration>] [-AsJob]
@@ -154,6 +154,32 @@ ProvisioningState         : Succeeded
 
 The above will create a resource group "testRG", a Virtual WAN and a Virtual Hub in West US in that resource group in Azure. The virtual hub will have preferred routing gateway as VPNGateway and minimum capacity 3.
 
+### Example 5
+
+```powershell
+New-AzResourceGroup -Location "West US" -Name "testRG"
+$virtualWan = New-AzVirtualWan -ResourceGroupName "testRG" -Name "myVirtualWAN" -Location "West US"
+New-AzVirtualHub -VirtualWan $virtualWan -ResourceGroupName "testRG" -Name "westushub" -AddressPrefix "10.0.1.0/24" -AddressPrefixV6 "2001:db8::/56" -Location "West US"
+```
+
+```output
+VirtualWan                : /subscriptions/{subscriptionId}resourceGroups/testRG/providers/Microsoft.Network/virtualWans/myVirtualWAN
+ResourceGroupName         : testRG
+Name                      : westushub
+Id                        : /subscriptions/{subscriptionId}resourceGroups/testRG/providers/Microsoft.Network/virtualHubs/westushub
+AddressPrefix             : 10.0.1.0/24
+AddressPrefixV6           : 2001:db8::/56
+RouteTable                :
+VirtualNetworkConnections : {}
+Location                  : West US
+Sku                       : Standard
+HubRoutingPreference      : ExpressRoute
+Type                      : Microsoft.Network/virtualHubs
+ProvisioningState         : Succeeded
+```
+
+The above will create a resource group "testRG", a Virtual WAN and a Virtual Hub in West US in that resource group in Azure. The virtual hub will have the IPv4 address space "10.0.1.0/24" and IPv6 address space "2001:db8::/56".
+
 ## PARAMETERS
 
 ### -AcquirePolicyToken
@@ -186,6 +212,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AddressPrefixV6
+The IPv6 address space string for this virtual hub.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -AsJob
 Run cmdlet in the background