MultipleApipa feature VpnSiteLinkConnection and VirtualNetworkGateway…

…Connection (Azure#17672) * VngConnection * VpnSiteLinkConnection * fixes * fixes * fix2 * fixes Co-authored-by: Khushboo Baheti <khbaheti@microsoft.com>
HappyTobi · Feb 18, 2022 · 745dac6 · 745dac6
1 parent cbe1b57
commit 745dac6
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 0 deletions.
diff --git a/...r/Microsoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionCreate.json b/...r/Microsoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionCreate.json
@@ -64,6 +64,16 @@
             "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/natRules/natRule2"
           }
         ],
+        "gatewayCustomBgpIpAddresses": [
+          {
+            "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/default",
+            "customBgpIpAddress": "169.254.21.1"
+          },
+          {
+            "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/ActiveActive",
+            "customBgpIpAddress": "169.254.21.3"
+          }
+        ],
         "connectionType": "IPsec",
         "connectionProtocol": "IKEv2",
         "routingWeight": 0,
@@ -156,6 +166,16 @@
           "dpdTimeoutSeconds": 30,
           "sharedKey": "Abc123",
           "enableBgp": false,
+          "gatewayCustomBgpIpAddresses": [
+            {
+              "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/default",
+              "customBgpIpAddress": "169.254.21.1"
+            },
+            {
+              "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/ActiveActive",
+              "customBgpIpAddress": "169.254.21.3"
+            }
+          ],
           "useLocalAzureIpAddress": false,
           "usePolicyBasedTrafficSelectors": false,
           "ipsecPolicies": [],

diff --git a/...ager/Microsoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionGet.json b/...ager/Microsoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionGet.json
@@ -40,6 +40,16 @@
           "dpdTimeoutSeconds": 30,
           "sharedKey": "Abc123",
           "enableBgp": false,
+          "gatewayCustomBgpIpAddresses": [
+            {
+              "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/default",
+              "customBgpIpAddress": "169.254.21.1"
+            },
+            {
+              "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/ActiveActive",
+              "customBgpIpAddress": "169.254.21.3"
+            }
+          ],
           "useLocalAzureIpAddress": false,
           "usePolicyBasedTrafficSelectors": false,
           "ipsecPolicies": [],

diff --git a/...crosoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionUpdateTags.json b/...crosoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionUpdateTags.json
@@ -48,6 +48,16 @@
           "routingWeight": 0,
           "sharedKey": "temp1234",
           "enableBgp": false,
+          "gatewayCustomBgpIpAddresses": [
+            {
+              "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/default",
+              "customBgpIpAddress": "169.254.21.1"
+            },
+            {
+              "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/ActiveActive",
+              "customBgpIpAddress": "169.254.21.3"
+            }
+          ],
           "usePolicyBasedTrafficSelectors": false,
           "ipsecPolicies": [],
           "trafficSelectorPolicies": [],

diff --git a/...er/Microsoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionsList.json b/...er/Microsoft.Network/stable/2021-08-01/examples/VirtualNetworkGatewayConnectionsList.json
@@ -40,6 +40,16 @@
               "routingWeight": 0,
               "dpdTimeoutSeconds": 30,
               "enableBgp": false,
+              "gatewayCustomBgpIpAddresses": [
+                {
+                  "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/default",
+                  "customBgpIpAddress": "169.254.21.1"
+                },
+                {
+                  "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw/ipConfigurations/ActiveActive",
+                  "customBgpIpAddress": "169.254.21.3"
+                }
+              ],
               "useLocalAzureIpAddress": false,
               "usePolicyBasedTrafficSelectors": false,
               "ipsecPolicies": [],
@@ -81,6 +91,16 @@
               "routingWeight": 0,
               "dpdTimeoutSeconds": 20,
               "enableBgp": false,
+              "gatewayCustomBgpIpAddresses": [
+                {
+                  "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw2/ipConfigurations/default",
+                  "customBgpIpAddress": "169.254.21.4"
+                },
+                {
+                  "ipConfigurationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworkGateways/vpngw2/ipConfigurations/ActiveActive",
+                  "customBgpIpAddress": "169.254.21.6"
+                }
+              ],
               "useLocalAzureIpAddress": true,
               "usePolicyBasedTrafficSelectors": false,
               "ipsecPolicies": [],

