Revert "Add VirtualHubBgpConnections and VirtualHubIpConfigurations."

litchiyangMSFT · litchiyangMSFT · commit 06149ff05ee6 · 2020-08-04T00:50:12.000-07:00
This reverts commit 21ec8ac.
diff --git a/src/Network/Network/Generated/Models/PSVirtualRouter.cs b/src/Network/Network/Generated/Models/PSVirtualRouter.cs
@@ -22,14 +22,14 @@ namespace Microsoft.Azure.Commands.Network.Models
     public partial class PSVirtualRouter : PSTopLevelResource
     {
         [Ps1Xml(Target = ViewControl.Table)]
-        public List<PSSubnet> IpConfiguration { get; set; }
+        public PSResourceId HostedGateway { get; set; }
         [Ps1Xml(Target = ViewControl.Table)]
         public uint VirtualRouterAsn { get; set; }
         [Ps1Xml(Target = ViewControl.Table)]
         public List<string> VirtualRouterIps { get; set; }
         [Ps1Xml(Target = ViewControl.Table)]
         public string ProvisioningState { get; set; }
-        public List<PSBgpConnection> Peerings { get; set; }
+        public List<PSVirtualRouterPeer> Peerings { get; set; }
 
         [JsonIgnore]
         public string PeeringsText
@@ -38,9 +38,9 @@ public string PeeringsText
         }
 
         [JsonIgnore]
