Change underline behavior of adding IP configuration to route server (#15194)

litchiyangMSFT · web-flow · commit 8f729a3d776a · 2021-06-08T10:51:14.000+08:00
* fix day 1 behavior for route server

* record and log
diff --git a/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerCRUD.json b/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerCRUD.json
diff --git a/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerPeerCRUD.json b/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerPeerCRUD.json
diff --git a/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerPeerRoutes.json b/src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerPeerRoutes.json
diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md
@@ -19,6 +19,7 @@
 --->
 
 ## Upcoming Release
+* Updated cmdlets for route server for a more stable way to add IP configuration.
 * Added support for getting a single private link resource.
 * Added more detailed description about GroupId in `New-AzPrivateLinkServiceConnection`
 * Updated cmdlets to enable setting of PrivateRange on AzureFirewallPolicy.
diff --git a/src/Network/Network/RouteServer/GetAzureRMRouteServerCommand.cs b/src/Network/Network/RouteServer/GetAzureRMRouteServerCommand.cs
@@ -55,15 +55,14 @@ public override void Execute()
                 RouteServerName = resourceInfo.ResourceName;
             }
 
-            string ipConfigName = "ipconfig1";
             if (ShouldGetByName(ResourceGroupName, RouteServerName))
             {
                 var virtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(ResourceGroupName, RouteServerName);
                 var virtualHubModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualHub>(virtualHub);
                 virtualHubModel.ResourceGroupName = this.ResourceGroupName;
                 virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
                 AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, RouteServerName);
-                AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName, ipConfigName);
+                AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName);
 
                 var routeServerModel = new PSRouteServer(virtualHubModel);
                 routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
@@ -91,7 +90,7 @@ public override void Execute()
                     virtualHubModel.ResourceGroupName = NetworkBaseCmdlet.GetResourceGroup(virtualHub.Id);
                     virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
                     AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, RouteServerName);
-                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName, ipConfigName);
+                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName);
 
                     var routeServerModel = new PSRouteServer(virtualHubModel);
                     routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
diff --git a/src/Network/Network/RouteServer/NewAzureRMRouteServerCommand.cs b/src/Network/Network/RouteServer/NewAzureRMRouteServerCommand.cs
@@ -106,6 +106,7 @@ public override void Execute()
                 () =>
                 {
                     WriteVerbose(String.Format(Properties.Resources.CreatingLongRunningOperationMessage, this.ResourceGroupName, this.RouteServerName));
+
                     PSVirtualHub virtualHub = new PSVirtualHub
                     {
                         ResourceGroupName = this.ResourceGroupName,
@@ -130,7 +131,7 @@ public override void Execute()
 
                     virtualHub = NetworkResourceManagerProfile.Mapper.Map<PSVirtualHub>(virtualHubModel);
                     virtualHub.ResourceGroupName = this.ResourceGroupName;
-                    AddIpConfigurtaionToPSVirtualHub(virtualHub, this.ResourceGroupName, this.RouteServerName, ipConfigName);
+                    AddIpConfigurtaionToPSVirtualHub(virtualHub, this.ResourceGroupName, this.RouteServerName);
 
                     var routeServerModel = new PSRouteServer(virtualHub);
                     routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHubModel.Tags);
diff --git a/src/Network/Network/RouteServer/UpdateAzureRMRouteServerCommand.cs b/src/Network/Network/RouteServer/UpdateAzureRMRouteServerCommand.cs
@@ -78,8 +78,6 @@ public override void Execute()
                 this.RouteServerName = resourceInfo.ResourceName;
             }
 
-            string ipConfigName = "ipconfig1";
-
             var virtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(ResourceGroupName, RouteServerName);
             virtualHub.AllowBranchToBranchTraffic = this.AllowBranchToBranchTraffic.IsPresent;
             this.NetworkClient.NetworkManagementClient.VirtualHubs.CreateOrUpdate(this.ResourceGroupName, this.RouteServerName, virtualHub);
@@ -88,7 +86,7 @@ public override void Execute()
             psVirtualHub.ResourceGroupName = this.ResourceGroupName;
             psVirtualHub.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
             AddBgpConnectionsToPSVirtualHub(psVirtualHub, ResourceGroupName, RouteServerName);
-            AddIpConfigurtaionToPSVirtualHub(psVirtualHub, this.ResourceGroupName, RouteServerName, ipConfigName);
+            AddIpConfigurtaionToPSVirtualHub(psVirtualHub, this.ResourceGroupName, RouteServerName);
 
             var routeServerModel = new PSRouteServer(psVirtualHub);
             routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
diff --git a/src/Network/Network/RouteServerPeer/AddAzureRMRouteServerPeerCommand.cs b/src/Network/Network/RouteServerPeer/AddAzureRMRouteServerPeerCommand.cs
@@ -111,7 +111,6 @@ public override void Execute()
                         PeerIp = this.PeerIp,
                         Name = this.PeerName
                     };
-                    string ipConfigName = "ipconfig1";
 
                     var bgpConnectionModel = NetworkResourceManagerProfile.Mapper.Map<MNM.BgpConnection>(peer);
 
