VirtualWan: Use hubvnet CRUD operations for Hubvnet and hub cmdlets

src/Network/Network/ChangeLog.md

@@ -78,6 +78,18 @@
 * Add `EnableDnsProxy`, 'DnsProxyNotRequiredForNetworkRule' and 'DnsServer' parameters to `AzureFirewall`
     - Updated cmdlet:
         - New-AzFirewall
+* Add deprecation warning for `HubVnetConnection` parameter in following cmdlets
+    - NewAzureRmVirtualHubCommand
+    - UpdateAzureRmVirtualHubCommand
+* Use HubVnetConnection create/update APIs instead of VirtualHub create/update APIs for following cmdlets
+    - NewAzureRmVirtualHubCommand
+    - UpdateAzureRmVirtualHubCommand
+    - NewHubVirtualNetworkConnectionCommand
+    - UpdateAzureRmHubVirtualNetworkConnectionCommand
+    - RemoveHubVirtualNetworkConnectionCommand
+* Deprecate `EnableInternetSecurity` switch parameter and instead introduce `EnableInternetSecurityFlag` boolean in
+    - NewHubVirtualNetworkConnectionCommand.
+    The flag is also made true by default for newly created connections.
 
 ## Version 2.5.0
 * Updated cmdlets to enable connection on private IP for Virtual Network Gateway.

src/Network/Network/Cortex/HubVnetConnection/HubVnetConnectionBaseCmdlet.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Network
     using System.Net;
     using MNM = Microsoft.Azure.Management.Network.Models;
 
