Vwan: Use hubvnet CRUD api in virtual hub too

Shyam Dharmarajan · Shyam Dharmarajan · commit ec29a9e431be · 2020-05-27T21:11:14.000-07:00
This retains backward compatibility with the existing virtual hub APIs.
Also add a deprecation warning to remove specifying virtualnetwork
connections in virtual hub.
diff --git a/src/Network/Network/Cortex/VirtualHub/NewAzureRmVirtualHubCommand.cs b/src/Network/Network/Cortex/VirtualHub/NewAzureRmVirtualHubCommand.cs
@@ -28,6 +28,7 @@ namespace Microsoft.Azure.Commands.Network
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using System.Linq;
     using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+    using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
     [Cmdlet(VerbsCommon.New,
         ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VirtualHub",
@@ -78,6 +79,8 @@ public class NewAzureRmVirtualHubCommand : VirtualHubBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string Location { get; set; }
 
+        public const String ChangeDesc = "VirtualNetworkConnection parameter is deprecated. Use AzVirtualHubVnet commands";
+        [CmdletParameterBreakingChange("HubVnetConnection", ChangeDescription = ChangeDesc)]
         [Parameter(
             Mandatory = false,
             HelpMessage = "The hub virtual network connections associated with this Virtual Hub.")]
@@ -152,34 +155,21 @@ public override void Execute()
                         Location = this.Location
                     };
 
-                    virtualHub.VirtualNetworkConnections = new List<PSHubVirtualNetworkConnection>();
+                    virtualHub.RouteTable = this.RouteTable;
+                    virtualHub.RouteTables = new List<PSVirtualHubRouteTable>();
+
                     if (this.HubVnetConnection != null)
                     {
+                        virtualHub.VirtualNetworkConnections = new List<PSHubVirtualNetworkConnection>();
                         virtualHub.VirtualNetworkConnections.AddRange(this.HubVnetConnection);
-
-                        // get auth headers for cross-tenant hubvnet conn
-                        List<string> resourceIds = new List<string>();
-                        foreach (var connection in this.HubVnetConnection)
-                        {
-                            resourceIds.Add(connection.RemoteVirtualNetwork.Id);
-                        }
-
-                        var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
-                        if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
-                        {
-                            auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
-                        }
                     }
 
-                    virtualHub.RouteTable = this.RouteTable;
-                    virtualHub.RouteTables = new List<PSVirtualHubRouteTable>();
-
                     if (string.IsNullOrWhiteSpace(this.Sku))
                     {
                         virtualHub.Sku = "Standard";
                     }
 
-                    WriteObject(this.CreateOrUpdateVirtualHub(
+                    WriteObject(CreateOrUpdateVirtualHub(
                         this.ResourceGroupName,
                         this.Name,
                         virtualHub,
diff --git a/src/Network/Network/Cortex/VirtualHub/UpdateAzureRmVirtualHubCommand.cs b/src/Network/Network/Cortex/VirtualHub/UpdateAzureRmVirtualHubCommand.cs
@@ -28,6 +28,7 @@ namespace Microsoft.Azure.Commands.Network
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using System.Linq;
     using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+    using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
     [Cmdlet("Update",
         ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VirtualHub",
@@ -77,6 +78,8 @@ public class UpdateAzureRmVirtualHubCommand : VirtualHubBaseCmdlet
             HelpMessage = "The address space string for this virtual hub.")]
         public string AddressPrefix { get; set; }
 
+        public const String ChangeDesc = "VirtualNetworkConnection parameter is deprecated. Use AzVirtualHubVnet commands";
+        [CmdletParameterBreakingChange("HubVnetConnection", ChangeDescription = ChangeDesc)]
         [Parameter(
             Mandatory = false,
             HelpMessage = "The hub virtual network connections associated with this Virtual Hub.")]
@@ -139,23 +142,29 @@ public override void Execute()
             }
 
             //// HubVirtualNetworkConnections
+            List<PSHubVirtualNetworkConnection> hubVnetConnectionList = null;
             if (this.HubVnetConnection != null)
             {
-                virtualHubToUpdate.VirtualNetworkConnections = new List<PSHubVirtualNetworkConnection>();
-                virtualHubToUpdate.VirtualNetworkConnections.AddRange(this.HubVnetConnection);
-
-                // get auth headers for cross-tenant hubvnet conn
-                List<string> resourceIds = new List<string>();
-                foreach (var connection in this.HubVnetConnection)
+                // Simulate behavior of old API to clear all existing connections not in new request and then add new ones
+                if (virtualHubToUpdate.VirtualNetworkConnections != null)
                 {
-                    resourceIds.Add(connection.RemoteVirtualNetwork.Id);
+                    foreach (var connection in virtualHubToUpdate.VirtualNetworkConnections)
+                    {
+                        if (!this.HubVnetConnection.Any(conn => conn.Name == connection.Name))
+                        {
+                            this.HubVnetConnectionCmdlet.HubVirtualNetworkConnectionsClient.Delete(this.ResourceGroupName, this.Name, connection.Name);
+                        }
+                    }
                 }
 
-                var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
-                if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
-                {
-                    auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
-                }
+                virtualHubToUpdate.VirtualNetworkConnections = new List<PSHubVirtualNetworkConnection>();
+                virtualHubToUpdate.VirtualNetworkConnections.AddRange(this.HubVnetConnection);
+            }
+            else
+            {
+                // optimization to avoid unnecessary put on hubvnet connections
+                hubVnetConnectionList = virtualHubToUpdate.VirtualNetworkConnections;
+                virtualHubToUpdate.VirtualNetworkConnections = null;
             }
 
             //// VirtualHubRouteTable
@@ -176,12 +185,18 @@ public override void Execute()
                     () =>
                     {
                         WriteVerbose(String.Format(Properties.Resources.UpdatingLongRunningOperationMessage, this.ResourceGroupName, this.Name));
-                        WriteObject(this.CreateOrUpdateVirtualHub(
+                        var hubToReturn = this.CreateOrUpdateVirtualHub(
                             this.ResourceGroupName,
                             this.Name,
                             virtualHubToUpdate,
                             this.Tag,
-                            auxAuthHeader));
+                            auxAuthHeader);
+                        if (hubVnetConnectionList != null)
+                        {
+                            // patch back the hubvnet connection for backward compatibility
+                            hubToReturn.VirtualNetworkConnections = hubVnetConnectionList;
+                        }
+                        WriteObject(hubToReturn);
                     });
         }
     }
diff --git a/src/Network/Network/Cortex/VirtualHub/VirtualHubBaseCmdlet.cs b/src/Network/Network/Cortex/VirtualHub/VirtualHubBaseCmdlet.cs
@@ -26,6 +26,20 @@ namespace Microsoft.Azure.Commands.Network
 
     public class VirtualHubBaseCmdlet : NetworkBaseCmdlet
     {
+        private HubVnetConnectionBaseCmdlet hubVnetConnectionBaseCmdlet;
+
+        public HubVnetConnectionBaseCmdlet HubVnetConnectionCmdlet
+        {
+            get
+            {
+                if (hubVnetConnectionBaseCmdlet == null)
+                {
+                    hubVnetConnectionBaseCmdlet = new HubVnetConnectionBaseCmdlet();
+                }
+                return hubVnetConnectionBaseCmdlet;
+            }
+        }
+
         public IVirtualHubsOperations VirtualHubClient
         {
             get
@@ -49,9 +63,10 @@ public PSVirtualHub GetVirtualHub(string resourceGroupName, string name)
             {
                 //// The following code will throw if resource is not found
                 MNM.VirtualHub virtualHub = this.VirtualHubClient.Get(resourceGroupName, name);
-
                 PSVirtualHub psVirtualHub = ToPsVirtualHub(virtualHub);
                 psVirtualHub.ResourceGroupName = resourceGroupName;
+                psVirtualHub.VirtualNetworkConnections = this.HubVnetConnectionCmdlet.ListHubVnetConnections(resourceGroupName, name);
+
                 return psVirtualHub;
             }
             catch (Exception ex)
@@ -73,6 +88,8 @@ public bool IsVirtualHubPresent(string resourceGroupName, string name)
 
         public PSVirtualHub CreateOrUpdateVirtualHub(string resourceGroupName, string virtualHubName, PSVirtualHub virtualHub, Hashtable tags, Dictionary<string, List<string>> customHeaders = null)
         {
+            var psHubVnetConnections = virtualHub.VirtualNetworkConnections;
+            virtualHub.VirtualNetworkConnections = null;
             var virtualHubModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualHub>(virtualHub);
             virtualHubModel.Location = virtualHub.Location;
             virtualHubModel.Tags = TagsConversionHelper.CreateTagDictionary(tags, validate: true);
@@ -94,6 +111,32 @@ public PSVirtualHub CreateOrUpdateVirtualHub(string resourceGroupName, string vi
             PSVirtualHub hubToReturn = this.ToPsVirtualHub(virtualHubCreatedOrUpdated);
             hubToReturn.ResourceGroupName = resourceGroupName;
 
+            if (psHubVnetConnections == null)
+            {
+                return hubToReturn;
+            }
+
+            // Crud operation on the vnet connections
+            hubToReturn.VirtualNetworkConnections = new List<PSHubVirtualNetworkConnection>();
+
+            foreach (var psConnection in psHubVnetConnections)
+            {
+                var hubVnetConnnection = NetworkResourceManagerProfile.Mapper.Map<MNM.HubVirtualNetworkConnection>(psConnection);
+                // get auth headers for cross-tenant hubvnet conn
+                List<string> resourceIds = new List<string>();
+                resourceIds.Add(psConnection.RemoteVirtualNetwork.Id);
+
+                var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
+                Dictionary<string, List<string>> auxAuthHeader = null;
+                if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+                {
+                    auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
+                }
+
+                var psConnectionReturn = this.HubVnetConnectionCmdlet.CreateOrUpdateHubVirtualNetworkConnection(resourceGroupName, virtualHubName, psConnection.Name, hubVnetConnnection, customHeaders);
+                hubToReturn.VirtualNetworkConnections.Add(psConnectionReturn);
+            }
+
             return hubToReturn;
         }
 
@@ -110,6 +153,8 @@ public List<PSVirtualHub> ListVirtualHubs(string resourceGroupName)
                 {
                     PSVirtualHub virtualHubToReturn = ToPsVirtualHub(virtualHub);
                     virtualHubToReturn.ResourceGroupName = NetworkBaseCmdlet.GetResourceGroup(virtualHub.Id);
+                    virtualHubToReturn.VirtualNetworkConnections = this.HubVnetConnectionCmdlet.ListHubVnetConnections(resourceGroupName, virtualHub.Name);
+
                     hubsToReturn.Add(virtualHubToReturn);
                 }
             }