@@ -121,7 +120,7 @@ public override void Execute()
                     virtualHubModel.ResourceGroupName = this.ResourceGroupName;
                     virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
                     AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, this.RouteServerName);
-                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName, ipConfigName);
+                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName);
 
                     var routeServerModel = new PSRouteServer(virtualHubModel);
                     routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
diff --git a/src/Network/Network/RouteServerPeer/RemoveAzureRMRouteServerPeerCommand.cs b/src/Network/Network/RouteServerPeer/RemoveAzureRMRouteServerPeerCommand.cs
@@ -104,15 +104,13 @@ public override void Execute()
                 PeerName,
                 () =>
                 {
-                    string ipConfigName = "ipconfig1";
-
                     this.NetworkClient.NetworkManagementClient.VirtualHubBgpConnection.Delete(ResourceGroupName, RouteServerName, PeerName);
                     var virtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(ResourceGroupName, RouteServerName);
                     var virtualHubModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualHub>(virtualHub);
                     virtualHubModel.ResourceGroupName = this.ResourceGroupName;
                     virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
                     AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, this.RouteServerName);
-                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName, ipConfigName);
+                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName);
 
                     var routeServerModel = new PSRouteServer(virtualHubModel);
                     routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
diff --git a/src/Network/Network/RouteServerPeer/UpdateAzureRMRouteServerPeerCommand.cs b/src/Network/Network/RouteServerPeer/UpdateAzureRMRouteServerPeerCommand.cs
@@ -154,8 +154,6 @@ public override void Execute()
                         PeerAsn = this.PeerAsn,
                         PeerIp = this.PeerIp
                     };
-                    string ipConfigName = "ipconfig1";
-
 
                     var bgpConnectionModel = NetworkResourceManagerProfile.Mapper.Map<MNM.BgpConnection>(peer);
 
@@ -165,7 +163,7 @@ public override void Execute()
                     virtualHubModel.ResourceGroupName = this.ResourceGroupName;
                     virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
                     AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, this.RouteServerName);
-                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName, ipConfigName);
+                    AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName);
 
                     var routeServerModel = new PSRouteServer(virtualHubModel);
                     routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
diff --git a/src/Network/Network/VirtualRouter/RouteServerBaseCmdlet.cs b/src/Network/Network/VirtualRouter/RouteServerBaseCmdlet.cs
@@ -24,10 +24,15 @@ public void AddBgpConnectionsToPSVirtualHub(CNM.PSVirtualHub virtualHubModel,
 
         public void AddIpConfigurtaionToPSVirtualHub(CNM.PSVirtualHub virtualHubModel,
                                                     string resourceGroupName,
-                                                    string routerName,
-                                                    string ipConfigName)
+                                                    string routerName)
         {
-            var ipConfigModel = this.NetworkClient.NetworkManagementClient.VirtualHubIpConfiguration.Get(resourceGroupName, routerName, ipConfigName);
+            var ipConfigModels = this.NetworkClient.NetworkManagementClient.VirtualHubIpConfiguration.List(resourceGroupName, routerName);
+            var ipConfigList = ListNextLink<HubIpConfiguration>.GetAllResourcesByPollingNextLink(ipConfigModels, this.NetworkClient.NetworkManagementClient.VirtualHubIpConfiguration.ListNext);
+            HubIpConfiguration ipConfigModel = null;
+            if (ipConfigList.Count > 0)
+            {
+                ipConfigModel = ipConfigList[0];
+            }
             var ipconfig = NetworkResourceManagerProfile.Mapper.Map<CNM.PSHubIpConfiguration>(ipConfigModel);
             virtualHubModel.IpConfigurations = new List<CNM.PSHubIpConfiguration>();
             virtualHubModel.IpConfigurations.Add(ipconfig);

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ public override void Execute()`
`106`	`106`	`() =>`
`107`	`107`	`{`
`108`	`108`	`WriteVerbose(String.Format(Properties.Resources.CreatingLongRunningOperationMessage, this.ResourceGroupName, this.RouteServerName));`
	`109`	`+`
`109`	`110`	`PSVirtualHub virtualHub = new PSVirtualHub`
`110`	`111`	`{`
`111`	`112`	`ResourceGroupName = this.ResourceGroupName,`
`@@ -130,7 +131,7 @@ public override void Execute()`
`130`	`131`
`131`	`132`	`virtualHub = NetworkResourceManagerProfile.Mapper.Map<PSVirtualHub>(virtualHubModel);`
`132`	`133`	`virtualHub.ResourceGroupName = this.ResourceGroupName;`
`133`		`- AddIpConfigurtaionToPSVirtualHub(virtualHub, this.ResourceGroupName, this.RouteServerName, ipConfigName);`
	`134`	`+ AddIpConfigurtaionToPSVirtualHub(virtualHub, this.ResourceGroupName, this.RouteServerName);`
`134`	`135`
`135`	`136`	`var routeServerModel = new PSRouteServer(virtualHub);`
`136`	`137`	`routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHubModel.Tags);`