Ipv6

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

@@ -645,4 +645,4 @@
     </ItemGroup>
     <Copy SourceFiles="@(MarkdownFiles)" DestinationFolder="$(OutputPath)\help\" ContinueOnError="false" />
   </Target>
-</Project>
+</Project>

src/ResourceManager/Network/Commands.Network/Common/NetworkResourceManagerProfile.cs

@@ -448,4 +448,4 @@ public static void Initialize()
             });
         }
     }
-}
+}

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AddAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -62,7 +62,7 @@ public override void Execute()
             peering.SecondaryPeerAddressPrefix = this.SecondaryPeerAddressPrefix;
             peering.PeerASN = this.PeerASN;
             peering.VlanId = this.VlanId;
-            
+
 
             if (!string.IsNullOrEmpty(this.SharedKey))
             {

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/BgpPeerings/GetAzureBGPPeering.cs

@@ -27,7 +27,8 @@ public class GetAzureBGPPeeringCommand : ExpressRouteBaseCmdlet
             HelpMessage = "Service Key representing the Azure Circuit")]
         public Guid ServiceKey { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Public or Private")]
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Microsoft, Public or Private")]
+        [ValidateSet("Microsoft", "Public", "Private")]
         [DefaultValue("Private")]
         public BgpPeeringAccessType AccessType { get; set; }
 

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/BgpPeerings/NewAzureBGPPeering.cs

@@ -58,13 +58,21 @@ public class NewAzureBGPPeeringCommand : ExpressRouteBaseCmdlet
         public UInt32 VlanId { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Microsoft, Public or Private")]
+        [ValidateSet("Microsoft", "Public", "Private")]
         [DefaultValue("Private")]
         public BgpPeeringAccessType AccessType { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Bgp Peer Address Type: IPv4, IPv6")]
+        [ValidateSet("IPv4", "IPv6")]
+        [DefaultValue("IPv4")]
+        public PeerAddressTypeValues PeerAddressType { get; set; }
+
         public override void ExecuteCmdlet()
         {
-            var route = ExpressRouteClient.NewAzureBGPPeering(ServiceKey, AdvertisedPublicPrefixes, CustomerAsn, PeerAsn,
-                PrimaryPeerSubnet, RoutingRegistryName, SecondaryPeerSubnet, VlanId, AccessType, SharedKey, Convert.ToUInt32(LegacyMode));
+            AzureBgpPeering route = null;
+            route = ExpressRouteClient.NewAzureBGPPeering(ServiceKey, PeerAddressType, AdvertisedPublicPrefixes, CustomerAsn, PeerAsn, PrimaryPeerSubnet, RoutingRegistryName, SecondaryPeerSubnet,
+                                                          VlanId, AccessType, SharedKey, Convert.ToUInt32(LegacyMode));
+
             WriteObject(route);
         }
     }
@@ -74,4 +82,10 @@ public enum LegacyMode
         False = 0,
         True = 1
     }
+
+    public enum PeerAddressTypeValues
+    {
+        IPv4 = 0,
+        IPv6 = 1
+    }
 }

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/BgpPeerings/RemoveAzureBGPPeering.cs