diff --git a/...source-manager/Microsoft.Network/stable/2021-08-01/examples/VpnSiteLinkConnectionGet.json b/...source-manager/Microsoft.Network/stable/2021-08-01/examples/VpnSiteLinkConnectionGet.json
@@ -26,6 +26,16 @@
           "ingressBytesTransferred": 0,
           "egressBytesTransferred": 0,
           "enableBgp": false,
+          "vpnGatewayCustomBgpAddresses": [
+            {
+              "ipConfigurationId": "Instance0",
+              "customBgpIpAddress": "169.254.21.1"
+            },
+            {
+              "ipConfigurationId": "Instance1",
+              "customBgpIpAddress": "169.254.21.3"
+            }
+          ],
           "enableRateLimiting": false,
           "useLocalAzureIpAddress": false,
           "usePolicyBasedTrafficSelectors": false,

diff --git a/...ource-manager/Microsoft.Network/stable/2021-08-01/examples/VpnSiteLinkConnectionList.json b/...ource-manager/Microsoft.Network/stable/2021-08-01/examples/VpnSiteLinkConnectionList.json
@@ -26,6 +26,16 @@
             "ingressBytesTransferred": 0,
             "egressBytesTransferred": 0,
             "enableBgp": false,
+            "vpnGatewayCustomBgpAddresses": [
+              {
+                "ipConfigurationId": "Instance0",
+                "customBgpIpAddress": "169.254.21.1"
+              },
+              {
+                "ipConfigurationId": "Instance1",
+                "customBgpIpAddress": "169.254.21.3"
+              }
+            ],
             "enableRateLimiting": false,
             "useLocalAzureIpAddress": false,
             "usePolicyBasedTrafficSelectors": false,

diff --git a/...n/network/resource-manager/Microsoft.Network/stable/2021-08-01/virtualNetworkGateway.json b/...n/network/resource-manager/Microsoft.Network/stable/2021-08-01/virtualNetworkGateway.json
@@ -3449,6 +3449,14 @@
           "type": "boolean",
           "description": "EnableBgp flag."
         },
+        "gatewayCustomBgpIpAddresses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GatewayCustomBgpIpAddressIpConfiguration"
+          },
+          "description": "GatewayCustomBgpIpAddresses to be used for virtual network gateway Connection.",
+          "x-ms-identifiers": []
+        },
         "useLocalAzureIpAddress": {
           "type": "boolean",
           "description": "Use private local Azure IP for the connection."
@@ -3852,6 +3860,14 @@
           "type": "boolean",
           "description": "EnableBgp flag."
         },
+        "gatewayCustomBgpIpAddresses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GatewayCustomBgpIpAddressIpConfiguration"
+          },
+          "description": "GatewayCustomBgpIpAddresses to be used for virtual network gateway Connection.",
+          "x-ms-identifiers": []
+        },
         "usePolicyBasedTrafficSelectors": {
           "type": "boolean",
           "description": "Enable policy-based traffic selectors."
@@ -4227,6 +4243,24 @@
         }
       },
       "description": "Properties of IPConfigurationBgpPeeringAddress."
+    },
+    "GatewayCustomBgpIpAddressIpConfiguration": {
+      "type": "object",
+      "properties": {
+        "ipConfigurationId": {
+          "type": "string",
+          "description": "The IpconfigurationId of ipconfiguration which belongs to gateway."
+        },
+        "customBgpIpAddress": {
+          "type": "string",
+          "description": "The custom BgpPeeringAddress which belongs to IpconfigurationId."
+        }
+      },
+      "required": [
+        "ipConfigurationId",
+        "customBgpIpAddress"
+      ],
+      "description": "GatewayCustomBgpIpAddressIpConfiguration for a virtual network gateway connection."
     }
   }
 }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/virtualWan.json
@@ -6828,6 +6828,14 @@
           "type": "boolean",
           "description": "EnableBgp flag."
         },
+        "vpnGatewayCustomBgpAddresses": {
+          "type": "array",
+          "items": {
+            "$ref": "./virtualNetworkGateway.json#/definitions/GatewayCustomBgpIpAddressIpConfiguration"
+          },
+          "description": "vpnGatewayCustomBgpAddresses used by this connection.",
+          "x-ms-identifiers": []
+        },
         "usePolicyBasedTrafficSelectors": {
           "type": "boolean",
           "description": "Enable policy-based traffic selectors."