Add ExpressRoute gateway resource (#3776)

jjaviercv-msft · jianghaolu · commit 57fc3dfa0478 · 2018-09-02T21:51:20.000-07:00
* Initial version

* Refactor connections.

* Update API version

* Add enum values.

* Addressed all comments.
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json
@@ -33,7 +33,10 @@
           "state": "Enabled",
           "vlanId": 200,
           "gatewayManagerEtag": "",
-          "lastModifiedBy": "Customer"
+          "lastModifiedBy": "Customer",
+          "expressRouteConnection": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"
+          }
         }
       }
     },
@@ -54,7 +57,8 @@
           "state": "Enabled",
           "vlanId": 200,
           "gatewayManagerEtag": "",
-          "lastModifiedBy": "Customer"
+          "lastModifiedBy": "Customer",
+          "expressRouteConnection": ""
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringGet.json
@@ -1,55 +1,55 @@
 {
-   "parameters": {
-      "circuitName": "circuitName",
-      "resourceGroupName": "rg1",
-      "api-version": "2018-08-01",
-      "subscriptionId": "subid",
-      "peeringName": "MicrosoftPeering"
-   },
-   "responses": {
-      "200": {
-         "name": "MicrosoftPeering",
-         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/MicrosoftPeering",
-         "etag": "W/\"b2a25b98-2e6d-4d46-87f2-089de5f6fdf9\"",
-         "properties": {
-            "provisioningState": "Succeeded",
-            "peeringType": "MicrosoftPeering",
-            "azureASN": 12076,
-            "peerASN": 100,
-            "primaryPeerAddressPrefix": "123.0.0.0/30",
-            "secondaryPeerAddressPrefix": "123.0.0.4/30",
-            "primaryAzurePort": "A51-TEST-06GMR-CIS-1-PRI-A",
-            "secondaryAzurePort": "A51-TEST-06GMR-CIS-2-SEC-A",
-            "state": "Enabled",
-            "vlanId": 300,
-            "gatewayManagerEtag": "103",
-            "lastModifiedBy": "Customer",
-            "microsoftPeeringConfig": {
-               "advertisedPublicPrefixes": [
-                  "123.1.0.0/24"
-               ],
-               "advertisedCommunities": [],
-               "advertisedPublicPrefixesState": "ValidationNeeded",
-               "customerASN": 23,
-               "legacyMode": 0,
-               "routingRegistryName": "ARIN"
-            },
-            "ipv6PeeringConfig": {
-               "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
-               "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
-               "state": "Enabled",
-               "microsoftPeeringConfig": {
-                  "advertisedPublicPrefixes": [
-                     "3FFE:FFFF:0:CD31::/120"
-                  ],
-                  "advertisedCommunities": [],
-                  "advertisedPublicPrefixesState": "ValidationNeeded",
-                  "customerASN": 23,
-                  "legacyMode": 0,
-                  "routingRegistryName": "ARIN"
-               }
+    "parameters": {
+        "circuitName": "circuitName",
+        "resourceGroupName": "rg1",
+        "api-version": "2018-08-01",
+        "subscriptionId": "subid",
+        "peeringName": "MicrosoftPeering"
+    },
+    "responses": {
+        "200": {
+            "name": "MicrosoftPeering",
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/MicrosoftPeering",
+            "etag": "W/\"b2a25b98-2e6d-4d46-87f2-089de5f6fdf9\"",
+            "properties": {
+                "provisioningState": "Succeeded",
+                "peeringType": "MicrosoftPeering",
+                "azureASN": 12076,
+                "peerASN": 100,
+                "primaryPeerAddressPrefix": "123.0.0.0/30",
+                "secondaryPeerAddressPrefix": "123.0.0.4/30",
+                "primaryAzurePort": "A51-TEST-06GMR-CIS-1-PRI-A",
+                "secondaryAzurePort": "A51-TEST-06GMR-CIS-2-SEC-A",
+                "state": "Enabled",
+                "vlanId": 300,
+                "gatewayManagerEtag": "103",
+                "lastModifiedBy": "Customer",
+                "microsoftPeeringConfig": {
+                    "advertisedPublicPrefixes": [
+                        "123.1.0.0/24"
+                    ],
+                    "advertisedCommunities": [],
+                    "advertisedPublicPrefixesState": "ValidationNeeded",
+                    "customerASN": 23,
+                    "legacyMode": 0,
+                    "routingRegistryName": "ARIN"
+                },
+                "ipv6PeeringConfig": {
+                    "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126",
+                    "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126",
+                    "state": "Enabled",
+                    "microsoftPeeringConfig": {
+                        "advertisedPublicPrefixes": [
+                            "3FFE:FFFF:0:CD31::/120"
+                        ],
+                        "advertisedCommunities": [],
+                        "advertisedPublicPrefixesState": "ValidationNeeded",
+                        "customerASN": 23,
+                        "legacyMode": 0,
+                        "routingRegistryName": "ARIN"
+                    }
+                }
             }
-         }
-      }
-   }
+        }
+    }
 }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json
@@ -49,7 +49,8 @@
                         "legacyMode": 0,
                         "routingRegistryName": "ARIN"
                      }