-    public class HubVnetConnectionBaseCmdlet : VirtualHubBaseCmdlet
+    public class HubVnetConnectionBaseCmdlet : NetworkBaseCmdlet
     {
         public IHubVirtualNetworkConnectionsOperations HubVirtualNetworkConnectionsClient
         {
@@ -39,6 +39,26 @@ public PSHubVirtualNetworkConnection ToPsHubVirtualNetworkConnection(Management.
             return psVirtualHubVirtualNetworkConnection;
         }
 
+        public PSHubVirtualNetworkConnection CreateOrUpdateHubVirtualNetworkConnection(string resourceGroupName, string virtualHubName, string connectionName, MNM.HubVirtualNetworkConnection hubVirtualNetworkConnectionParameters,  Dictionary<string, List<string>> customHeaders = null)
+        {
+            MNM.HubVirtualNetworkConnection hubVnetConnCreated;
+
+            if (customHeaders == null)
+            {
+                hubVnetConnCreated = this.HubVirtualNetworkConnectionsClient.CreateOrUpdate(resourceGroupName, virtualHubName, connectionName, hubVirtualNetworkConnectionParameters);
+            }
+            else
+            {
+                // Execute the create call and pass the custom headers. 
+                using (var _result = this.HubVirtualNetworkConnectionsClient.CreateOrUpdateWithHttpMessagesAsync(resourceGroupName, connectionName, virtualHubName, hubVirtualNetworkConnectionParameters, customHeaders).GetAwaiter().GetResult())
+                {
+                    hubVnetConnCreated = _result.Body;
+                }
+            }
+
+            return this.ToPsHubVirtualNetworkConnection(hubVnetConnCreated);
+        }
+
         public PSHubVirtualNetworkConnection GetHubVirtualNetworkConnection(string resourceGroupName, string virtualHubName, string name)
         {
             var virtualHubConnection = this.HubVirtualNetworkConnectionsClient.Get(resourceGroupName, virtualHubName, name);

src/Network/Network/Cortex/HubVnetConnection/NewAzureRmHubVirtualNetworkConnectionCommand.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 + "VirtualHubVnetConnection",
@@ -124,11 +125,17 @@ public class NewHubVirtualNetworkConnectionCommand : HubVnetConnectionBaseCmdlet
         [ResourceIdCompleter("Microsoft.Network/virtualNetworks")]
         public string RemoteVirtualNetworkId { get; set; }
 
+        [CmdletParameterBreakingChange("EnableInternetSecurity", OldParamaterType = typeof(SwitchParameter), NewParameterTypeName = "EnableInternetSecurityFlag")]
         [Parameter(
             Mandatory = false,
             HelpMessage = "Enable internet security for this connection")]
         public SwitchParameter EnableInternetSecurity { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "Enable internet security for this connection")]
+        public bool? EnableInternetSecurityFlag { get; set; }
+
         [Parameter(
             Mandatory = false,
             HelpMessage = "Run cmdlet in the background")]
@@ -156,33 +163,25 @@ public override void Execute()
                 throw new PSArgumentException(string.Format(Properties.Resources.ChildResourceAlreadyPresentInResourceGroup, this.Name, this.ResourceGroupName, this.ParentResourceName));
             }
 
-            //// Get the virtual hub - this will throw not found if the resource does not exist
-            PSVirtualHub parentVirtualHub = this.GetVirtualHub(this.ResourceGroupName, this.ParentResourceName);
-            if (parentVirtualHub == null)
+            var hubVnetConnection = new MNM.HubVirtualNetworkConnection(enableInternetSecurity: true);
+            hubVnetConnection.Name = this.Name;
+
+            if (this.EnableInternetSecurityFlag.HasValue && this.EnableInternetSecurityFlag.Value == false)
             {
-                throw new PSArgumentException(Properties.Resources.ParentVirtualHubNotFound);
+                hubVnetConnection.EnableInternetSecurity = false;
             }
 
-            PSHubVirtualNetworkConnection hubVnetConnection = new PSHubVirtualNetworkConnection();
-            hubVnetConnection.Name = this.Name;
-            hubVnetConnection.EnableInternetSecurity = this.EnableInternetSecurity.IsPresent;
-
             //// Resolve the remote virtual network
             //// Let's not try to resolve this since this can be in other RG/Sub/Location
             if (ParameterSetName.Contains(CortexParameterSetNames.ByRemoteVirtualNetworkObject))
             {
-                hubVnetConnection.RemoteVirtualNetwork = new PSResourceId() { Id = this.RemoteVirtualNetwork.Id };
+                hubVnetConnection.RemoteVirtualNetwork = new MNM.SubResource(this.RemoteVirtualNetwork.Id);
             }
             else if (ParameterSetName.Contains(CortexParameterSetNames.ByRemoteVirtualNetworkResourceId))
             {
-                hubVnetConnection.RemoteVirtualNetwork = new PSResourceId() { Id = this.RemoteVirtualNetworkId };
+                hubVnetConnection.RemoteVirtualNetwork = new MNM.SubResource(this.RemoteVirtualNetworkId);
             }
 
-            if (parentVirtualHub.VirtualNetworkConnections == null)
-            {
-                parentVirtualHub.VirtualNetworkConnections = new List<PSHubVirtualNetworkConnection>();
-            }
-
             List<string> resourceIds = new List<string>();
             resourceIds.Add(hubVnetConnection.RemoteVirtualNetwork.Id);
             var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
@@ -191,18 +190,13 @@ public override void Execute()
                 auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
             }
 
-            parentVirtualHub.VirtualNetworkConnections.Add(hubVnetConnection);
-
             ConfirmAction(
                 Properties.Resources.CreatingResourceMessage,
                 this.Name,
                 () =>
                 {
                     WriteVerbose(String.Format(Properties.Resources.CreatingLongRunningOperationMessage, this.ResourceGroupName, this.Name));
-                    this.CreateOrUpdateVirtualHub(this.ResourceGroupName, this.ParentResourceName, parentVirtualHub, parentVirtualHub.Tag, auxAuthHeader);
-                    var createdVirtualHub = this.GetVirtualHub(this.ResourceGroupName, this.ParentResourceName);
-
-                    WriteObject(createdVirtualHub.VirtualNetworkConnections.FirstOrDefault(hubConnection => hubConnection.Name.Equals(this.Name, StringComparison.OrdinalIgnoreCase)));
+                    WriteObject(this.CreateOrUpdateHubVirtualNetworkConnection(this.ResourceGroupName, this.ParentResourceName, this.Name, hubVnetConnection, auxAuthHeader));
                 });
         }
     }