-        public string HostedSubnetText
+        public string HostedGatewayText
         {
-            get { return JsonConvert.SerializeObject(IPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+            get { return JsonConvert.SerializeObject(HostedGateway, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
     }
 }
diff --git a/src/Network/Network/Generated/Models/PSVirtualRouterPeer.cs b/src/Network/Network/Generated/Models/PSVirtualRouterPeer.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
-    public partial class PSBgpConnection : PSChildResource
+    public partial class PSVirtualRouterPeer : PSChildResource
     {
         [Ps1Xml(Target = ViewControl.Table)]
         public uint PeerAsn { get; set; }
diff --git a/src/Network/Network/Models/Cortex/PSVirtualHub.cs b/src/Network/Network/Models/Cortex/PSVirtualHub.cs
@@ -38,10 +38,6 @@ public class PSVirtualHub : PSTopLevelResource
 
         public PSVirtualHubRouteTable RouteTable { get; set; }
 
-        public List<PSSubnet> IpConfigurations { get; set; }
-
-        public List<PSBgpConnection> BgpConnections { get; set; }
-
         [Ps1Xml(Label = "Address Prefix", Target = ViewControl.Table)]
         public string AddressPrefix { get; set; }
 
diff --git a/src/Network/Network/Network.format.ps1xml b/src/Network/Network/Network.format.ps1xml
@@ -5347,8 +5347,8 @@
                 <PropertyName>ProvisioningState</PropertyName>
               </ListItem>
               <ListItem>
-                <Label>HostedSubnet</Label>
-                <PropertyName>HostedSubnetText</PropertyName>
+                <Label>HostedGateway</Label>
+                <PropertyName>HostedGatewayText</PropertyName>
               </ListItem>
               <ListItem>
                 <Label>VirtualRouterAsn</Label>
@@ -5368,9 +5368,9 @@
       </ListControl>
     </View>
     <View>
-      <Name>Microsoft.Azure.Commands.Network.Models.PSBgpConnection</Name>
+      <Name>Microsoft.Azure.Commands.Network.Models.PSVirtualRouterPeer</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.Network.Models.PSBgpConnection</TypeName>
+        <TypeName>Microsoft.Azure.Commands.Network.Models.PSVirtualRouterPeer</TypeName>
       </ViewSelectedBy>
       <ListControl>
         <ListEntries>
diff --git a/src/Network/Network/VirtualRouter/GetAzureRMVirtualRouterCommand.cs b/src/Network/Network/VirtualRouter/GetAzureRMVirtualRouterCommand.cs
@@ -31,7 +31,7 @@ public partial class GetAzureRmVirtualRouter : VirtualRouterBaseCmdlet
     {
         [Parameter(
             ParameterSetName = VirtualRouterParameterSetNames.ByVirtualRouterName,
-            Mandatory = false,
+            Mandatory = true,
             HelpMessage = "The resource group name of the virtual router.",
             ValueFromPipelineByPropertyName = true)]
         [ResourceGroupCompleter]
@@ -55,7 +55,7 @@ public partial class GetAzureRmVirtualRouter : VirtualRouterBaseCmdlet
             HelpMessage = "ResourceId of the virtual router.",
             ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
-        [ResourceIdCompleter("Microsoft.Network/virtualHubs")]
+        [ResourceIdCompleter("Microsoft.Network/virtualRouters")]
         public string ResourceId { get; set; }
 
         public override void Execute()
@@ -71,42 +71,40 @@ public override void Execute()
 
             if (ShouldGetByName(ResourceGroupName, RouterName))
             {
-                var vVirtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(ResourceGroupName, RouterName);
-                var vVirtualHubModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualHub>(vVirtualHub);
-                vVirtualHubModel.ResourceGroupName = this.ResourceGroupName;
-                vVirtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(vVirtualHub.Tags);
-                AddBgpConnectionsToPSVirtualHub(vVirtualHub, vVirtualHubModel, ResourceGroupName, RouterName);
-                var vVirtualRouterModel = NetworkResourceManagerProfile.Mapper.Map<PSVirtualRouter>(vVirtualHubModel);
-
+                var vVirtualRouter = this.NetworkClient.NetworkManagementClient.VirtualRouters.Get(ResourceGroupName, RouterName);
+                var vVirtualRouterModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualRouter>(vVirtualRouter);
+                vVirtualRouterModel.ResourceGroupName = this.ResourceGroupName;
+                vVirtualRouterModel.Tag = TagsConversionHelper.CreateTagHashtable(vVirtualRouter.Tags);
+                AddPeeringsToPSVirtualRouter(vVirtualRouter, vVirtualRouterModel, ResourceGroupName, RouterName);
                 WriteObject(vVirtualRouterModel, true);
             }
             else
             {
-                IPage<VirtualHub> vVirtualHubPage;
+                IPage<VirtualRouter> vVirtualRouterPage;
                 if(ShouldListByResourceGroup(ResourceGroupName, RouterName))
                 {
-                    vVirtualHubPage = this.NetworkClient.NetworkManagementClient.VirtualHubs.ListByResourceGroup(this.ResourceGroupName);
+                    vVirtualRouterPage = this.NetworkClient.NetworkManagementClient.VirtualRouters.ListByResourceGroup(this.ResourceGroupName);
                 }
                 else
                 {
-                    vVirtualHubPage = this.NetworkClient.NetworkManagementClient.VirtualHubs.List();
+                    vVirtualRouterPage = this.NetworkClient.NetworkManagementClient.VirtualRouters.List();
                 }
 
-                var vVirtualHubList = ListNextLink<VirtualHub>.GetAllResourcesByPollingNextLink(vVirtualHubPage,
-                    this.NetworkClient.NetworkManagementClient.VirtualHubs.ListNext);
+                var vVirtualRouterList = ListNextLink<VirtualRouter>.GetAllResourcesByPollingNextLink(vVirtualRouterPage,
+                    this.NetworkClient.NetworkManagementClient.VirtualRouters.ListNext);
                 List<PSVirtualRouter> psVirtualRouterList = new List<PSVirtualRouter>();
-                foreach (var vVirtualHub in vVirtualHubList)
+                foreach (var vVirtualRouter in vVirtualRouterList)
                 {
-                    RouterName = vVirtualHub.Name;
-                    var vVirtualHubModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualHub>(vVirtualHub);
-                    vVirtualHubModel.ResourceGroupName = NetworkBaseCmdlet.GetResourceGroup(vVirtualHub.Id);
-                    vVirtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(vVirtualHub.Tags);
-                    AddBgpConnectionsToPSVirtualHub(vVirtualHub, vVirtualHubModel, ResourceGroupName, RouterName);
-                    var vVirtuaRouterModel = NetworkResourceManagerProfile.Mapper.Map<PSVirtualRouter>(vVirtualHubModel);
+                    RouterName = vVirtualRouter.Name;
+                    var vVirtualRouterModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualRouter>(vVirtualRouter);
+                    vVirtualRouterModel.ResourceGroupName = NetworkBaseCmdlet.GetResourceGroup(vVirtualRouter.Id);
+                    vVirtualRouterModel.Tag = TagsConversionHelper.CreateTagHashtable(vVirtualRouter.Tags);
+                    AddPeeringsToPSVirtualRouter(vVirtualRouter, vVirtualRouterModel, ResourceGroupName, RouterName);
+
                     psVirtualRouterList.Add(vVirtualRouterModel);
                 }
                 WriteObject(psVirtualRouterList, true);
             }
         }
     }
-}
+}
diff --git a/src/Network/Network/VirtualRouter/NewAzureRMVirtualRouterCommand.cs b/src/Network/Network/VirtualRouter/NewAzureRMVirtualRouterCommand.cs
@@ -28,7 +28,7 @@
 
 namespace Microsoft.Azure.Commands.Network
 {
-    [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VirtualRouter", SupportsShouldProcess = true, DefaultParameterSetName = VirtualRouterParameterSetNames.ByVirtualWanObject), OutputType(typeof(PSVirtualRouter))]
+    [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VirtualRouter", SupportsShouldProcess = true, DefaultParameterSetName = VirtualRouterParameterSetNames.ByHostedGateway), OutputType(typeof(PSVirtualRouter))]
     public partial class NewAzureRmVirtualRouter : VirtualRouterBaseCmdlet
     {
         [Parameter(
@@ -47,32 +47,20 @@ public partial class NewAzureRmVirtualRouter : VirtualRouterBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        [Parameter(
-            Mandatory = true,
-            ValueFromPipeline = true,
-            ParameterSetName = CortexParameterSetNames.ByVirtualWanObject,
-            HelpMessage = "The virtual wan object this hub is linked to.")]
-        public PSVirtualWan VirtualWan { get; set; }
-
         [Parameter(
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
-            ParameterSetName = CortexParameterSetNames.ByVirtualWanResourceId,
-            HelpMessage = "The id of virtual wan object this hub is linked to.")]
-        [ResourceIdCompleter("Microsoft.Network/virtualWans")]
-        public string VirtualWanId { get; set; }
+            ParameterSetName = VirtualRouterParameterSetNames.ByHostedGateway,
+            HelpMessage = "The gateway where Virtual Router needs to be hosted.")]
+        public PSVirtualNetworkGateway HostedGateway { get; set; }
 
         [Parameter(
             Mandatory = true,
-            HelpMessage = "The subnet where the virtual hub is hosted.")]
-        [ValidateNotNullOrEmpty]
-        public string HostedSubnet { get; set; }
-
-        [Parameter(
-            Mandatory = true,
-            HelpMessage = "The address space string.")]
-        [ValidateNotNullOrEmpty]
-        public string AddressPrefix { get; set; }
+            ValueFromPipelineByPropertyName = true,
+            ParameterSetName = VirtualRouterParameterSetNames.ByHostedGatewayId,
+            HelpMessage = "The id of gateway where Virtual Router needs to be hosted.")]
+        [ResourceIdCompleter("Microsoft.Network/virtualNetworkGateways")]
+        public string HostedGatewayId { get; set; }
 
         [Parameter(
             Mandatory = true,
@@ -102,7 +90,7 @@ public override void Execute()
             var present = true;
             try
             {
-                this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(this.ResourceGroupName, this.Name);
+                this.NetworkClient.NetworkManagementClient.VirtualRouters.Get(this.ResourceGroupName, this.Name);
             }
             catch (Exception ex)
             {
@@ -122,55 +110,47 @@ public override void Execute()
                 throw new PSArgumentException(string.Format(Properties.Resources.ResourceAlreadyPresentInResourceGroup, this.Name, this.ResourceGroupName));
             }
 
-            string virtualWanRGName = null;
-            string virtualWanName = null;
+            string hostedGatewayId = null;
 
             //// Resolve the virtual wan
-            if (ParameterSetName.Equals(CortexParameterSetNames.ByVirtualWanObject, StringComparison.OrdinalIgnoreCase))
+            if (ParameterSetName.Equals(VirtualRouterParameterSetNames.ByHostedGateway, StringComparison.OrdinalIgnoreCase))
             {
-                virtualWanRGName = this.VirtualWan.ResourceGroupName;
-                virtualWanName = this.VirtualWan.Name;
+                hostedGatewayId = this.HostedGateway.Id;
             }
-            else if (ParameterSetName.Equals(CortexParameterSetNames.ByVirtualWanResourceId, StringComparison.OrdinalIgnoreCase))
+            else if (ParameterSetName.Equals(VirtualRouterParameterSetNames.ByHostedGatewayId, StringComparison.OrdinalIgnoreCase))
             {
-                var parsedWanResourceId = new ResourceIdentifier(this.VirtualWanId);
-                virtualWanName = parsedWanResourceId.ResourceName;
-                virtualWanRGName = parsedWanResourceId.ResourceGroupName;
+                hostedGatewayId = this.HostedGatewayId;
             }
 
-            if (string.IsNullOrWhiteSpace(virtualWanRGName) || string.IsNullOrWhiteSpace(virtualWanName))
+            if (string.IsNullOrWhiteSpace(hostedGatewayId))
             {
-                throw new PSArgumentException(Properties.Resources.VirtualWanReferenceNeededForVirtualHub);
+                throw new PSArgumentException(Properties.Resources.VirtualGatewayRequiredForVirtualRouter);
             }
 
-            PSVirtualWan resolvedVirtualWan = new VirtualWanBaseCmdlet().GetVirtualWan(virtualWanRGName, virtualWanName);
-
 
             ConfirmAction(
                 Properties.Resources.CreatingResourceMessage,
                 Name,
                 () =>
                 {
                     WriteVerbose(String.Format(Properties.Resources.CreatingLongRunningOperationMessage, this.ResourceGroupName, this.Name));
-                    PSVirtualHub virtualHub = new PSVirtualHub
+                    PSVirtualRouter virtualRouter = new PSVirtualRouter
                     {
                         ResourceGroupName = this.ResourceGroupName,
                         Name = this.Name,
-                        VirtualWan = new PSResourceId() { Id = resolvedVirtualWan.Id },
-                        AddressPrefix = this.AddressPrefix,
-                        Location = this.Location
+                        HostedGateway = new PSResourceId() { Id = hostedGatewayId },
+                        Location = this.Location,
+                        VirtualRouterAsn = GatewayAsn
                     };
 
-                    virtualHub.IpConfigurations.Add((PSSubnet)new PSResourceId() { Id = this.HostedSubnet });
-
-                    var vVirtualHubModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualHub>(virtualHub);
-                    vVirtualHubModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
+                    var vVirtualRouterModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualRouter>(virtualRouter);
+                    vVirtualRouterModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
 
-                    this.NetworkClient.NetworkManagementClient.VirtualHubs.CreateOrUpdate(this.ResourceGroupName, this.Name, vVirtualHubModel);
-                    var getVirtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(this.ResourceGroupName, this.Name);
-                    var psVirtualRouter = NetworkResourceManagerProfile.Mapper.Map<PSVirtualRouter>(getVirtualHub);
+                    this.NetworkClient.NetworkManagementClient.VirtualRouters.CreateOrUpdate(this.ResourceGroupName, this.Name, vVirtualRouterModel);
+                    var getVirtualRouter = this.NetworkClient.NetworkManagementClient.VirtualRouters.Get(this.ResourceGroupName, this.Name);
+                    var psVirtualRouter = NetworkResourceManagerProfile.Mapper.Map<PSVirtualRouter>(getVirtualRouter);
                     psVirtualRouter.ResourceGroupName = this.ResourceGroupName;
-                    psVirtualRouter.Tag = TagsConversionHelper.CreateTagHashtable(getVirtualHub.Tags);
+                    psVirtualRouter.Tag = TagsConversionHelper.CreateTagHashtable(getVirtualRouter.Tags);
                     WriteObject(psVirtualRouter, true);
                 });
 
diff --git a/src/Network/Network/VirtualRouter/RemoveAzureRMVirtualRouterCommand.cs b/src/Network/Network/VirtualRouter/RemoveAzureRMVirtualRouterCommand.cs
@@ -98,7 +98,7 @@ public override void Execute()
                     this.RouterName,
                 () =>
                 {
-                    this.NetworkClient.NetworkManagementClient.VirtualHubs.Delete(ResourceGroupName, RouterName);
+                    this.NetworkClient.NetworkManagementClient.VirtualRouters.Delete(ResourceGroupName, RouterName);
                     if (PassThru)
                     {
                         WriteObject(true);
diff --git a/src/Network/Network/VirtualRouter/VirtualRouterBaseCmdlet.cs b/src/Network/Network/VirtualRouter/VirtualRouterBaseCmdlet.cs
@@ -20,23 +20,23 @@ namespace Microsoft.Azure.Commands.Network
 {
     public class VirtualRouterBaseCmdlet : NetworkBaseCmdlet
     {
-        // Gateway ASN which gets populated for VirtualHub as VR resides inside GW
+        // Gateway ASN which gets populated for VirtualRouter as VR resides inside GW
         public const int GatewayAsn = 65515;
 
-        public void AddBgpConnectionsToPSVirtualHub (VirtualHub vVirtualHub, 
-                                                  CNM.PSVirtualHub vVirtualHubModel,
+        public void AddPeeringsToPSVirtualRouter (VirtualRouter vVirtualRouter, 
+                                                  CNM.PSVirtualRouter vVirtualRouterModel,
                                                   string resourceGroupName,
                                                   string routerName)
         {
-            if (vVirtualHubModel.BgpConnections != null && vVirtualHubModel.BgpConnections.Count > 0)
+            if (vVirtualRouter.Peerings != null && vVirtualRouter.Peerings.Count > 0)
             {
-                var bgpConnections = this.NetworkClient.NetworkManagementClient.VirtualHubBgpConnections.List(this.ResourceGroupName, this.VirtualRouterName);
-                var bgpConnectionList = ListNextLink<BgpConnection>.GetAllResourcesByPollingNextLink(bgpConnections, this.NetworkClient.NetworkManagementClient.VirtualHubBgpConnections.ListNext);
-                    foreach (var connection in bgpConnectionList)
-                    {
-                        vVirtualHubModel.BgpConnections.Add(NetworkResourceManagerProfile.Mapper.Map<PSBgpConnection>(connection));
-                    }
+                var vVirtualRouterPeering = this.NetworkClient.NetworkManagementClient.VirtualRouterPeerings.List(resourceGroupName, routerName);
+                var vVirtualRouterPeeringList = ListNextLink<VirtualRouterPeering>.GetAllResourcesByPollingNextLink(vVirtualRouterPeering, this.NetworkClient.NetworkManagementClient.VirtualRouterPeerings.ListNext);
+                foreach (var peering in vVirtualRouterPeeringList)
+                {
+                    vVirtualRouterModel.Peerings.Add(NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualRouterPeer>(peering));
                 }
+            }
         }
     }
 }
diff --git a/src/Network/Network/VirtualRouter/VirtualRouterParameterSetNames.cs b/src/Network/Network/VirtualRouter/VirtualRouterParameterSetNames.cs
@@ -16,9 +16,10 @@ namespace Microsoft.Azure.Commands.Network
 {
     internal static class VirtualRouterParameterSetNames
     {
+        internal const string ByHostedGateway = "HostedGatewayParameterSet";
+        internal const string ByHostedGatewayId = "HostedGatewayIdParameterSet";
         internal const string ByVirtualRouterResourceId = "VirtualRouterResourceIdParameterSet";
         internal const string ByVirtualRouterInputObject = "VirtualRouterInputObjectParameterSet";
         internal const string ByVirtualRouterName = "VirtualRouterNameParameterSet";
-        internal const string ByVirtualWanObject = "ByVirtualWanObject";
     }
 }
diff --git a/src/Network/Network/VirtualRouterPeer/AddAzureRMVirtualRouterPeerCommand.cs b/src/Network/Network/VirtualRouterPeer/AddAzureRMVirtualRouterPeerCommand.cs
diff --git a/src/Network/Network/VirtualRouterPeer/GetAzureRMVirtualRouterPeerCommand.cs b/src/Network/Network/VirtualRouterPeer/GetAzureRMVirtualRouterPeerCommand.cs
diff --git a/src/Network/Network/VirtualRouterPeer/RemoveAzureRMVirtualRouterPeerCommand.cs b/src/Network/Network/VirtualRouterPeer/RemoveAzureRMVirtualRouterPeerCommand.cs
diff --git a/src/Network/Network/VirtualRouterPeer/UpdateAzureRMVirtualRouterPeerCommand.cs b/src/Network/Network/VirtualRouterPeer/UpdateAzureRMVirtualRouterPeerCommand.cs

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ namespace Microsoft.Azure.Commands.Network.Models`
`22`	`22`	`public partial class PSVirtualRouter : PSTopLevelResource`
`23`	`23`	`{`
`24`	`24`	`[Ps1Xml(Target = ViewControl.Table)]`
`25`		`- public List<PSSubnet> IpConfiguration { get; set; }`
	`25`	`+ public PSResourceId HostedGateway { get; set; }`
`26`	`26`	`[Ps1Xml(Target = ViewControl.Table)]`
`27`	`27`	`public uint VirtualRouterAsn { get; set; }`
`28`	`28`	`[Ps1Xml(Target = ViewControl.Table)]`
`29`	`29`	`public List<string> VirtualRouterIps { get; set; }`
`30`	`30`	`[Ps1Xml(Target = ViewControl.Table)]`
`31`	`31`	`public string ProvisioningState { get; set; }`
`32`		`- public List<PSBgpConnection> Peerings { get; set; }`
	`32`	`+ public List<PSVirtualRouterPeer> Peerings { get; set; }`
`33`	`33`
`34`	`34`	`[JsonIgnore]`
`35`	`35`	`public string PeeringsText`
`@@ -38,9 +38,9 @@ public string PeeringsText`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[JsonIgnore]`
`41`		`- public string HostedSubnetText`
	`41`	`+ public string HostedGatewayText`
`42`	`42`	`{`
`43`		`- get { return JsonConvert.SerializeObject(IPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }`
	`43`	`+ get { return JsonConvert.SerializeObject(HostedGateway, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`namespace Microsoft.Azure.Commands.Network.Models`
`21`	`21`	`{`
`22`		`- public partial class PSBgpConnection : PSChildResource`
	`22`	`+ public partial class PSVirtualRouterPeer : PSChildResource`
`23`	`23`	`{`
`24`	`24`	`[Ps1Xml(Target = ViewControl.Table)]`
`25`	`25`	`public uint PeerAsn { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public override void Execute()`
`98`	`98`	`this.RouterName,`
`99`	`99`	`() =>`
`100`	`100`	`{`
`101`		`- this.NetworkClient.NetworkManagementClient.VirtualHubs.Delete(ResourceGroupName, RouterName);`
	`101`	`+ this.NetworkClient.NetworkManagementClient.VirtualRouters.Delete(ResourceGroupName, RouterName);`
`102`	`102`	`if (PassThru)`
`103`	`103`	`{`
`104`	`104`	`WriteObject(true);`
Original file line number	Diff line number	Diff line change
`@@ -20,23 +20,23 @@ namespace Microsoft.Azure.Commands.Network`
`20`	`20`	`{`
`21`	`21`	`public class VirtualRouterBaseCmdlet : NetworkBaseCmdlet`
`22`	`22`	`{`
`23`		`- // Gateway ASN which gets populated for VirtualHub as VR resides inside GW`
	`23`	`+ // Gateway ASN which gets populated for VirtualRouter as VR resides inside GW`
`24`	`24`	`public const int GatewayAsn = 65515;`
`25`	`25`
`26`		`- public void AddBgpConnectionsToPSVirtualHub (VirtualHub vVirtualHub,`
`27`		`- CNM.PSVirtualHub vVirtualHubModel,`
	`26`	`+ public void AddPeeringsToPSVirtualRouter (VirtualRouter vVirtualRouter,`
	`27`	`+ CNM.PSVirtualRouter vVirtualRouterModel,`
`28`	`28`	`string resourceGroupName,`
`29`	`29`	`string routerName)`
`30`	`30`	`{`
`31`		`- if (vVirtualHubModel.BgpConnections != null && vVirtualHubModel.BgpConnections.Count > 0)`
	`31`	`+ if (vVirtualRouter.Peerings != null && vVirtualRouter.Peerings.Count > 0)`
`32`	`32`	`{`
`33`		`- var bgpConnections = this.NetworkClient.NetworkManagementClient.VirtualHubBgpConnections.List(this.ResourceGroupName, this.VirtualRouterName);`
`34`		`- var bgpConnectionList = ListNextLink<BgpConnection>.GetAllResourcesByPollingNextLink(bgpConnections, this.NetworkClient.NetworkManagementClient.VirtualHubBgpConnections.ListNext);`
`35`		`- foreach (var connection in bgpConnectionList)`
`36`		`- {`
`37`		`- vVirtualHubModel.BgpConnections.Add(NetworkResourceManagerProfile.Mapper.Map<PSBgpConnection>(connection));`
`38`		`- }`
	`33`	`+ var vVirtualRouterPeering = this.NetworkClient.NetworkManagementClient.VirtualRouterPeerings.List(resourceGroupName, routerName);`
	`34`	`+ var vVirtualRouterPeeringList = ListNextLink<VirtualRouterPeering>.GetAllResourcesByPollingNextLink(vVirtualRouterPeering, this.NetworkClient.NetworkManagementClient.VirtualRouterPeerings.ListNext);`
	`35`	`+ foreach (var peering in vVirtualRouterPeeringList)`
	`36`	`+ {`
	`37`	`+ vVirtualRouterModel.Peerings.Add(NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualRouterPeer>(peering));`
`39`	`38`	`}`
	`39`	`+ }`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,10 @@ namespace Microsoft.Azure.Commands.Network`
`16`	`16`	`{`
`17`	`17`	`internal static class VirtualRouterParameterSetNames`
`18`	`18`	`{`
	`19`	`+ internal const string ByHostedGateway = "HostedGatewayParameterSet";`
	`20`	`+ internal const string ByHostedGatewayId = "HostedGatewayIdParameterSet";`
`19`	`21`	`internal const string ByVirtualRouterResourceId = "VirtualRouterResourceIdParameterSet";`
`20`	`22`	`internal const string ByVirtualRouterInputObject = "VirtualRouterInputObjectParameterSet";`
`21`	`23`	`internal const string ByVirtualRouterName = "VirtualRouterNameParameterSet";`
`22`		`- internal const string ByVirtualWanObject = "ByVirtualWanObject";`
`23`	`24`	`}`
`24`	`25`	`}`