Add support to deploy an additional VWAN hub to an existing Virtual WAN

infra-as-code/bicep/modules/vwanConnectivity/generateddocs/vwanConnectivity.bicep.md

@@ -8,15 +8,12 @@ Parameter name | Required | Description
 -------------- | -------- | -----------
 parLocation    | No       | Region in which the resource group was created.
 parCompanyPrefix | No       | Prefix value which will be prepended to all resource names.
-parVirtualHubAddressPrefix | No       | The IP address range in CIDR notation for the vWAN virtual Hub to use.
 parAzFirewallTier | No       | Azure Firewall Tier associated with the Firewall to deploy.
 parVirtualHubEnabled | No       | Switch to enable/disable Virtual Hub deployment.
-parVpnGatewayEnabled | No       | Switch to enable/disable VPN Gateway deployment.
-parExpressRouteGatewayEnabled | No       | Switch to enable/disable ExpressRoute Gateway deployment.
-parAzFirewallEnabled | No       | Switch to enable/disable Azure Firewall deployment.
 parAzFirewallDnsProxyEnabled | No       | Switch to enable/disable Azure Firewall DNS Proxy.
 parVirtualWanName | No       | Prefix Used for Virtual WAN.
 parVirtualWanHubName | No       | Prefix Used for Virtual WAN Hub.
+parVirtualWanHubs | No       | Array Used for multiple Virtual WAN Hubs deployment. Each object in the array represents an individual Virtual WAN Hub configuration. Add/remove additional objects in the array to meet the number of Virtual WAN Hubs required.  - `parVpnGatewayEnabled` - Switch to enable/disable VPN Gateway deployment on the respective Virtual WAN Hub. - `parExpressRouteGatewayEnabled` - Switch to enable/disable ExpressRoute Gateway deployment on the respective Virtual WAN Hub. - `parAzFirewallEnabled` - Switch to enable/disable Azure Firewall deployment on the respective Virtual WAN Hub. - `parVirtualHubAddressPrefix` - The IP address range in CIDR notation for the vWAN virtual Hub to use. - `parHublocation` - The Virtual WAN Hub location. - `parHubRoutingPreference` - The Virtual WAN Hub routing preference. The allowed values are `ASN`, `VpnGateway`, `ExpressRoute`. - `parVirtualRouterAutoScaleConfiguration` - The Virtual WAN Hub capacity. The value should be between 2 to 50.  
 parVpnGatewayName | No       | Prefix Used for VPN Gateway.
 parExpressRouteGatewayName | No       | Prefix Used for ExpressRoute Gateway.
 parAzFirewallName | No       | Azure Firewall Name.
@@ -49,14 +46,6 @@ Prefix value which will be prepended to all resource names.
 
 - Default value: `alz`
 
