Adding VpnSiteLink and VpnSiteLinkConnection properties. (#6528)

* Added VpnSiteLink/VpnSiteLinkConnection operations. * Sdk changes for vpn site link. * Fixing error. * Fixing more comments. * Fixing json error. * Fixing json files. * Fixing comments. * Fixing more issues. * Fixing more errors. * Fixing more error. * Prettify JSON in VpnConnectionGet.json * Resolving more comments. * Fixing typo. * Adding type in examples of put. * Removing Child resource type.
Azure · Jul 16, 2019 · 293c053 · 293c053
1 parent 33dbdc1
commit 293c053
Show file tree

Hide file tree

Showing 16 changed files with 1,135 additions and 153 deletions.
diff --git a/...twork/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json b/...twork/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionGet.json
@@ -17,17 +17,57 @@
           "remoteVpnSite": {
             "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
           },
-          "connectionStatus": "Connected",
-          "vpnConnectionProtocolType": "IKEv2",
+          "enableInternetSecurity": false,
           "ingressBytesTransferred": 0,
           "egressBytesTransferred": 0,
-          "routingWeight": 0,
-          "connectionBandwidth": 100,
-          "sharedKey": "key",
-          "enableBgp": false,
-          "usePolicyBasedTrafficSelectors": false,
-          "useLocalAzureIpAddress": false,
-          "ipsecPolicies": []
+          "vpnLinkConnections": [
+                {
+                    "name": "Connection-Link1",
+                    "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1",
+                    "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                    "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                    "properties": {
+                        "provisioningState": "Succeeded",
+                        "vpnSiteLink": {
+                            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1"
+                        },
+                        "connectionBandwidth": 200,
+                        "ipsecPolicies": [],
+                        "vpnConnectionProtocolType": "IKEv2",
+                        "sharedKey": "key",
+                        "ingressBytesTransferred": 0,
+                        "egressBytesTransferred": 0,
+                        "enableBgp": false,
+                        "enableRateLimiting": false,
+                        "useLocalAzureIpAddress": false,
+                        "usePolicyBasedTrafficSelectors": false,
+                        "routingWeight": 0
+                    }
+                },
+                {
+                    "name": "Connection-Link2",
+                    "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2",
+                    "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                    "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                    "properties": {
+                        "provisioningState": "Succeeded",
+                        "vpnSiteLink": {
+                            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2"
+                        },
+                        "connectionBandwidth": 200,
+                        "ipsecPolicies": [],
+                        "vpnConnectionProtocolType": "IKEv2",
+                        "sharedKey": "key",
+                        "ingressBytesTransferred": 0,
+                        "egressBytesTransferred": 0,
+                        "enableBgp": false,
+                        "enableRateLimiting": false,
+                        "useLocalAzureIpAddress": false,
+                        "usePolicyBasedTrafficSelectors": false,
+                        "routingWeight": 0
+                    }
+                }
+            ]
         }
       }
     }

diff --git a/...work/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json b/...work/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionList.json
@@ -17,20 +17,60 @@
             "remoteVpnSite": {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
             },
-            "connectionStatus": "Connected",
-            "vpnConnectionProtocolType": "IKEv1",
+            "enableInternetSecurity": false,
             "ingressBytesTransferred": 0,
             "egressBytesTransferred": 0,
-            "routingWeight": 0,
-            "connectionBandwidth": 100,
-            "sharedKey": "key",
-            "enableBgp": false,
-            "usePolicyBasedTrafficSelectors": false,
-            "useLocalAzureIpAddress": false,
-            "ipsecPolicies": []
+            "vpnLinkConnections": [
+              {
+                "name": "Connection-Link1",
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1",
+                "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                "properties": {
+                  "provisioningState": "Succeeded",
+                  "vpnSiteLink": {
+                    "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1"
+                  },
+                  "connectionBandwidth": 200,
+                  "ipsecPolicies": [],
+                  "vpnConnectionProtocolType": "IKEv2",
+                  "sharedKey": "key",
+                  "ingressBytesTransferred": 0,
+                  "egressBytesTransferred": 0,
+                  "enableBgp": false,
+                  "enableRateLimiting": false,
+                  "useLocalAzureIpAddress": false,
+                  "usePolicyBasedTrafficSelectors": false,
+                  "routingWeight": 0
+                }
+              },
+              {
+                "name": "Connection-Link2",
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2",
+                "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                "properties": {
+                  "provisioningState": "Succeeded",
+                  "vpnSiteLink": {
+                    "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2"
+                  },
+                  "connectionBandwidth": 200,
+                  "ipsecPolicies": [],
+                  "vpnConnectionProtocolType": "IKEv2",
+                  "sharedKey": "key",
+                  "ingressBytesTransferred": 0,
+                  "egressBytesTransferred": 0,
+                  "enableBgp": false,
+                  "enableRateLimiting": false,
+                  "useLocalAzureIpAddress": false,
+                  "usePolicyBasedTrafficSelectors": false,
+                  "routingWeight": 0
+                }
+              }
+            ]
           }
         }
       ]
     }
   }