src/Network/Network/Cortex/HubVnetConnection/RemoveAzureRmHubVirtualNetworkConnectionCommand.cs

@@ -110,17 +110,6 @@ public override void Execute()
                 this.Name = parsedResourceId.ResourceName;
             }
 
-            //// Get the virtual hub - this will throw not found if the resource is invalid
-            PSVirtualHub parentVirtualHub = this.GetVirtualHub(this.ResourceGroupName, this.ParentResourceName);
-
-            if (parentVirtualHub == null)
-            {
-                throw new PSArgumentException(Properties.Resources.ParentVirtualHubNotFound);
-            }
-
-            var connectionToRemove = parentVirtualHub.VirtualNetworkConnections.FirstOrDefault(connection => connection.Name.Equals(this.Name, StringComparison.OrdinalIgnoreCase));
-            if (connectionToRemove != null)
-            {
                 base.Execute();
 
                 ConfirmAction(
@@ -130,15 +119,13 @@ public override void Execute()
                     this.Name,
                     () =>
                     {
-                        parentVirtualHub.VirtualNetworkConnections.Remove(connectionToRemove);
-                        this.CreateOrUpdateVirtualHub(this.ResourceGroupName, this.ParentResourceName, parentVirtualHub, parentVirtualHub.Tag);
+                        this.HubVirtualNetworkConnectionsClient.Delete(this.ResourceGroupName, this.ParentResourceName, this.Name);
 
                         if (PassThru)
                         {
                             WriteObject(true);
                         }
                     });
-            }
         }
     }
 }

src/Network/Network/Cortex/HubVnetConnection/UpdateAzureRmHubVirtualNetworkConnectionCommand.cs

@@ -114,10 +114,7 @@ public override void Execute()
                 this.Name = parsedResourceId.ResourceName;
             }
 
-            //// Get the virtual hub - this will throw not found if the resource is invalid
-            PSVirtualHub parentVirtualHub = this.GetVirtualHub(this.ResourceGroupName, this.ParentResourceName);
-
-            var connectionToModify = parentVirtualHub.VirtualNetworkConnections.FirstOrDefault(connection => connection.Name.Equals(this.Name, StringComparison.OrdinalIgnoreCase));
+            var connectionToModify = this.HubVirtualNetworkConnectionsClient.Get(this.ResourceGroupName, this.ParentResourceName, this.Name);
             if (connectionToModify == null)
             {
                 throw new PSArgumentException(Properties.Resources.HubVnetConnectionNotFound);
@@ -141,10 +138,7 @@ public override void Execute()
                     this.Name,
                     () =>
                     {
-                        this.CreateOrUpdateVirtualHub(this.ResourceGroupName, this.ParentResourceName, parentVirtualHub, parentVirtualHub.Tag, auxAuthHeader);
-                        var updatedVirtualHub = this.GetVirtualHub(this.ResourceGroupName, this.ParentResourceName);
-
-                        WriteObject(updatedVirtualHub.VirtualNetworkConnections.FirstOrDefault(hubConnection => hubConnection.Name.Equals(this.Name, StringComparison.OrdinalIgnoreCase)));
+                        WriteObject(this.CreateOrUpdateHubVirtualNetworkConnection(this.ResourceGroupName, this.ParentResourceName, this.Name, connectionToModify, auxAuthHeader));
                     });
         }
     }

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 = "HubVnetConnection parameter is deprecated. Use *VirtualHubVnetConnection* 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,

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 = "HubVnetConnection parameter is deprecated. Use *VirtualHubVnetConnection* 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);
                     });
         }
     }