-### parVirtualHubAddressPrefix
-
-![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
-
-The IP address range in CIDR notation for the vWAN virtual Hub to use.
-
-- Default value: `10.100.0.0/23`
-
 ### parAzFirewallTier
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
@@ -75,77 +64,71 @@ Switch to enable/disable Virtual Hub deployment.
 
 - Default value: `True`
 
-### parVpnGatewayEnabled
-
-![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
-
-Switch to enable/disable VPN Gateway deployment.
-
-- Default value: `True`
-
-### parExpressRouteGatewayEnabled
+### parAzFirewallDnsProxyEnabled
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
-Switch to enable/disable ExpressRoute Gateway deployment.
+Switch to enable/disable Azure Firewall DNS Proxy.
 
 - Default value: `True`
 
-### parAzFirewallEnabled
+### parVirtualWanName
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
-Switch to enable/disable Azure Firewall deployment.
+Prefix Used for Virtual WAN.
 
-- Default value: `True`
+- Default value: `[format('{0}-vwan-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]`
 
-### parAzFirewallDnsProxyEnabled
+### parVirtualWanHubName
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
-Switch to enable/disable Azure Firewall DNS Proxy.
+Prefix Used for Virtual WAN Hub.
 
-- Default value: `True`
+- Default value: `[format('{0}-vhub', parameters('parCompanyPrefix'))]`
 
-### parVirtualWanName
+### parVirtualWanHubs
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
-Prefix Used for Virtual WAN.
-
-- Default value: `[format('{0}-vwan-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]`
+Array Used for multiple Virtual WAN Hubs deployment. Each object in the array represents an individual Virtual WAN Hub configuration. Add/remove additional objects in the array to meet the number of Virtual WAN Hubs required.
 
-### parVirtualWanHubName
+- `parVpnGatewayEnabled` - Switch to enable/disable VPN Gateway deployment on the respective Virtual WAN Hub.
+- `parExpressRouteGatewayEnabled` - Switch to enable/disable ExpressRoute Gateway deployment on the respective Virtual WAN Hub.
+- `parAzFirewallEnabled` - Switch to enable/disable Azure Firewall deployment on the respective Virtual WAN Hub.
+- `parVirtualHubAddressPrefix` - The IP address range in CIDR notation for the vWAN virtual Hub to use.
+- `parHublocation` - The Virtual WAN Hub location.
+- `parHubRoutingPreference` - The Virtual WAN Hub routing preference. The allowed values are `ASN`, `VpnGateway`, `ExpressRoute`.
+- `parVirtualRouterAutoScaleConfiguration` - The Virtual WAN Hub capacity. The value should be between 2 to 50.
 
-![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
-Prefix Used for Virtual WAN Hub.
 
-- Default value: `[format('{0}-vhub-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]`
+- Default value: ` `
 
 ### parVpnGatewayName
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
 Prefix Used for VPN Gateway.
 
-- Default value: `[format('{0}-vpngw-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]`
+- Default value: `[format('{0}-vpngw', parameters('parCompanyPrefix'))]`
 
 ### parExpressRouteGatewayName
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
 Prefix Used for ExpressRoute Gateway.
 
-- Default value: `[format('{0}-ergw-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]`
+- Default value: `[format('{0}-ergw', parameters('parCompanyPrefix'))]`
 
 ### parAzFirewallName
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
 
 Azure Firewall Name.
 
-- Default value: `[format('{0}-fw-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]`
+- Default value: `[format('{0}-fw', parameters('parCompanyPrefix'))]`
 
 ### parAzFirewallAvailabilityZones
 
@@ -245,8 +228,8 @@ Name | Type | Description
 ---- | ---- | -----------
 outVirtualWanName | string |
 outVirtualWanId | string |
-outVirtualHubName | string |
-outVirtualHubId | string |
+outVirtualHubName | array |
+outVirtualHubId | array |
 outDdosPlanResourceId | string |
 outPrivateDnsZones | array |
 
@@ -268,41 +251,51 @@ outPrivateDnsZones | array |
         "parCompanyPrefix": {
             "value": "alz"
         },
-        "parVirtualHubAddressPrefix": {
-            "value": "10.100.0.0/23"
-        },
         "parAzFirewallTier": {
             "value": "Standard"
         },
         "parVirtualHubEnabled": {
             "value": true
         },
-        "parVpnGatewayEnabled": {
-            "value": true
-        },
-        "parExpressRouteGatewayEnabled": {
-            "value": true
-        },
-        "parAzFirewallEnabled": {
-            "value": true
-        },
         "parAzFirewallDnsProxyEnabled": {
             "value": true
         },
         "parVirtualWanName": {
             "value": "[format('{0}-vwan-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]"
         },
         "parVirtualWanHubName": {
-            "value": "[format('{0}-vhub-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]"
+            "value": "[format('{0}-vhub', parameters('parCompanyPrefix'))]"
+        },
+        "parVirtualWanHubs": {
+            "value": [
+                {
+                    "parVpnGatewayEnabled": true,
+                    "parExpressRouteGatewayEnabled": true,
+                    "parAzFirewallEnabled": true,
+                    "parVirtualHubAddressPrefix": "10.100.0.0/23",
+                    "parHublocation": "centralus",
+                    "parHubRoutingPreference": "ExpressRoute",
+                    "parVirtualRouterAutoScaleConfiguration": 2
+                },
+                {
+                    "parVpnGatewayEnabled": true,
+                    "parExpressRouteGatewayEnabled": true,
+                    "parAzFirewallEnabled": true,
+                    "parVirtualHubAddressPrefix": "10.110.0.0/23",
+                    "parHublocation": "eastus",
+                    "parHubRoutingPreference": "ExpressRoute",
+                    "parVirtualRouterAutoScaleConfiguration": 2
+                }
+            ]
         },
         "parVpnGatewayName": {
-            "value": "[format('{0}-vpngw-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]"
+            "value": "[format('{0}-vpngw', parameters('parCompanyPrefix'))]"
         },
         "parExpressRouteGatewayName": {
-            "value": "[format('{0}-ergw-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]"
+            "value": "[format('{0}-ergw', parameters('parCompanyPrefix'))]"
         },
         "parAzFirewallName": {
-            "value": "[format('{0}-fw-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]"
+            "value": "[format('{0}-fw', parameters('parCompanyPrefix'))]"
         },
         "parAzFirewallAvailabilityZones": {
             "value": []

infra-as-code/bicep/modules/vwanConnectivity/parameters/mc-vwanConnectivity.parameters.all.json

@@ -8,48 +8,49 @@
     "parCompanyPrefix": {
       "value": "alz"
     },
-    "parVirtualHubAddressPrefix": {
-      "value": "10.100.0.0/23"
-    },
     "parAzFirewallTier": {
       "value": "Standard"
     },
     "parVirtualHubEnabled": {
       "value": true
     },
-    "parVpnGatewayEnabled": {
-      "value": true
-    },
-    "parExpressRouteGatewayEnabled": {
-      "value": true
-    },
-    "parAzFirewallEnabled": {
-      "value": true
-    },
     "parAzFirewallDnsProxyEnabled": {
       "value": true
     },
     "parVirtualWanName": {
       "value": "alz-vwan-chinaeast2"
     },
     "parVirtualWanHubName": {
-      "value": "alz-vhub-chinaeast2"
+      "value": "alz-vhub"
     },
     "parVpnGatewayName": {
-      "value": "alz-vpngw-chinaeast2"
+      "value": "alz-vpngw"
     },
     "parExpressRouteGatewayName": {
-      "value": "alz-ergw-chinaeast2"
+      "value": "alz-ergw"
     },
     "parAzFirewallName": {
-      "value": "alz-fw-chinaeast2"
+      "value": "alz-fw"
     },
     "parAzFirewallAvailabilityZones": {
       "value": []
     },
     "parAzFirewallPoliciesName": {
       "value": "alz-azfwpolicy-chinaeast2"
     },
+    "parVirtualWanHubs": {
+      "value": [
+        {
+          "parVpnGatewayEnabled": true,
+          "parExpressRouteGatewayEnabled": true,
+          "parAzFirewallEnabled": true,
+          "parVirtualHubAddressPrefix": "10.100.0.0/23",
+          "parHublocation": "chinaeast2",
+          "parHubRoutingPreference": "ExpressRoute",
+          "parVirtualRouterAutoScaleConfiguration": 2
+        }
+      ]
+  },
     "parVpnGatewayScaleUnit": {
       "value": 1
     },
@@ -110,4 +111,4 @@
       "value": false
     }
   }
-}
+}