-                  }
+                  },
+                  "expressRouteConnection": ""
                }
             },
             {
@@ -68,7 +69,10 @@
                   "state": "Enabled",
                   "vlanId": 200,
                   "gatewayManagerEtag": "103",
-                  "lastModifiedBy": "Customer"
+                  "lastModifiedBy": "Customer",
+                  "expressRouteConnection": {
+                    "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"
+                  }
                }
             }
          ]
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionCreate.json
@@ -0,0 +1,50 @@
+{
+    "parameters": {
+        "expressRouteGatewayName": "expressRouteGatewayName",
+        "resourceGroupName": "resourceGroupName",
+        "api-version": "2018-08-01",
+        "subscriptionId": "subid",
+        "connectionName": "connectionName",
+        "putExpressRouteConnectionParameters": {
+            "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName",
+            "name": "connectionName",
+            "properties": {
+                "routingWeight": 2,
+                "authorizationKey": "authorizationKey",
+                "expressRouteCircuitPeering": {
+                    "id": "/subscriptions/subid2/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
+                }
+            }
+        }
+    },
+    "responses": {
+        "200": {
+            "body": {
+                "name": "connectionName",
+                "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName",
+                "properties": {
+                    "provisioningState": "Provisioned",
+                    "expressRouteCircuitPeering": {
+                        "id": "/subscriptions/subid2/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
+                    },
+                    "authorizationKey": "authorizationKey",
+                    "routingWeight": 2
+                }
+            }
+        },
+        "201": {
+            "body": {
+                "name": "connectionName",
+                "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName",
+                "properties": {
+                    "provisioningState": "Provisioned",
+                    "expressRouteCircuitPeering": {
+                        "id": "/subscriptions/subid2/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
+                    },
+                    "authorizationKey": "authorizationKey",
+                    "routingWeight": 2
+                }
+            }
+        }
+    }
+}
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionDelete.json
@@ -0,0 +1,14 @@
+{
+    "parameters": {
+      "expressRouteGatewayName": "expressRouteGatewayName",
+      "resourceGroupName": "resourceGroupName",
+      "connectionName": "connectionName",
+      "api-version": "2018-08-01",
+      "subscriptionId": "subid"
+    },
+    "responses": {
+      "202": {},
+      "200": {},
+      "204": {}
+    }
+  }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionGet.json
@@ -0,0 +1,25 @@
+{
+  "parameters": {
+    "expressRouteGatewayName": "expressRouteGatewayName",
+    "resourceGroupName": "resourceGroupName",
+    "api-version": "2018-08-01",
+    "subscriptionId": "subid",
+    "connectionName": "connectionName"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "connectionName",
+        "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName",
+        "properties": {
+          "provisioningState": "Provisioned",
+          "expressRouteCircuitPeering": {
+            "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
+          },
+          "authorizationKey": "authorizationKey",
+          "routingWeight": 1
+        }
+      }
+    }
+  }
+}
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteConnectionList.json
@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "api-version": "2018-08-01",
+    "resourceGroupName": "resourceGroupName",
+    "expressRouteGatewayName": "expressRouteGatewayName",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "connectionName",
+            "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName",
+            "properties": {
+              "provisioningState": "Provisioned",
+              "expressRouteCircuitPeering": {
+                "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering"
+              },
+              "authorizationKey": "authorizationKey",
+              "routingWeight": 1
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayCreate.json
@@ -0,0 +1,65 @@
+{
+    "parameters": {
+        "expressRouteGatewayName": "gateway-2",
+        "subscriptionId": "subid",
+        "resourceGroupName": "resourceGroupName",
+        "api-version": "2018-08-01",
+        "putExpressRouteGatewayParameters": {
+            "name": "gateway-2",
+            "type": "Microsoft.Network/expressRouteGateways",
+            "location": "westus",
+            "properties": {
+                "virtualHub": {
+                    "id": "/subscriptions/subid/resourceGroups/resourceGroupId/providers/Microsoft.Network/virtualHubs/virtualHubName"
+                },
+                "autoScaleConfiguration": {
+                    "bounds": {
+                        "min": 3
+                    }
+                }
+            }
+        }
+    },
+    "responses": {
+        "201": {
+            "body": {
+                "name": "gateway-2",
+                "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/gateway-2",
+                "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                "location": "westus",
+                "type": "Microsoft.Network/expressRouteGateways",
+                "properties": {
+                    "provisioningState": "Succeeded",
+                    "virtualHub": {
+                        "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName"
+                    },
+                    "autoScaleConfiguration": {
+                        "bounds": {
+                            "min": 3
+                        }
+                    }
+                }
+            }
+        },
+        "200": {
+            "body": {
+                "name": "gateway-2",
+                "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/gateway-2",
+                "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                "location": "westus",
+                "type": "Microsoft.Network/expressRouteGateways",
+                "properties": {
+                    "provisioningState": "Succeeded",
+                    "virtualHub": {
+                        "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName"
+                    },
+                    "autoScaleConfiguration": {
+                        "bounds": {
+                            "min": 3
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayDelete.json
@@ -0,0 +1,13 @@
+{
+  "parameters": {
+    "expressRouteGatewayName": "expressRouteGatewayName",
+    "resourceGroupName": "resourceGroupName",
+    "api-version": "2018-08-01",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "202": {},
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayGet.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "expressRouteGatewayName": "expressRouteGatewayName",
+    "resourceGroupName": "resourceGroupName",
+    "api-version": "2018-08-01",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "expressRouteGatewayName",
+        "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName",
+        "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+        "location": "westus",
+        "type": "Microsoft.Network/expressRouteGateways",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "virtualHub": {
+            "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName"
+          }
+        }
+      }
+    },
+    "404": {}
+  }
+}
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayListByResourceGroup.json
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteGatewayListBySubscription.json
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteCircuit.json
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json
diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,10 @@`
`33`	`33`	`"state": "Enabled",`
`34`	`34`	`"vlanId": 200,`
`35`	`35`	`"gatewayManagerEtag": "",`
`36`		`- "lastModifiedBy": "Customer"`
	`36`	`+ "lastModifiedBy": "Customer",`
	`37`	`+ "expressRouteConnection": {`
	`38`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"`
	`39`	`+ }`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`	`},`
`@@ -54,7 +57,8 @@`
`54`	`57`	`"state": "Enabled",`
`55`	`58`	`"vlanId": 200,`
`56`	`59`	`"gatewayManagerEtag": "",`
`57`		`- "lastModifiedBy": "Customer"`
	`60`	`+ "lastModifiedBy": "Customer",`
	`61`	`+ "expressRouteConnection": ""`
`58`	`62`	`}`
`59`	`63`	`}`
`60`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@`
`49`	`49`	`"legacyMode": 0,`
`50`	`50`	`"routingRegistryName": "ARIN"`
`51`	`51`	`}`
`52`		`- }`
	`52`	`+ },`
	`53`	`+ "expressRouteConnection": ""`
`53`	`54`	`}`
`54`	`55`	`},`
`55`	`56`	`{`
`@@ -68,7 +69,10 @@`
`68`	`69`	`"state": "Enabled",`
`69`	`70`	`"vlanId": 200,`
`70`	`71`	`"gatewayManagerEtag": "103",`
`71`		`- "lastModifiedBy": "Customer"`
	`72`	`+ "lastModifiedBy": "Customer",`
	`73`	`+ "expressRouteConnection": {`
	`74`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName"`
	`75`	`+ }`
`72`	`76`	`}`
`73`	`77`	`}`
`74`	`78`	`]`