@@ -20,17 +20,23 @@
 
 namespace Microsoft.WindowsAzure.Commands.ExpressRoute
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureBGPPeering"),OutputType(typeof(bool))]
+    [Cmdlet(VerbsCommon.Remove, "AzureBGPPeering", SupportsShouldProcess = true), OutputType(typeof(bool))]
     public class RemoveAzureBGPPeeringCommand : ExpressRouteBaseCmdlet
     {
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Service Key associated with the Azure BGP Peering to be removed")]
         public Guid ServiceKey { get; set; }
 
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Public or Private")]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Microsoft, Public or Private")]
+        [ValidateSet("Microsoft", "Public", "Private")]
         [DefaultValue("Private")]
         public BgpPeeringAccessType AccessType { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peer Address Type: IPv4, IPv6, All")]
+        [ValidateSet("IPv4", "IPv6", "All")]
+        [DefaultValue("IPv4")]
+        public BgpPeerAddressType PeerAddressType { get; set; }
+
         [Parameter(HelpMessage = "Do not confirm Azure BGP Peering deletion")]
         public SwitchParameter Force { get; set; }
 
@@ -46,18 +52,35 @@ public override void ExecuteCmdlet()
                 ServiceKey.ToString(),
                 () =>
                 {
-
-                    if(!ExpressRouteClient.RemoveAzureBGPPeering(ServiceKey, AccessType))
+                    if (PeerAddressType == BgpPeerAddressType.All || AccessType != BgpPeeringAccessType.Microsoft)
                     {
-                        throw new Exception(Resources.RemoveAzureBGPPeeringFailed);
+                        if (!ExpressRouteClient.RemoveAzureBGPPeering(ServiceKey, AccessType, BgpPeerAddressType.All))
+                        {
+                            throw new Exception(Resources.RemoveAzureBGPPeeringFailed);
+                        }
+                        else
+                        {
+                            WriteVerboseWithTimestamp(Resources.RemoveAzureBGPPeeringSucceeded, ServiceKey);
+                            if (PassThru.IsPresent)
+                            {
+                                WriteObject(true);
+                            }
+                        }
                     }
                     else
                     {
-                        WriteVerboseWithTimestamp(Resources.RemoveAzureBGPPeeringSucceeded, ServiceKey);
-                        if (PassThru.IsPresent)
-                        {
-                            WriteObject(true);
-                        }
+                            if (!ExpressRouteClient.RemoveAzureBGPPeering(ServiceKey, AccessType, (BgpPeerAddressType)PeerAddressType))
+                            {
+                                throw new Exception(Resources.RemoveAzureBGPPeeringFailed);
+                            }
+                            else
+                            {
+                                WriteVerboseWithTimestamp(Resources.RemoveAzureBGPPeeringFailed, ServiceKey);
+                                if (PassThru.IsPresent)
+                                {
+                                    WriteObject(true);
+                                }
+                            }
                     }
                 });
         }

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/BgpPeerings/SetAzureBGPPeering.cs

@@ -32,7 +32,7 @@ public class SetAzureBGPPeeringCommand : ExpressRouteBaseCmdlet
         public string AdvertisedPublicPrefixes;
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Customer AS number")]
-        public UInt32 CustomerAsn { get; set; }
+        public UInt32? CustomerAsn { get; set; }
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Peer Asn")]
@@ -57,18 +57,30 @@ public class SetAzureBGPPeeringCommand : ExpressRouteBaseCmdlet
         public UInt32? VlanId { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Microsoft, Public or Private")]
+        [ValidateSet("Microsoft", "Public", "Private")]
         [DefaultValue("Private")]
         public BgpPeeringAccessType AccessType { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Bgp Peer Address Type: IPv4, IPv6")]
+        [ValidateSet("IPv4", "IPv6")]
+        [DefaultValue("IPv4")]
+        public PeerAddressTypeValues PeerAddressType { get; set; }
+
         public override void ExecuteCmdlet()
         {
             try
             {
                 var route = ExpressRouteClient.GetAzureBGPPeering(ServiceKey, AccessType);
-                var updatedRoute = ExpressRouteClient.UpdateAzureBGPPeering(ServiceKey, AccessType, CustomerAsn,
-                    PeerAsn.HasValue ? PeerAsn.Value : route.PeerAsn, PrimaryPeerSubnet ?? route.PrimaryPeerSubnet, RoutingRegistryName,
-                    SecondaryPeerSubnet ?? route.SecondaryPeerSubnet, VlanId.HasValue ? VlanId.Value : route.VlanId,
-                    SharedKey.Trim());
+
+                var advertisedPublicPrefixes = AdvertisedPublicPrefixes ?? ((PeerAddressType == PeerAddressTypeValues.IPv4) ? route.AdvertisedPublicPrefixes : route.AdvertisedPublicPrefixesIpv6);
+                var routingRegistryName = RoutingRegistryName ?? ((PeerAddressType == PeerAddressTypeValues.IPv4) ? route.RoutingRegistryName : route.RoutingRegistryNameIpv6);
+                var customerAsn = (CustomerAsn.HasValue) ? CustomerAsn.Value : ((PeerAddressType == PeerAddressTypeValues.IPv4) ? route.CustomerAutonomousSystemNumber : route.CustomerAutonomousSystemNumberIpv6);
+
+                var updatedRoute = ExpressRouteClient.UpdateAzureBGPPeering(ServiceKey, PeerAddressType, AccessType,
+                    advertisedPublicPrefixes, customerAsn, PeerAsn.HasValue ? PeerAsn.Value : route.PeerAsn, PrimaryPeerSubnet,
+                    routingRegistryName, SecondaryPeerSubnet, VlanId.HasValue ? VlanId.Value : route.VlanId,
+                    string.IsNullOrWhiteSpace(SharedKey) ? null : SharedKey.Trim());
+
                 WriteObject(updatedRoute, false);
             }
             catch
@@ -93,9 +105,8 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException(Resources.SecondaryPeerSubnetRequired);
                 }
 
-                var newRoute = ExpressRouteClient.NewAzureBGPPeering(ServiceKey, AdvertisedPublicPrefixes, CustomerAsn,
-                    PeerAsn.Value, PrimaryPeerSubnet, RoutingRegistryName, SecondaryPeerSubnet, VlanId.Value, AccessType,
-                    SharedKey);
+                var newRoute = ExpressRouteClient.NewAzureBGPPeering(ServiceKey, PeerAddressType, AdvertisedPublicPrefixes, CustomerAsn.Value, PeerAsn.Value, PrimaryPeerSubnet, RoutingRegistryName, SecondaryPeerSubnet,
+                    VlanId.Value, AccessType, SharedKey);
                 WriteObject(newRoute);
             }
         }

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj

@@ -88,7 +88,7 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute">
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.21.0-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.23.0-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -194,4 +194,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-</Project>
+</Project>

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs

@@ -79,21 +79,41 @@ public AzureBgpPeering GetAzureBGPPeering(Guid serviceKey, BgpPeeringAccessType
             return Client.BorderGatewayProtocolPeerings.Get(serviceKey.ToString(), accessType).BgpPeering;
         }
 
-        public AzureBgpPeering NewAzureBGPPeering(Guid serviceKey, string advertisedPublicPrefixes, UInt32 customerAsn, UInt32 peerAsn,string primaryPeerSubnet,
-            string routingRegistryName, string secondaryPeerSubnet, UInt32 vlanId, BgpPeeringAccessType accessType, string sharedKey = null, UInt32 legacyMode = 0)
-        {
-            var result = Client.BorderGatewayProtocolPeerings.New(serviceKey.ToString(), accessType, new BorderGatewayProtocolPeeringNewParameters()
-           {
-               AdvertisedPublicPrefixes = advertisedPublicPrefixes,
-               CustomerAutonomousSystemNumber = customerAsn,
-               LegacyMode = legacyMode,
-               PeerAutonomousSystemNumber = peerAsn,
-               PrimaryPeerSubnet = primaryPeerSubnet,
-               RoutingRegistryName = routingRegistryName,
-               SecondaryPeerSubnet = secondaryPeerSubnet,
-               SharedKey = sharedKey,
-               VirtualLanId = vlanId,
-           });
+        public AzureBgpPeering NewAzureBGPPeering(Guid serviceKey, PeerAddressTypeValues peerAddressType, string advertisedPublicPrefixes, UInt32 customerAsn, UInt32 peerAsn, string primaryPeerSubnet, string routingRegistryName, string secondaryPeerSubnet,
+            UInt32 vlanId, BgpPeeringAccessType accessType, string sharedKey = null, UInt32 legacyMode = 0)
+        {
+            ExpressRouteOperationStatusResponse result = null;
+
+            if (peerAddressType == PeerAddressTypeValues.IPv4)
+            {
+                result = Client.BorderGatewayProtocolPeerings.New(serviceKey.ToString(), accessType, new BorderGatewayProtocolPeeringNewParameters()
+                {
+                    AdvertisedPublicPrefixes = advertisedPublicPrefixes,
+                    LegacyMode = legacyMode,
+                    CustomerAutonomousSystemNumber = customerAsn,
+                    PeerAutonomousSystemNumber = peerAsn,
+                    PrimaryPeerSubnet = primaryPeerSubnet,
+                    RoutingRegistryName = routingRegistryName,
+                    SecondaryPeerSubnet = secondaryPeerSubnet,
+                    SharedKey = sharedKey,
+                    VirtualLanId = vlanId,
+                });
+            }
+            else
+            {
+                result = Client.BorderGatewayProtocolPeerings.New(serviceKey.ToString(), accessType, new BorderGatewayProtocolPeeringNewParameters()
+                {
+                    AdvertisedPublicPrefixesIpv6 = advertisedPublicPrefixes,
+                    LegacyMode = legacyMode,
+                    CustomerAutonomousSystemNumberIpv6 = customerAsn,
+                    PeerAutonomousSystemNumber = peerAsn,
+                    PrimaryPeerSubnetIpv6 = primaryPeerSubnet,
+                    RoutingRegistryNameIpv6 = routingRegistryName,
+                    SecondaryPeerSubnetIpv6 = secondaryPeerSubnet,
+                    SharedKey = sharedKey,
+                    VirtualLanId = vlanId,
+                });
+            }
 
             if (result.HttpStatusCode.Equals(HttpStatusCode.OK))
             {
@@ -105,18 +125,22 @@ public AzureBgpPeering NewAzureBGPPeering(Guid serviceKey, string advertisedPubl
             }
         }
 
-        public bool RemoveAzureBGPPeering(Guid serviceKey, BgpPeeringAccessType accessType)
+        public bool RemoveAzureBGPPeering(Guid serviceKey, BgpPeeringAccessType accessType, BgpPeerAddressType peerAddressType)
         {
-            var result = Client.BorderGatewayProtocolPeerings.Remove(serviceKey.ToString(), accessType);
+            var result = Client.BorderGatewayProtocolPeerings.Remove(serviceKey.ToString(), accessType, peerAddressType);
             return result.HttpStatusCode.Equals(HttpStatusCode.OK);
         }
 
-        public AzureBgpPeering UpdateAzureBGPPeering(Guid serviceKey,
-            BgpPeeringAccessType accessType, UInt32 customerAsn, UInt32 peerAsn, string primaryPeerSubnet,
-            string routingRegistryName, string secondaryPeerSubnet, UInt32 vlanId, string sharedKey)
+        public AzureBgpPeering UpdateAzureBGPPeering(Guid serviceKey, PeerAddressTypeValues peerAddressType, BgpPeeringAccessType accessType,
+            string advertisedPublicPrefixes, UInt32 customerAsn, UInt32 peerAsn, string primaryPeerSubnet, string routingRegistryName, string secondaryPeerSubnet, UInt32 vlanId, string sharedKey)
         {
-            var result = Client.BorderGatewayProtocolPeerings.Update(serviceKey.ToString(), accessType, new BorderGatewayProtocolPeeringUpdateParameters()
+            ExpressRouteOperationStatusResponse result = null;
+
+            if (peerAddressType == PeerAddressTypeValues.IPv4)
+            {
+                result = Client.BorderGatewayProtocolPeerings.Update(serviceKey.ToString(), accessType, new BorderGatewayProtocolPeeringUpdateParameters()
                 {
+                    AdvertisedPublicPrefixes = advertisedPublicPrefixes,
                     CustomerAutonomousSystemNumber = customerAsn,
                     PeerAutonomousSystemNumber = peerAsn,
                     PrimaryPeerSubnet = primaryPeerSubnet,
@@ -125,6 +149,22 @@ public AzureBgpPeering UpdateAzureBGPPeering(Guid serviceKey,
                     SharedKey = sharedKey,
                     VirtualLanId = vlanId,
                 });
+            }
+            else
+            {
+                result = Client.BorderGatewayProtocolPeerings.Update(serviceKey.ToString(), accessType, new BorderGatewayProtocolPeeringUpdateParameters()
+                {
+                    AdvertisedPublicPrefixesIpv6 = advertisedPublicPrefixes,
+                    CustomerAutonomousSystemNumberIpv6 = customerAsn,
+                    PeerAutonomousSystemNumber = peerAsn,
+                    PrimaryPeerSubnetIpv6 = primaryPeerSubnet,
+                    RoutingRegistryNameIpv6 = routingRegistryName,
+                    SecondaryPeerSubnetIpv6 = secondaryPeerSubnet,
+                    SharedKey = sharedKey,
+                    VirtualLanId = vlanId,
+                });
+            }
+
             if (result.HttpStatusCode.Equals(HttpStatusCode.OK))
             {
                 return GetAzureBGPPeering(serviceKey, accessType);