infra-as-code/bicep/modules/vwanConnectivity/parameters/mc-vwanConnectivity.parameters.min.json

@@ -8,23 +8,24 @@
     "parCompanyPrefix": {
       "value": "alz"
     },
-    "parVirtualHubAddressPrefix": {
-      "value": "10.100.0.0/23"
-    },
     "parAzFirewallTier": {
       "value": "Standard"
     },
     "parVirtualHubEnabled": {
       "value": true
     },
-    "parVpnGatewayEnabled": {
-      "value": true
-    },
-    "parExpressRouteGatewayEnabled": {
-      "value": true
-    },
-    "parAzFirewallEnabled": {
-      "value": true
+    "parVirtualWanHubs": {
+      "value": [
+        {
+          "parVpnGatewayEnabled": true,
+          "parExpressRouteGatewayEnabled": true,
+          "parAzFirewallEnabled": true,
+          "parVirtualHubAddressPrefix": "10.100.0.0/23",
+          "parHublocation": "chinaeast2",
+          "parHubRoutingPreference": "ExpressRoute",
+          "parVirtualRouterAutoScaleConfiguration": 2
+        }
+      ]
     },
     "parAzFirewallDnsProxyEnabled": {
       "value": true
@@ -84,4 +85,4 @@
       "value": false
     }
   }
-}
+}