-}
+}
diff --git a/...twork/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json b/...twork/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnConnectionPut.json
@@ -10,8 +10,19 @@
         "remoteVpnSite": {
           "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
         },
-        "vpnConnectionProtocolType": "IKEv1",
-        "sharedKey": "key"
+        "vpnLinkConnections": [
+          {
+            "name": "Connection-Link1",
+            "properties": {
+              "vpnSiteLink": {
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1"
+              },
+              "connectionBandwidth": 200,
+              "vpnConnectionProtocolType": "IKEv2",
+              "sharedKey": "key"
+            }
+          }
+        ]
       }
     }
   },
@@ -25,40 +36,74 @@
         "remoteVpnSite": {
           "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
         },
-        "connectionStatus": "Connected",
-        "vpnConnectionProtocolType": "IKEv1",
+        "enableInternetSecurity": false,
         "ingressBytesTransferred": 0,
         "egressBytesTransferred": 0,
-        "routingWeight": 0,
-        "connectionBandwidth": 100,
-        "sharedKey": "key",
-        "enableBgp": false,
-        "usePolicyBasedTrafficSelectors": false,
-        "useLocalAzureIpAddress": false,
-        "ipsecPolicies": []
+        "vpnLinkConnections": [
+          {
+            "name": "Connection-Link1",
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1",
+            "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+            "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "vpnSiteLink": {
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1"
+              },
+              "connectionBandwidth": 200,
+              "ipsecPolicies": [],
+              "vpnConnectionProtocolType": "IKEv2",
+              "sharedKey": "key",
+              "ingressBytesTransferred": 0,
+              "egressBytesTransferred": 0,
+              "enableBgp": false,
+              "enableRateLimiting": false,
+              "useLocalAzureIpAddress": false,
+              "usePolicyBasedTrafficSelectors": false,
+              "routingWeight": 0
+            }
+          }
+        ]
       }
     },
     "201": {
       "name": "vpnConnection1",
       "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1",
       "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+      "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
       "properties": {
         "provisioningState": "Succeeded",
         "remoteVpnSite": {
           "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
         },
-        "connectionStatus": "Connected",
-        "vpnConnectionProtocolType": "IKEv1",
+        "enableInternetSecurity": false,
         "ingressBytesTransferred": 0,
         "egressBytesTransferred": 0,
-        "routingWeight": 0,
-        "connectionBandwidth": 100,
-        "sharedKey": "key",
-        "enableBgp": false,
-        "usePolicyBasedTrafficSelectors": false,
-        "useLocalAzureIpAddress": false,
-        "ipsecPolicies": []
+        "vpnLinkConnections": [
+          {
+            "name": "Connection-Link1",
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1",
+            "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "vpnSiteLink": {
+                "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1"
+              },
+              "connectionBandwidth": 200,
+              "ipsecPolicies": [],
+              "vpnConnectionProtocolType": "IKEv2",
+              "sharedKey": "key",
+              "ingressBytesTransferred": 0,
+              "egressBytesTransferred": 0,
+              "enableBgp": false,
+              "enableRateLimiting": false,
+              "useLocalAzureIpAddress": false,
+              "usePolicyBasedTrafficSelectors": false,
+              "routingWeight": 0
+            }
+          }
+        ]
       }
     }
   }
-}
+}
diff --git a/.../network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json b/.../network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayGet.json
@@ -28,15 +28,57 @@
                 "remoteVpnSite": {
                   "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
                 },
-                "connectionStatus": "Connected",
+                "enableInternetSecurity": false,
                 "ingressBytesTransferred": 0,
                 "egressBytesTransferred": 0,
-                "routingWeight": 0,
-                "connectionBandwidth": 100,
-                "sharedKey": "key",
-                "enableBgp": false,
-                "useLocalAzureIpAddress": false,
-                "ipsecPolicies": []
+                "vpnLinkConnections": [
+                  {
+                    "name": "Connection-Link1",
+                    "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1",
+                    "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                    "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                    "properties": {
+                      "provisioningState": "Succeeded",
+                      "vpnSiteLink": {
+                        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1"
+                      },
+                      "connectionBandwidth": 200,
+                      "ipsecPolicies": [],
+                      "vpnConnectionProtocolType": "IKEv2",
+                      "sharedKey": "key",
+                      "ingressBytesTransferred": 0,
+                      "egressBytesTransferred": 0,
+                      "enableBgp": false,
+                      "enableRateLimiting": false,
+                      "useLocalAzureIpAddress": false,
+                      "usePolicyBasedTrafficSelectors": false,
+                      "routingWeight": 0
+                    }
+                  },
+                  {
+                    "name": "Connection-Link2",
+                    "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2",
+                    "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                    "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                    "properties": {
+                      "provisioningState": "Succeeded",
+                      "vpnSiteLink": {
+                        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2"
+                      },
+                      "connectionBandwidth": 200,
+                      "ipsecPolicies": [],
+                      "vpnConnectionProtocolType": "IKEv2",
+                      "sharedKey": "key",
+                      "ingressBytesTransferred": 0,
+                      "egressBytesTransferred": 0,
+                      "enableBgp": false,
+                      "enableRateLimiting": false,
+                      "useLocalAzureIpAddress": false,
+                      "usePolicyBasedTrafficSelectors": false,
+                      "routingWeight": 0
+                    }
+                  }
+                ]
               }
             }
           ],
@@ -49,4 +91,4 @@
       }
     }
   }
-}
+}
diff --git a/...network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json b/...network/resource-manager/Microsoft.Network/stable/2019-06-01/examples/VpnGatewayList.json
@@ -29,15 +29,57 @@
                     "remoteVpnSite": {
                       "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
                     },
-                    "connectionStatus": "Connected",
+                    "enableInternetSecurity": false,
                     "ingressBytesTransferred": 0,
                     "egressBytesTransferred": 0,
-                    "routingWeight": 0,
-                    "connectionBandwidth": 100,
-                    "sharedKey": "key",
-                    "enableBgp": false,
-                    "useLocalAzureIpAddress": false,
-                    "ipsecPolicies": []
+                    "vpnLinkConnections": [
+                      {
+                        "name": "Connection-Link1",
+                        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link1",
+                        "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                        "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                        "properties": {
+                          "provisioningState": "Succeeded",
+                          "vpnSiteLink": {
+                            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink1"
+                          },
+                          "connectionBandwidth": 200,
+                          "ipsecPolicies": [],
+                          "vpnConnectionProtocolType": "IKEv2",
+                          "sharedKey": "key",
+                          "ingressBytesTransferred": 0,
+                          "egressBytesTransferred": 0,
+                          "enableBgp": false,
+                          "enableRateLimiting": false,
+                          "useLocalAzureIpAddress": false,
+                          "usePolicyBasedTrafficSelectors": false,
+                          "routingWeight": 0
+                        }
+                      },
+                      {
+                        "name": "Connection-Link2",
+                        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/gateway1/vpnConnections/vpnConnection1/VpnSiteLinkConnections/Connection-Link2",
+                        "type": "Microsoft.Network/vpnGateways/vpnConnections/VpnSiteLinkConnections",
+                        "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                        "properties": {
+                          "provisioningState": "Succeeded",
+                          "vpnSiteLink": {
+                            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1/vpnSiteLinks/siteLink2"
+                          },
+                          "connectionBandwidth": 200,
+                          "ipsecPolicies": [],
+                          "vpnConnectionProtocolType": "IKEv2",
+                          "sharedKey": "key",
+                          "ingressBytesTransferred": 0,
+                          "egressBytesTransferred": 0,
+                          "enableBgp": false,
+                          "enableRateLimiting": false,
+                          "useLocalAzureIpAddress": false,
+                          "usePolicyBasedTrafficSelectors": false,
+                          "routingWeight": 0
+                        }
+                      }
+                    ]
                   }
                 }
               ],
@@ -92,4 +134,4 @@
       }
     }
   }
-}
+}