From a3444ab1f42cbcdf4500f5068729f6bed5fb2346 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Thu, 23 Apr 2020 17:30:58 -0700 Subject: [PATCH 01/20] add HubRouteTables specs to virtualWan.json --- .../stable/2020-04-01/virtualWan.json | 350 ++++++++++++++++++ 1 file changed, 350 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 728f7d84c8dd..abfc7195f718 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3648,6 +3648,240 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{hubRouteTableName}": { + "put": { + "operationId": "HubRouteTables_CreateOrUpdate", + "x-ms-examples": { + "HubRouteTablePut": { + "$ref": "./examples/HubRouteTablePut.json" + } + }, + "description": "Creates a HubRouteTable resource if it doesn't exist else updates the existing HubRouteTable.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VirtualHub." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "name": "routeTableName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the HubRouteTable." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "name": "HubRouteTableParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/HubRouteTable" + }, + "description": "Parameters supplied to create or update HubRouteTable." + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the HubRouteTable created or updated.", + "schema": { + "$ref": "#/definitions/HubRouteTable" + } + }, + "201": { + "description": "Request received successfully. Returns the details of the HubRouteTable created or updated.", + "schema": { + "$ref": "#/definitions/HubRouteTable" + } + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "get": { + "operationId": "HubRouteTables_Get", + "x-ms-examples": { + "HubRouteTableGet": { + "$ref": "./examples/HubRouteTableGet.json" + } + }, + "description": "Retrieves the details of a HubRouteTable.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VirtualHub." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "name": "hubRouteTableName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the hubRouteTable." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of the HubRouteTable retrieved.", + "schema": { + "$ref": "#/definitions/HubRouteTable" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + } + }, + "delete": { + "operationId": "HubRouteTables_Delete", + "x-ms-examples": { + "HubRouteTableDelete": { + "$ref": "./examples/HubRouteTableDelete.json" + } + }, + "description": "Deletes a HubRouteTable.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the HubRouteTable." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "name": "routeTableName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the HubRouteTable." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. HubRouteTable deleted." + }, + "202": { + "description": "Request received successfully. HubRouteTable deletion is in progress; follow the Location header to poll for final outcome." + }, + "204": { + "description": "No HubRouteTables exist by the name provided." + }, + "default": { + "description": "Error.", + "schema": { + "$ref": "./network.json#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables":{ + "get": { + "operationId": "HubRouteTables_List", + "x-ms-examples": { + "HubRouteTableList": { + "$ref": "./examples/HubRouteTableList.json" + } + }, + "description": "Retrieves the details of all HubRouteTables.", + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The resource group name of the VirtualHub." + }, + { + "name": "virtualHubName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the VirtualHub." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns the details of all the HubRouteTables for the VirtualHub.", + "schema": { + "$ref": "#/definitions/ListHubRouteTablesResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } } }, "definitions": { @@ -3951,6 +4185,13 @@ "$ref": "#/definitions/VirtualHubRouteTable", "description": "The routeTable associated with this virtual hub." }, + "HubRouteTables": { + "type": "array", + "description": "List of all virtual hub route table v2s associated with this VirtualHub.", + "items": { + "$ref": "#/definitions/HubRouteTables" + } + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -4419,6 +4660,115 @@ } } }, + "HubRouteTableProperties": { + "properties": { + "routes": { + "type": "array", + "description": "List of all routes.", + "items": { + "$ref": "#/definitions/HubRoute" + } + }, + "labels": { + "type": "array", + "description": "List of all connections attached to this route table.", + "items": { + "type": "string" + } + }, + "associatedConnections": { + "type": "array", + "description": "List of all connections associated with this route table.", + "items": { + "type": "string" + } + }, + "propagatingConnections": { + "type": "array", + "description": "List of all connections that this route table propagates to.", + "items": { + "type": "string" + } + }, + "provisioningState": { + "$ref": "./network.json#/definitions/ProvisioningState", + "readOnly": true, + "description": "The provisioning state of the virtual hub route table resource." + } + }, + "description": "Parameters for HubRouteTable." + }, + "HubRouteTable": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/HubRouteTableProperties", + "description": "Properties of the virtual hub route table." + }, + "name": { + "type": "string", + "description": "The name of the resource that is unique within a resource group. This name can be used to access the resource." + }, + "etag": { + "type": "string", + "readOnly": true, + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ], + "description": "HubRouteTable Resource." + }, + "HubRoute": { + "properties": { + "name": { + "type": "string", + "description": "The name of the HubRoute that is unique within a HubRouteTable. This name can be used to access this route." + }, + "destinationType": { + "type": "string", + "description": "The type of destinations." + }, + "destinations": { + "type": "array", + "description": "List of all destinations.", + "items": { + "type": "string" + } + }, + "nextHopType": { + "type": "string", + "description": "The type of next hops." + }, + "nextHop": { + "type": "array", + "description": "NextHop resource ID.", + "items": { + "type": "string" + } + } + }, + "description": "HubRouteTable route." + }, + "ListHubRouteTablesResult": { + "description": "List of HubRouteTables and a URL nextLink to get the next set of results.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/HubRouteTable" + }, + "description": "List of HubRouteTables." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results if there are any." + } + } + }, "VpnSiteId": { "properties": { "vpnSite": { From 5b3e2170123f59e896ce4ce4d681557514cfef39 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Fri, 24 Apr 2020 12:14:59 -0700 Subject: [PATCH 02/20] updated RoutingConfiguration as a connection property --- .../stable/2020-04-01/virtualWan.json | 88 ++++++++++++++++++- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index abfc7195f718..07e748208be9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4187,7 +4187,7 @@ }, "HubRouteTables": { "type": "array", - "description": "List of all virtual hub route table v2s associated with this VirtualHub.", + "description": "List of all HubRouteTables associated with this VirtualHub.", "items": { "$ref": "#/definitions/HubRouteTables" } @@ -4434,6 +4434,10 @@ "items": { "$ref": "#/definitions/VpnSiteLinkConnection" } + }, + "routingConfiguration": { + "$ref": "#/definitions/RoutingConfiguration", + "description": "TODO" } }, "description": "Parameters for VpnConnection." @@ -4612,6 +4616,10 @@ "type": "boolean", "description": "Enable internet security." }, + "routingConfiguration": { + "$ref": "#/definitions/RoutingConfiguration", + "description": "TODO" + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -4685,7 +4693,7 @@ }, "propagatingConnections": { "type": "array", - "description": "List of all connections that this route table propagates to.", + "description": "List of all connections that advertise to this route table.", "items": { "type": "string" } @@ -4693,7 +4701,7 @@ "provisioningState": { "$ref": "./network.json#/definitions/ProvisioningState", "readOnly": true, - "description": "The provisioning state of the virtual hub route table resource." + "description": "The provisioning state of the HubRouteTable resource." } }, "description": "Parameters for HubRouteTable." @@ -4703,7 +4711,7 @@ "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/HubRouteTableProperties", - "description": "Properties of the virtual hub route table." + "description": "Properties of the HubRouteTable resource." }, "name": { "type": "string", @@ -5329,6 +5337,10 @@ "$ref": "./virtualNetwork.json#/definitions/AddressSpace", "description": "The reference to the address space resource which represents Address space for P2S VpnClient." }, + "routingConfiguration": { + "$ref": "#/definitions/RoutingConfiguration", + "description": "TODO" + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -5592,6 +5604,10 @@ "enableInternetSecurity": { "type": "boolean", "description": "Enable internet security." + }, + "routingConfiguration": { + "$ref": "#/definitions/RoutingConfiguration", + "description": "TODO" } }, "description": "Properties of the ExpressRouteConnection subresource." @@ -5629,6 +5645,70 @@ } }, "description": "ExpressRouteConnection list." + }, + "RoutingConfiguration": { + "properties": { + "associatedRouteTable": { + "$ref": "./network.json#/definitions/SubResource", + "description": "TODO The HubRouteTable associated with this RoutingConfiguration." + }, + "propagatedRouteTables": { + "$ref": "#/definitions/PropagatedRouteTable", + "description": "TODO List of HubRouteTables to advertise the routes to." + }, + "vnetRoutes": { + "$ref" : "#/definitions/VnetRoute", + "description": "TODO" + } + } + }, + "PropagatedRouteTable": { + "properties": { + "labels": { + "type": "array", + "description": "TODO", + "items": { + "type": "string" + } + }, + "ids": { + "type": "array", + "description": "TODO The list of all the HubRouteTables.", + "items": { + "$ref": "./network.json#/definitions/SubResource" + } + } + } + }, + "VnetRoute": { + "properties": { + "staticRoutes": { + "type": "array", + "description": "List of all Static Routes", + "items": { + "$ref": "#/definitions/StaticRoute" + } + } + } + }, + "StaticRoute": { + "properties": { + "name": { + "type": "string", + "description": "The name of the StaticRoute that is unique within a VnetRoute." + }, + "addressPrefixes": { + "type": "array", + "description": "List of all address prefixes.", + "items": { + "type": "string" + } + }, + "nextHopIpAddress": { + "type": "string", + "description": "The ip address of the next hop." + } + } } } } From 970f07defbca2379b9e14a705938c62091ca5d59 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Sat, 25 Apr 2020 13:20:12 -0700 Subject: [PATCH 03/20] added examples for hubRouteTable --- .../examples/HubRouteTableDelete.json | 14 +++ .../2020-04-01/examples/HubRouteTableGet.json | 47 ++++++++ .../examples/HubRouteTableList.json | 81 +++++++++++++ .../2020-04-01/examples/HubRouteTablePut.json | 112 ++++++++++++++++++ .../2020-04-01/examples/VirtualHubGet.json | 1 + .../2020-04-01/examples/VirtualHubList.json | 2 + .../VirtualHubListByResourceGroup.json | 2 + .../2020-04-01/examples/VirtualHubPut.json | 2 + .../stable/2020-04-01/virtualWan.json | 4 +- 9 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json new file mode 100644 index 000000000000..3def92470ec9 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "hubRouteTableName": "hubRouteTable1", + "resourceGroupName": "rg1", + "api-version": "2020-04-01", + "subscriptionId": "subid", + "virtualHubName": "virtualHub1" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json new file mode 100644 index 000000000000..1b804e8edc76 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "hubRouteTableName": "hubRouteTable1", + "resourceGroupName": "rg1", + "api-version": "2020-04-01", + "subscriptionId": "subid", + "virtualHubName": "virtualHub1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json new file mode 100644 index 000000000000..edb090cb8a47 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json @@ -0,0 +1,81 @@ +{ + "parameters": { + "virtualHubName": "virtualHub1", + "resourceGroupName": "rg1", + "api-version": "2020-04-01", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": [ + { + "name": "hubRouteTable1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1a", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + }, + { + "name": "hubRouteTable2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route2a", + "destinationType": "CIDR", + "destinations": [ + "40.0.0.0/8", + "50.0.0.0/8", + "60.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubVirtualNetworkConnections/vn1" + } + ], + "labels": [ + "label3" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn3", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn4" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn2", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn1" + ] + } + } + ] + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json new file mode 100644 index 000000000000..bdc72e8d71fd --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json @@ -0,0 +1,112 @@ +{ + "parameters": { + "hubRouteTableName": "hubRouteTable1", + "resourceGroupName": "rg1", + "api-version": "2020-04-01", + "subscriptionId": "subid", + "virtualHubName": "virtualHub1", + "hubRouteTableParameters": { + "properties": { + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1a", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json index b47023358c3e..84a5842adb80 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json @@ -20,6 +20,7 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], + "routeTables": [], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json index 39496f6de937..631cf6eecf68 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json @@ -69,6 +69,7 @@ } } ], + "routeTables": [], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } @@ -135,6 +136,7 @@ } } ], + "routeTables": [], "addressPrefix": "210.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json index 8d44f60146e4..3bfb95c4f787 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json @@ -70,6 +70,7 @@ } } ], + "routeTables": [], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } @@ -136,6 +137,7 @@ } } ], + "routeTables": [], "addressPrefix": "210.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json index 724d2090a1a4..d703954a8d9c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json @@ -33,6 +33,7 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], + "routeTables": [], "addressPrefix": "10.168.0.0/24", "sku": "Basic" } @@ -52,6 +53,7 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], + "routeTables": [], "addressPrefix": "10.168.0.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 07e748208be9..64c9a5554b09 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3677,7 +3677,7 @@ "description": "The name of the VirtualHub." }, { - "name": "routeTableName", + "name": "hubRouteTableName", "in": "path", "required": true, "type": "string", @@ -3800,7 +3800,7 @@ "description": "The name of the VirtualHub." }, { - "name": "routeTableName", + "name": "hubRouteTableName", "in": "path", "required": true, "type": "string", From d6b6a1c53c579427a873fc2266e4854f9cc83125 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Sat, 25 Apr 2020 14:15:14 -0700 Subject: [PATCH 04/20] updated examples for routingConfiguration --- .../ExpressRouteConnectionCreate.json | 90 +++++++++++++++++- .../examples/ExpressRouteConnectionGet.json | 45 ++++++++- .../examples/ExpressRouteConnectionList.json | 45 ++++++++- ...xpressRouteGatewayListByResourceGroup.json | 44 ++++++++- ...ExpressRouteGatewayListBySubscription.json | 44 ++++++++- .../HubVirtualNetworkConnectionGet.json | 45 ++++++++- .../HubVirtualNetworkConnectionList.json | 90 +++++++++++++++++- .../2020-04-01/examples/VirtualHubList.json | 94 ++++++++++++++++++- .../VirtualHubListByResourceGroup.json | 90 +++++++++++++++++- .../2020-04-01/examples/VpnConnectionGet.json | 44 ++++++++- .../examples/VpnConnectionList.json | 44 ++++++++- .../2020-04-01/examples/VpnConnectionPut.json | 88 ++++++++++++++++- .../2020-04-01/examples/VpnGatewayGet.json | 44 ++++++++- .../2020-04-01/examples/VpnGatewayList.json | 88 ++++++++++++++++- .../VpnGatewayListByResourceGroup.json | 88 ++++++++++++++++- .../2020-04-01/examples/VpnGatewayPut.json | 88 ++++++++++++++++- .../2020-04-01/examples/VpnGatewayReset.json | 44 ++++++++- .../examples/VpnGatewayUpdateTags.json | 44 ++++++++- 18 files changed, 1131 insertions(+), 28 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json index 0b7fba594c68..1ebf89a8f8cd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json @@ -28,7 +28,50 @@ "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering" }, "authorizationKey": "authorizationKey", - "routingWeight": 2 + "routingWeight": 2, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } }, @@ -42,7 +85,50 @@ "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering" }, "authorizationKey": "authorizationKey", - "routingWeight": 2 + "routingWeight": 2, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json index 6a68b94df757..ef96d5dcc1f0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json @@ -17,7 +17,50 @@ "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering" }, "authorizationKey": "authorizationKey", - "routingWeight": 1 + "routingWeight": 1, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json index f0df103aa548..f3a7bd6dee57 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json @@ -18,7 +18,50 @@ "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/expressRouteCircuits/circuitName/peerings/AzurePrivatePeering" }, "authorizationKey": "authorizationKey", - "routingWeight": 1 + "routingWeight": 1, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json index 08affc521ad8..2c925a252cf0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json @@ -35,7 +35,49 @@ }, "authorizationKey": "f28e9c99-78d8-4248-a855-c54cf6beb99d", "routingWeight": 1, - "enableInternetSecurity": false + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hvirtualHubNameub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json index 3d388ad13642..9315d4a324ad 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json @@ -34,7 +34,49 @@ }, "authorizationKey": "f28e9c99-78d8-4248-a855-c54cf6beb99d", "routingWeight": 1, - "enableInternetSecurity": false + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/virtualHubName/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hvirtualHubNameub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionGet.json index ee862d7f4105..385982149f78 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionGet.json @@ -18,7 +18,50 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" }, "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false + "allowRemoteVnetToUseHubVnetGateways": false, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionList.json index e0ef60cd3ea3..72c316de766e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubVirtualNetworkConnectionList.json @@ -19,7 +19,50 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" }, "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false + "allowRemoteVnetToUseHubVnetGateways": false, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } }, { @@ -32,7 +75,50 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2" }, "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false + "allowRemoteVnetToUseHubVnetGateways": false, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json index 631cf6eecf68..69c487ef0937 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json @@ -29,7 +29,50 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/SpokeVnet1" }, "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false + "allowRemoteVnetToUseHubVnetGateways": false, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], @@ -75,7 +118,7 @@ } }, { - "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "location": "East US", "name": "virtualHub2", @@ -88,7 +131,7 @@ "virtualNetworkConnections": [ { "name": "connection2", - "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", @@ -96,7 +139,50 @@ "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/SpokeVnet2" }, "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false + "allowRemoteVnetToUseHubVnetGateways": false, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json index 3bfb95c4f787..233c21e9521e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json @@ -30,7 +30,50 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/SpokeVnet1" }, "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false + "allowRemoteVnetToUseHubVnetGateways": false, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], @@ -97,7 +140,50 @@ "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/SpokeVnet2" }, "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false + "allowRemoteVnetToUseHubVnetGateways": false, + "enableInternetSecurity": false, + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json index fccf614574e2..8c5eefafa76c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json @@ -67,7 +67,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json index d5b060d229e7..6cda126c8113 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json @@ -67,7 +67,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json index 1da8698e3faf..ce270d915da6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json @@ -64,7 +64,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } }, @@ -104,7 +146,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json index 7d10d4710a26..49762558e96f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json @@ -78,7 +78,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json index d2b26b488f01..bb9fe37e1761 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json @@ -79,7 +79,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], @@ -119,7 +161,49 @@ "sharedKey": "key", "enableBgp": false, "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "ipsecPolicies": [], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json index d2b26b488f01..bb9fe37e1761 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json @@ -79,7 +79,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], @@ -119,7 +161,49 @@ "sharedKey": "key", "enableBgp": false, "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "ipsecPolicies": [], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json index b3fd21f19248..939eb37cad8b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json @@ -93,7 +93,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], @@ -154,7 +196,49 @@ "routingWeight": 0 } } - ] + ], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json index be5d9d1dddc4..d526c753340c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json @@ -37,7 +37,49 @@ "sharedKey": "key", "enableBgp": false, "useLocalAzureIpAddress": false, - "ipsecPolicies": [] + "ipsecPolicies": [], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json index 65a21f1c8fde..3791bb0b12ef 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json @@ -44,7 +44,49 @@ "routingWeight": 0, "sharedKey": "key", "enableBgp": false, - "ipsecPolicies": [] + "ipsecPolicies": [], + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" + }, + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" + } + ] + }, + "vnetRoutes": { + "staticRoutes": [ + { + "name": "route1", + "addressPrefixes": [ + "10.1.0.0/16", + "10.2.0.0/16" + ], + "nextHopIpAddress": "10.0.0.68" + }, + { + "name": "route2", + "addressPrefixes": [ + "10.3.0.0/16", + "10.4.0.0/16" + ], + "nextHopIpAddress": "10.0.0.65" + } + ] + } + } } } ], From bc9c3b8becd742c8ead6686f90d562d60a9097b8 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Sun, 26 Apr 2020 18:47:39 -0700 Subject: [PATCH 05/20] fix1 --- .../ExpressRouteConnectionCreate.json | 19 +-- .../examples/ExpressRouteConnectionGet.json | 19 +-- .../examples/ExpressRouteConnectionList.json | 19 +-- ...xpressRouteGatewayListByResourceGroup.json | 19 +-- ...ExpressRouteGatewayListBySubscription.json | 19 +-- .../2020-04-01/examples/VpnGatewayGet.json | 19 +-- .../2020-04-01/examples/VpnGatewayList.json | 38 +---- .../VpnGatewayListByResourceGroup.json | 38 +---- .../2020-04-01/examples/VpnGatewayPut.json | 38 +---- .../2020-04-01/examples/VpnGatewayReset.json | 19 +-- .../examples/VpnGatewayUpdateTags.json | 19 +-- .../stable/2020-04-01/virtualWan.json | 130 +++++++++--------- 12 files changed, 78 insertions(+), 318 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json index 1ebf89a8f8cd..5deca1af55c6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json @@ -52,24 +52,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json index ef96d5dcc1f0..282057cb67bd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionGet.json @@ -41,24 +41,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json index f3a7bd6dee57..34545e245bbe 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionList.json @@ -42,24 +42,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json index 2c925a252cf0..9f3ef7b8ede9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListByResourceGroup.json @@ -58,24 +58,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json index 9315d4a324ad..97dff763334f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteGatewayListBySubscription.json @@ -57,24 +57,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json index 49762558e96f..3d5f4b9e7aa0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayGet.json @@ -101,24 +101,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json index bb9fe37e1761..62867369a3f6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayList.json @@ -102,24 +102,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } @@ -184,24 +167,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json index bb9fe37e1761..62867369a3f6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayListByResourceGroup.json @@ -102,24 +102,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } @@ -184,24 +167,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json index 939eb37cad8b..61bcb523d660 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayPut.json @@ -116,24 +116,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } @@ -219,24 +202,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json index d526c753340c..fd470c59e9e2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayReset.json @@ -60,24 +60,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json index 3791bb0b12ef..95f5d695fa28 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnGatewayUpdateTags.json @@ -67,24 +67,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 64c9a5554b09..60848f28bbad 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3649,15 +3649,15 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{hubRouteTableName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}": { "put": { - "operationId": "HubRouteTables_CreateOrUpdate", + "operationId": "RouteTables_CreateOrUpdate", "x-ms-examples": { - "HubRouteTablePut": { - "$ref": "./examples/HubRouteTablePut.json" + "RouteTablePut": { + "$ref": "./examples/RouteTablePut.json" } }, - "description": "Creates a HubRouteTable resource if it doesn't exist else updates the existing HubRouteTable.", + "description": "Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.", "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -3677,36 +3677,36 @@ "description": "The name of the VirtualHub." }, { - "name": "hubRouteTableName", + "name": "routeTableName", "in": "path", "required": true, "type": "string", - "description": "The name of the HubRouteTable." + "description": "The name of the RouteTable." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" }, { - "name": "HubRouteTableParameters", + "name": "RouteTableParameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/HubRouteTable" + "$ref": "#/definitions/RouteTable" }, - "description": "Parameters supplied to create or update HubRouteTable." + "description": "Parameters supplied to create or update RouteTable." } ], "responses": { "200": { - "description": "Request successful. Returns the details of the HubRouteTable created or updated.", + "description": "Request successful. Returns the details of the RouteTable created or updated.", "schema": { - "$ref": "#/definitions/HubRouteTable" + "$ref": "#/definitions/RouteTable" } }, "201": { - "description": "Request received successfully. Returns the details of the HubRouteTable created or updated.", + "description": "Request received successfully. Returns the details of the RouteTable created or updated.", "schema": { - "$ref": "#/definitions/HubRouteTable" + "$ref": "#/definitions/RouteTable" } }, "default": { @@ -3722,13 +3722,13 @@ } }, "get": { - "operationId": "HubRouteTables_Get", + "operationId": "RouteTables_Get", "x-ms-examples": { - "HubRouteTableGet": { - "$ref": "./examples/HubRouteTableGet.json" + "RouteTableGet": { + "$ref": "./examples/RouteTableGet.json" } }, - "description": "Retrieves the details of a HubRouteTable.", + "description": "Retrieves the details of a RouteTable.", "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -3748,11 +3748,11 @@ "description": "The name of the VirtualHub." }, { - "name": "hubRouteTableName", + "name": "routeTableName", "in": "path", "required": true, "type": "string", - "description": "The name of the hubRouteTable." + "description": "The name of the RouteTable." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -3760,9 +3760,9 @@ ], "responses": { "200": { - "description": "Request successful. Returns the details of the HubRouteTable retrieved.", + "description": "Request successful. Returns the details of the RouteTable retrieved.", "schema": { - "$ref": "#/definitions/HubRouteTable" + "$ref": "#/definitions/RouteTable" } }, "default": { @@ -3774,13 +3774,13 @@ } }, "delete": { - "operationId": "HubRouteTables_Delete", + "operationId": "RouteTables_Delete", "x-ms-examples": { - "HubRouteTableDelete": { - "$ref": "./examples/HubRouteTableDelete.json" + "RouteTableDelete": { + "$ref": "./examples/RouteTableDelete.json" } }, - "description": "Deletes a HubRouteTable.", + "description": "Deletes a RouteTable.", "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -3790,7 +3790,7 @@ "in": "path", "required": true, "type": "string", - "description": "The resource group name of the HubRouteTable." + "description": "The resource group name of the RouteTable." }, { "name": "virtualHubName", @@ -3800,11 +3800,11 @@ "description": "The name of the VirtualHub." }, { - "name": "hubRouteTableName", + "name": "routeTableName", "in": "path", "required": true, "type": "string", - "description": "The name of the HubRouteTable." + "description": "The name of the RouteTable." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -3812,13 +3812,13 @@ ], "responses": { "200": { - "description": "Request successful. HubRouteTable deleted." + "description": "Request successful. RouteTable deleted." }, "202": { - "description": "Request received successfully. HubRouteTable deletion is in progress; follow the Location header to poll for final outcome." + "description": "Request received successfully. RouteTable deletion is in progress; follow the Location header to poll for final outcome." }, "204": { - "description": "No HubRouteTables exist by the name provided." + "description": "No RouteTables exist by the name provided." }, "default": { "description": "Error.", @@ -3835,13 +3835,13 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables":{ "get": { - "operationId": "HubRouteTables_List", + "operationId": "RouteTables_List", "x-ms-examples": { - "HubRouteTableList": { - "$ref": "./examples/HubRouteTableList.json" + "RouteTableList": { + "$ref": "./examples/RouteTableList.json" } }, - "description": "Retrieves the details of all HubRouteTables.", + "description": "Retrieves the details of all RouteTables.", "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -3866,9 +3866,9 @@ ], "responses": { "200": { - "description": "Request successful. Returns the details of all the HubRouteTables for the VirtualHub.", + "description": "Request successful. Returns the details of all the RouteTables for the VirtualHub.", "schema": { - "$ref": "#/definitions/ListHubRouteTablesResult" + "$ref": "#/definitions/ListRouteTablesResult" } }, "default": { @@ -4185,11 +4185,11 @@ "$ref": "#/definitions/VirtualHubRouteTable", "description": "The routeTable associated with this virtual hub." }, - "HubRouteTables": { + "RouteTables": { "type": "array", - "description": "List of all HubRouteTables associated with this VirtualHub.", + "description": "List of all RouteTables associated with this VirtualHub.", "items": { - "$ref": "#/definitions/HubRouteTables" + "$ref": "#/definitions/RouteTables" } }, "provisioningState": { @@ -4668,13 +4668,13 @@ } } }, - "HubRouteTableProperties": { + "RouteTableProperties": { "properties": { "routes": { "type": "array", "description": "List of all routes.", "items": { - "$ref": "#/definitions/HubRoute" + "$ref": "#/definitions/Route" } }, "labels": { @@ -4688,30 +4688,30 @@ "type": "array", "description": "List of all connections associated with this route table.", "items": { - "type": "string" + "$ref": "#/definitions/HubVirtualNetworkConnection" } }, "propagatingConnections": { "type": "array", "description": "List of all connections that advertise to this route table.", "items": { - "type": "string" + "$ref": "#/defintions/HubVirtualNetworkConnection" } }, "provisioningState": { "$ref": "./network.json#/definitions/ProvisioningState", "readOnly": true, - "description": "The provisioning state of the HubRouteTable resource." + "description": "The provisioning state of the RouteTable resource." } }, - "description": "Parameters for HubRouteTable." + "description": "Parameters for RouteTable." }, - "HubRouteTable": { + "RouteTable": { "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/HubRouteTableProperties", - "description": "Properties of the HubRouteTable resource." + "$ref": "#/definitions/RouteTableProperties", + "description": "Properties of the RouteTable resource." }, "name": { "type": "string", @@ -4728,13 +4728,13 @@ "$ref": "./network.json#/definitions/SubResource" } ], - "description": "HubRouteTable Resource." + "description": "RouteTable Resource." }, - "HubRoute": { + "Route": { "properties": { "name": { "type": "string", - "description": "The name of the HubRoute that is unique within a HubRouteTable. This name can be used to access this route." + "description": "The name of the Route that is unique within a RouteTable. This name can be used to access this route." }, "destinationType": { "type": "string", @@ -4752,24 +4752,21 @@ "description": "The type of next hops." }, "nextHop": { - "type": "array", - "description": "NextHop resource ID.", - "items": { - "type": "string" - } + "type": "string", + "description": "NextHop resource ID." } }, - "description": "HubRouteTable route." + "description": "RouteTable route." }, - "ListHubRouteTablesResult": { - "description": "List of HubRouteTables and a URL nextLink to get the next set of results.", + "ListRouteTablesResult": { + "description": "List of RouteTables and a URL nextLink to get the next set of results.", "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/HubRouteTable" + "$ref": "#/definitions/RouteTable" }, - "description": "List of HubRouteTables." + "description": "List of RouteTables." }, "nextLink": { "type": "string", @@ -5647,14 +5644,15 @@ "description": "ExpressRouteConnection list." }, "RoutingConfiguration": { + "description": "Routing Configuration indicating the associated and propagated route tables on this connection.", "properties": { "associatedRouteTable": { "$ref": "./network.json#/definitions/SubResource", - "description": "TODO The HubRouteTable associated with this RoutingConfiguration." + "description": "TODO The RouteTable associated with this RoutingConfiguration." }, "propagatedRouteTables": { "$ref": "#/definitions/PropagatedRouteTable", - "description": "TODO List of HubRouteTables to advertise the routes to." + "description": "TODO List of RouteTables to advertise the routes to." }, "vnetRoutes": { "$ref" : "#/definitions/VnetRoute", @@ -5673,7 +5671,7 @@ }, "ids": { "type": "array", - "description": "TODO The list of all the HubRouteTables.", + "description": "TODO The list of all the RouteTables.", "items": { "$ref": "./network.json#/definitions/SubResource" } From 1fae942aa7f44b0ef214716494bd1bd9bce1f4fb Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 09:47:26 -0700 Subject: [PATCH 06/20] some more fixes --- .../ExpressRouteConnectionCreate.json | 19 +------------- .../stable/2020-04-01/virtualWan.json | 26 ++++++++++--------- 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json index 5deca1af55c6..1828ed7bad2f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json @@ -92,24 +92,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 60848f28bbad..fbc3283ebbad 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4437,7 +4437,7 @@ }, "routingConfiguration": { "$ref": "#/definitions/RoutingConfiguration", - "description": "TODO" + "description": "The Routing Configuration indicating the associated and propagated route tables on this connection." } }, "description": "Parameters for VpnConnection." @@ -4618,7 +4618,7 @@ }, "routingConfiguration": { "$ref": "#/definitions/RoutingConfiguration", - "description": "TODO" + "description": "The Routing Configuration indicating the associated and propagated route tables on this connection." }, "provisioningState": { "readOnly": true, @@ -4687,15 +4687,17 @@ "associatedConnections": { "type": "array", "description": "List of all connections associated with this route table.", + "readOnly": true, "items": { - "$ref": "#/definitions/HubVirtualNetworkConnection" + "$ref": "./network.json#/definitions/SubResource" } }, "propagatingConnections": { "type": "array", "description": "List of all connections that advertise to this route table.", + "readOnly": true, "items": { - "$ref": "#/defintions/HubVirtualNetworkConnection" + "$ref": "./network.json#/definitions/SubResource" } }, "provisioningState": { @@ -5336,7 +5338,7 @@ }, "routingConfiguration": { "$ref": "#/definitions/RoutingConfiguration", - "description": "TODO" + "description": "The Routing Configuration indicating the associated and propagated route tables on this connection." }, "provisioningState": { "readOnly": true, @@ -5604,7 +5606,7 @@ }, "routingConfiguration": { "$ref": "#/definitions/RoutingConfiguration", - "description": "TODO" + "description": "The Routing Configuration indicating the associated and propagated route tables on this connection." } }, "description": "Properties of the ExpressRouteConnection subresource." @@ -5644,19 +5646,19 @@ "description": "ExpressRouteConnection list." }, "RoutingConfiguration": { - "description": "Routing Configuration indicating the associated and propagated route tables on this connection.", + "description": "Routing Configuration indicating the associated and propagated route tables for this connection.", "properties": { "associatedRouteTable": { "$ref": "./network.json#/definitions/SubResource", - "description": "TODO The RouteTable associated with this RoutingConfiguration." + "description": "The resource id RouteTable associated with this RoutingConfiguration." }, "propagatedRouteTables": { "$ref": "#/definitions/PropagatedRouteTable", - "description": "TODO List of RouteTables to advertise the routes to." + "description": "The list of RouteTables to advertise the routes to." }, "vnetRoutes": { "$ref" : "#/definitions/VnetRoute", - "description": "TODO" + "description": "List of routes that control routing from VirtualHub into a virtual network connection." } } }, @@ -5664,14 +5666,14 @@ "properties": { "labels": { "type": "array", - "description": "TODO", + "description": "The list of labels.", "items": { "type": "string" } }, "ids": { "type": "array", - "description": "TODO The list of all the RouteTables.", + "description": "The list of resource ids of all the RouteTables.", "items": { "$ref": "./network.json#/definitions/SubResource" } From e32b134ffeef8a0d4871139caef433ddffb4171b Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 10:03:20 -0700 Subject: [PATCH 07/20] fixes2 --- .../2020-04-01/examples/HubRouteTablePut.json | 10 +-- .../2020-04-01/examples/VirtualHubGet.json | 36 +++++++- .../2020-04-01/examples/VirtualHubList.json | 88 +++++++++++++++---- .../VirtualHubListByResourceGroup.json | 84 +++++++++++++++--- .../2020-04-01/examples/VirtualHubPut.json | 72 ++++++++++++++- .../2020-04-01/examples/VpnConnectionGet.json | 19 +--- .../examples/VpnConnectionList.json | 19 +--- .../2020-04-01/examples/VpnConnectionPut.json | 38 +------- 8 files changed, 253 insertions(+), 113 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json index bdc72e8d71fd..1f3b3bf5beb9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json @@ -24,14 +24,8 @@ "label1", "label2" ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" - ] + "associatedConnections": [], + "propagatingConnections": [] } } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json index 84a5842adb80..5ebc652948f2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json @@ -20,7 +20,41 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], - "routeTables": [], + "routeTables": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1", + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + ], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json index 69c487ef0937..3ae4c8051315 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json @@ -43,12 +43,6 @@ "ids": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" - }, - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" - }, - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" } ] }, @@ -78,7 +72,7 @@ ], "virtualHubRouteTableV2s": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/routeTables/virtualHubRouteTable2", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "rt2a", "properties": { @@ -112,7 +106,41 @@ } } ], - "routeTables": [], + "routeTables": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + ], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } @@ -143,7 +171,7 @@ "enableInternetSecurity": false, "routingConfiguration": { "associatedRouteTable": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2" }, "propagatedRouteTables": { "labels": [ @@ -151,14 +179,8 @@ "label2" ], "ids": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" - }, { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2" - }, - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable3" } ] }, @@ -222,7 +244,41 @@ } } ], - "routeTables": [], + "routeTables": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable2", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route2", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall2" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection2" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg2/expressRouteConnections/erConn2", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" + ] + } + } + ], "addressPrefix": "210.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json index 233c21e9521e..41b8c82dafd9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json @@ -44,12 +44,6 @@ "ids": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1" - }, - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2" - }, - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable3" } ] }, @@ -113,7 +107,41 @@ } } ], - "routeTables": [], + "routeTables": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + ], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } @@ -152,14 +180,8 @@ "label2" ], "ids": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1" - }, { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2" - }, - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable3" } ] }, @@ -223,7 +245,41 @@ } } ], - "routeTables": [], + "routeTables": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable2", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route2", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall2" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection2" + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg2/expressRouteConnections/erConn2", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" + ] + } + } + ], "addressPrefix": "210.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json index d703954a8d9c..1eb48aaca40c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json @@ -33,7 +33,41 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], - "routeTables": [], + "routeTables": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1", + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + ], "addressPrefix": "10.168.0.0/24", "sku": "Basic" } @@ -53,7 +87,41 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], - "routeTables": [], + "routeTables": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "name": "hubRouteTable1", + "type": "Microsoft.Network/virtualHubs/hubRouteTables", + "properties": { + "provisioningState": "Succeeded", + "routes": [ + { + "name": "route1", + "destinationType": "CIDR", + "destinations": [ + "10.0.0.0/8", + "20.0.0.0/8", + "30.0.0.0/8" + ], + "nextHopType": "ResourceId", + "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" + } + ], + "labels": [ + "label1", + "label2" + ], + "associatedConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1", + ], + "propagatingConnections": [ + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + ] + } + } + ], "addressPrefix": "10.168.0.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json index 8c5eefafa76c..62d2cbc4069b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionGet.json @@ -90,24 +90,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json index 6cda126c8113..678ac086f27d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionList.json @@ -90,24 +90,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json index ce270d915da6..b7e52922aa6d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VpnConnectionPut.json @@ -87,24 +87,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } @@ -169,24 +152,7 @@ ] }, "vnetRoutes": { - "staticRoutes": [ - { - "name": "route1", - "addressPrefixes": [ - "10.1.0.0/16", - "10.2.0.0/16" - ], - "nextHopIpAddress": "10.0.0.68" - }, - { - "name": "route2", - "addressPrefixes": [ - "10.3.0.0/16", - "10.4.0.0/16" - ], - "nextHopIpAddress": "10.0.0.65" - } - ] + "staticRoutes": [] } } } From 2a47fc79521f54e492166d199b3b6e542fdc576e Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 15:55:36 -0700 Subject: [PATCH 08/20] prettier check done --- .../ExpressRouteConnectionCreate.json | 42 +++++++++---------- .../2020-04-01/examples/HubRouteTableGet.json | 4 +- .../examples/HubRouteTableList.json | 8 ++-- .../2020-04-01/examples/HubRouteTablePut.json | 8 ++-- .../2020-04-01/examples/VirtualHubGet.json | 4 +- .../2020-04-01/examples/VirtualHubList.json | 4 +- .../VirtualHubListByResourceGroup.json | 4 +- .../2020-04-01/examples/VirtualHubPut.json | 8 ++-- .../stable/2020-04-01/virtualWan.json | 8 ++-- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json index 1828ed7bad2f..2d6f1b38be2f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/ExpressRouteConnectionCreate.json @@ -30,31 +30,31 @@ "authorizationKey": "authorizationKey", "routingWeight": 2, "enableInternetSecurity": false, - "routingConfiguration": { - "associatedRouteTable": { + "routingConfiguration": { + "associatedRouteTable": { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" + }, + "propagatedRouteTables": { + "labels": [ + "label1", + "label2" + ], + "ids": [ + { "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" }, - "propagatedRouteTables": { - "labels": [ - "label1", - "label2" - ], - "ids": [ - { - "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1" - }, - { - "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" - }, - { - "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" - } - ] + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable2" }, - "vnetRoutes": { - "staticRoutes": [] + { + "id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable3" } - } + ] + }, + "vnetRoutes": { + "staticRoutes": [] + } + } } } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json index 1b804e8edc76..315cb1e3cbee 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json @@ -34,11 +34,11 @@ ], "associatedConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json index edb090cb8a47..fbb7d3bca345 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json @@ -34,11 +34,11 @@ ], "associatedConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } }, @@ -67,11 +67,11 @@ ], "associatedConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn3", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn4" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn4" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn2", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn1" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn1" ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json index 1f3b3bf5beb9..04e6e3bcf0d8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json @@ -57,11 +57,11 @@ ], "associatedConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } @@ -93,11 +93,11 @@ ], "associatedConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/vnetConnn2" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json index 5ebc652948f2..7f00c8a6eca4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json @@ -46,11 +46,11 @@ "label2" ], "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json index 3ae4c8051315..838cb8136227 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json @@ -136,7 +136,7 @@ ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } @@ -274,7 +274,7 @@ ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg2/expressRouteConnections/erConn2", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json index 41b8c82dafd9..83161e8de687 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json @@ -137,7 +137,7 @@ ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } @@ -275,7 +275,7 @@ ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg2/expressRouteConnections/erConn2", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json index 1eb48aaca40c..4919456409cd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json @@ -59,11 +59,11 @@ "label2" ], "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } @@ -113,11 +113,11 @@ "label2" ], "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1", + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1" ], "propagatingConnections": [ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" + "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index fbc3283ebbad..aeb86e94ee44 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3833,7 +3833,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables":{ + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables": { "get": { "operationId": "RouteTables_List", "x-ms-examples": { @@ -5646,7 +5646,7 @@ "description": "ExpressRouteConnection list." }, "RoutingConfiguration": { - "description": "Routing Configuration indicating the associated and propagated route tables for this connection.", + "description": "Routing Configuration indicating the associated and propagated route tables for this connection.", "properties": { "associatedRouteTable": { "$ref": "./network.json#/definitions/SubResource", @@ -5657,7 +5657,7 @@ "description": "The list of RouteTables to advertise the routes to." }, "vnetRoutes": { - "$ref" : "#/definitions/VnetRoute", + "$ref": "#/definitions/VnetRoute", "description": "List of routes that control routing from VirtualHub into a virtual network connection." } } @@ -5707,7 +5707,7 @@ "nextHopIpAddress": { "type": "string", "description": "The ip address of the next hop." - } + } } } } From 3a4a8a7e802afd2a8418ea2d8b45f90d7e943fab Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 16:19:10 -0700 Subject: [PATCH 09/20] validate spec done --- .../Microsoft.Network/stable/2020-04-01/virtualWan.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index aeb86e94ee44..77bd32cfc20c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3654,7 +3654,7 @@ "operationId": "RouteTables_CreateOrUpdate", "x-ms-examples": { "RouteTablePut": { - "$ref": "./examples/RouteTablePut.json" + "$ref": "./examples/HubRouteTablePut.json" } }, "description": "Creates a RouteTable resource if it doesn't exist else updates the existing RouteTable.", @@ -4189,7 +4189,7 @@ "type": "array", "description": "List of all RouteTables associated with this VirtualHub.", "items": { - "$ref": "#/definitions/RouteTables" + "$ref": "#/definitions/RouteTable" } }, "provisioningState": { From 05e003f4029323ad2315f00a9bb13c6372749a80 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 16:26:02 -0700 Subject: [PATCH 10/20] fix3 --- .../Microsoft.Network/stable/2020-04-01/virtualWan.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 77bd32cfc20c..d5b56e1eee88 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4185,7 +4185,7 @@ "$ref": "#/definitions/VirtualHubRouteTable", "description": "The routeTable associated with this virtual hub." }, - "RouteTables": { + "routeTables": { "type": "array", "description": "List of all RouteTables associated with this VirtualHub.", "items": { From 92ed73d3f3ac779977bd32616912520913a3ae78 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 16:55:52 -0700 Subject: [PATCH 11/20] fixed model validation errors --- .../examples/HubRouteTableDelete.json | 2 +- .../2020-04-01/examples/HubRouteTableGet.json | 2 +- .../2020-04-01/examples/HubRouteTablePut.json | 4 +-- .../stable/2020-04-01/virtualWan.json | 30 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json index 3def92470ec9..f7079e041429 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableDelete.json @@ -1,6 +1,6 @@ { "parameters": { - "hubRouteTableName": "hubRouteTable1", + "routeTableName": "hubRouteTable1", "resourceGroupName": "rg1", "api-version": "2020-04-01", "subscriptionId": "subid", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json index 315cb1e3cbee..55a27416ab3d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json @@ -1,6 +1,6 @@ { "parameters": { - "hubRouteTableName": "hubRouteTable1", + "routeTableName": "hubRouteTable1", "resourceGroupName": "rg1", "api-version": "2020-04-01", "subscriptionId": "subid", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json index 04e6e3bcf0d8..aa9183f00ec6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json @@ -1,11 +1,11 @@ { "parameters": { - "hubRouteTableName": "hubRouteTable1", + "routeTableName": "hubRouteTable1", "resourceGroupName": "rg1", "api-version": "2020-04-01", "subscriptionId": "subid", "virtualHubName": "virtualHub1", - "hubRouteTableParameters": { + "routeTableParameters": { "properties": { "routes": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index d5b56e1eee88..e964e3b16788 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3687,11 +3687,11 @@ "$ref": "./network.json#/parameters/ApiVersionParameter" }, { - "name": "RouteTableParameters", + "name": "routeTableParameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/RouteTable" + "$ref": "#/definitions/HubRouteTable" }, "description": "Parameters supplied to create or update RouteTable." } @@ -3700,13 +3700,13 @@ "200": { "description": "Request successful. Returns the details of the RouteTable created or updated.", "schema": { - "$ref": "#/definitions/RouteTable" + "$ref": "#/definitions/HubRouteTable" } }, "201": { "description": "Request received successfully. Returns the details of the RouteTable created or updated.", "schema": { - "$ref": "#/definitions/RouteTable" + "$ref": "#/definitions/HubRouteTable" } }, "default": { @@ -3725,7 +3725,7 @@ "operationId": "RouteTables_Get", "x-ms-examples": { "RouteTableGet": { - "$ref": "./examples/RouteTableGet.json" + "$ref": "./examples/HubRouteTableGet.json" } }, "description": "Retrieves the details of a RouteTable.", @@ -3762,7 +3762,7 @@ "200": { "description": "Request successful. Returns the details of the RouteTable retrieved.", "schema": { - "$ref": "#/definitions/RouteTable" + "$ref": "#/definitions/HubRouteTable" } }, "default": { @@ -3777,7 +3777,7 @@ "operationId": "RouteTables_Delete", "x-ms-examples": { "RouteTableDelete": { - "$ref": "./examples/RouteTableDelete.json" + "$ref": "./examples/HubRouteTableDelete.json" } }, "description": "Deletes a RouteTable.", @@ -3838,7 +3838,7 @@ "operationId": "RouteTables_List", "x-ms-examples": { "RouteTableList": { - "$ref": "./examples/RouteTableList.json" + "$ref": "./examples/HubRouteTableList.json" } }, "description": "Retrieves the details of all RouteTables.", @@ -4189,7 +4189,7 @@ "type": "array", "description": "List of all RouteTables associated with this VirtualHub.", "items": { - "$ref": "#/definitions/RouteTable" + "$ref": "#/definitions/HubRouteTable" } }, "provisioningState": { @@ -4668,13 +4668,13 @@ } } }, - "RouteTableProperties": { + "HubRouteTableProperties": { "properties": { "routes": { "type": "array", "description": "List of all routes.", "items": { - "$ref": "#/definitions/Route" + "$ref": "#/definitions/HubRoute" } }, "labels": { @@ -4708,11 +4708,11 @@ }, "description": "Parameters for RouteTable." }, - "RouteTable": { + "HubRouteTable": { "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/RouteTableProperties", + "$ref": "#/definitions/HubRouteTableProperties", "description": "Properties of the RouteTable resource." }, "name": { @@ -4732,7 +4732,7 @@ ], "description": "RouteTable Resource." }, - "Route": { + "HubRoute": { "properties": { "name": { "type": "string", @@ -4766,7 +4766,7 @@ "value": { "type": "array", "items": { - "$ref": "#/definitions/RouteTable" + "$ref": "#/definitions/HubRouteTable" }, "description": "List of RouteTables." }, From e6a64d3e51c787b9af328acda4f4920b1ca04c68 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 17:25:49 -0700 Subject: [PATCH 12/20] model validations again --- .../stable/2020-04-01/examples/HubRouteTablePut.json | 4 +--- .../stable/2020-04-01/examples/VirtualHubGet.json | 1 - .../stable/2020-04-01/examples/VirtualHubList.json | 2 -- .../2020-04-01/examples/VirtualHubListByResourceGroup.json | 2 -- .../stable/2020-04-01/examples/VirtualHubPut.json | 2 -- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json index aa9183f00ec6..efbae2b8a984 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json @@ -23,9 +23,7 @@ "labels": [ "label1", "label2" - ], - "associatedConnections": [], - "propagatingConnections": [] + ] } } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json index 7f00c8a6eca4..a023cfc26df2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json @@ -25,7 +25,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json index 838cb8136227..8d6834a5e748 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json @@ -111,7 +111,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ @@ -249,7 +248,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable2", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json index 83161e8de687..dadf423c6b59 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json @@ -112,7 +112,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ @@ -250,7 +249,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable2", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json index 4919456409cd..5751da965d6f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json @@ -38,7 +38,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ @@ -92,7 +91,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ From 0c041c8ccf66f706f2b633cdcdecc7a974c4a0de Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 17:35:04 -0700 Subject: [PATCH 13/20] few more fxes: --- .../stable/2020-04-01/virtualWan.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index e964e3b16788..6eef6d559547 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3651,7 +3651,7 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}": { "put": { - "operationId": "RouteTables_CreateOrUpdate", + "operationId": "HubRouteTables_CreateOrUpdate", "x-ms-examples": { "RouteTablePut": { "$ref": "./examples/HubRouteTablePut.json" @@ -3722,7 +3722,7 @@ } }, "get": { - "operationId": "RouteTables_Get", + "operationId": "HubRouteTables_Get", "x-ms-examples": { "RouteTableGet": { "$ref": "./examples/HubRouteTableGet.json" @@ -3774,7 +3774,7 @@ } }, "delete": { - "operationId": "RouteTables_Delete", + "operationId": "HubRouteTables_Delete", "x-ms-examples": { "RouteTableDelete": { "$ref": "./examples/HubRouteTableDelete.json" @@ -3835,7 +3835,7 @@ }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables": { "get": { - "operationId": "RouteTables_List", + "operationId": "HubRouteTables_List", "x-ms-examples": { "RouteTableList": { "$ref": "./examples/HubRouteTableList.json" @@ -3868,7 +3868,7 @@ "200": { "description": "Request successful. Returns the details of all the RouteTables for the VirtualHub.", "schema": { - "$ref": "#/definitions/ListRouteTablesResult" + "$ref": "#/definitions/ListHubRouteTablesResult" } }, "default": { @@ -4760,7 +4760,7 @@ }, "description": "RouteTable route." }, - "ListRouteTablesResult": { + "ListHubRouteTablesResult": { "description": "List of RouteTables and a URL nextLink to get the next set of results.", "properties": { "value": { @@ -5663,6 +5663,7 @@ } }, "PropagatedRouteTable": { + "description": "The list of RouteTables to advertise the routes to.", "properties": { "labels": { "type": "array", @@ -5681,10 +5682,11 @@ } }, "VnetRoute": { + "description": "List of routes that control routing from VirtualHub into a virtual network connection.", "properties": { "staticRoutes": { "type": "array", - "description": "List of all Static Routes", + "description": "List of all Static Routes.", "items": { "$ref": "#/definitions/StaticRoute" } @@ -5692,6 +5694,7 @@ } }, "StaticRoute": { + "description": "List of all Static Routes", "properties": { "name": { "type": "string", From 6769c216f0f6659dc28d94efa17226a01f3c9f91 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Mon, 27 Apr 2020 17:58:57 -0700 Subject: [PATCH 14/20] remove type from examples --- .../stable/2020-04-01/examples/HubRouteTableGet.json | 1 - .../stable/2020-04-01/examples/HubRouteTableList.json | 2 -- .../stable/2020-04-01/examples/HubRouteTablePut.json | 2 -- 3 files changed, 5 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json index 55a27416ab3d..e0f57d9d7c2a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json @@ -12,7 +12,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json index fbb7d3bca345..015cd7a5ac18 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json @@ -12,7 +12,6 @@ "name": "hubRouteTable1", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ @@ -46,7 +45,6 @@ "name": "hubRouteTable2", "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable2", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json index efbae2b8a984..91038d87f4b8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json @@ -33,7 +33,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ @@ -69,7 +68,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/routeTables/virtualHubRouteTable1a", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "name": "hubRouteTable1", - "type": "Microsoft.Network/virtualHubs/hubRouteTables", "properties": { "provisioningState": "Succeeded", "routes": [ From 7b8a1387be6a0b7608229845983fc4fe731c8714 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Tue, 28 Apr 2020 07:22:35 -0700 Subject: [PATCH 15/20] fix staging errors --- .../stable/2020-04-01/virtualWan.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 6eef6d559547..62b0b3c73fc9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -3710,9 +3710,9 @@ } }, "default": { - "description": "Error.", + "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./network.json#/definitions/Error" + "$ref": "./network.json#/definitions/CloudError" } } }, @@ -3821,9 +3821,9 @@ "description": "No RouteTables exist by the name provided." }, "default": { - "description": "Error.", + "description": "Error response describing why the operation failed.", "schema": { - "$ref": "./network.json#/definitions/Error" + "$ref": "./network.json#/definitions/CloudError" } } }, @@ -5694,7 +5694,7 @@ } }, "StaticRoute": { - "description": "List of all Static Routes", + "description": "List of all Static Routes.", "properties": { "name": { "type": "string", From 4e598cc76a9e4050d928fb2019f01c240515eb25 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Wed, 29 Apr 2020 17:39:58 -0700 Subject: [PATCH 16/20] add required field where needed --- .../Microsoft.Network/stable/2020-04-01/virtualWan.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 62b0b3c73fc9..83919bdea4a5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4679,7 +4679,7 @@ }, "labels": { "type": "array", - "description": "List of all connections attached to this route table.", + "description": "List of labels associated with this route table.", "items": { "type": "string" } @@ -4709,6 +4709,9 @@ "description": "Parameters for RouteTable." }, "HubRouteTable": { + "required": [ + "name" + ], "properties": { "properties": { "x-ms-client-flatten": true, @@ -4733,6 +4736,9 @@ "description": "RouteTable Resource." }, "HubRoute": { + "required": [ + "name" + ], "properties": { "name": { "type": "string", From b8b4adbe20a72907283914e7904de81eb2296e1e Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Thu, 30 Apr 2020 17:13:23 -0700 Subject: [PATCH 17/20] updated after review --- .../2020-04-01/examples/VirtualHubGet.json | 34 ---------- .../2020-04-01/examples/VirtualHubList.json | 68 ------------------- .../VirtualHubListByResourceGroup.json | 68 ------------------- .../2020-04-01/examples/VirtualHubPut.json | 68 ------------------- .../stable/2020-04-01/virtualWan.json | 19 +++--- 5 files changed, 8 insertions(+), 249 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json index a023cfc26df2..b47023358c3e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubGet.json @@ -20,40 +20,6 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], - "routeTables": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "name": "hubRouteTable1", - "properties": { - "provisioningState": "Succeeded", - "routes": [ - { - "name": "route1", - "destinationType": "CIDR", - "destinations": [ - "10.0.0.0/8", - "20.0.0.0/8", - "30.0.0.0/8" - ], - "nextHopType": "ResourceId", - "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" - } - ], - "labels": [ - "label1", - "label2" - ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" - ] - } - } - ], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json index 8d6834a5e748..05f3967272d6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubList.json @@ -106,40 +106,6 @@ } } ], - "routeTables": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "name": "hubRouteTable1", - "properties": { - "provisioningState": "Succeeded", - "routes": [ - { - "name": "route1", - "destinationType": "CIDR", - "destinations": [ - "10.0.0.0/8", - "20.0.0.0/8", - "30.0.0.0/8" - ], - "nextHopType": "ResourceId", - "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" - } - ], - "labels": [ - "label1", - "label2" - ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" - ] - } - } - ], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } @@ -243,40 +209,6 @@ } } ], - "routeTables": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "name": "hubRouteTable2", - "properties": { - "provisioningState": "Succeeded", - "routes": [ - { - "name": "route2", - "destinationType": "CIDR", - "destinations": [ - "10.0.0.0/8", - "20.0.0.0/8", - "30.0.0.0/8" - ], - "nextHopType": "ResourceId", - "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall2" - } - ], - "labels": [ - "label1", - "label2" - ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection2" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg2/expressRouteConnections/erConn2", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" - ] - } - } - ], "addressPrefix": "210.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json index dadf423c6b59..eb97f16ee7f9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubListByResourceGroup.json @@ -107,40 +107,6 @@ } } ], - "routeTables": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubRouteTables/hubRouteTable1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "name": "hubRouteTable1", - "properties": { - "provisioningState": "Succeeded", - "routes": [ - { - "name": "route1", - "destinationType": "CIDR", - "destinations": [ - "10.0.0.0/8", - "20.0.0.0/8", - "30.0.0.0/8" - ], - "nextHopType": "ResourceId", - "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" - } - ], - "labels": [ - "label1", - "label2" - ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1/hubVirtualNetworkConnections/connection1" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" - ] - } - } - ], "addressPrefix": "10.10.1.0/24", "sku": "Basic" } @@ -244,40 +210,6 @@ } } ], - "routeTables": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable2", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "name": "hubRouteTable2", - "properties": { - "provisioningState": "Succeeded", - "routes": [ - { - "name": "route2", - "destinationType": "CIDR", - "destinations": [ - "10.0.0.0/8", - "20.0.0.0/8", - "30.0.0.0/8" - ], - "nextHopType": "ResourceId", - "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall2" - } - ], - "labels": [ - "label1", - "label2" - ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection2" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg2/expressRouteConnections/erConn2", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw2/vpnConnections/vpnConn2" - ] - } - } - ], "addressPrefix": "210.10.1.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json index 5751da965d6f..724d2090a1a4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/VirtualHubPut.json @@ -33,40 +33,6 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], - "routeTables": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "name": "hubRouteTable1", - "properties": { - "provisioningState": "Succeeded", - "routes": [ - { - "name": "route1", - "destinationType": "CIDR", - "destinations": [ - "10.0.0.0/8", - "20.0.0.0/8", - "30.0.0.0/8" - ], - "nextHopType": "ResourceId", - "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" - } - ], - "labels": [ - "label1", - "label2" - ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" - ] - } - } - ], "addressPrefix": "10.168.0.0/24", "sku": "Basic" } @@ -86,40 +52,6 @@ }, "virtualNetworkConnections": [], "virtualHubRouteTableV2s": [], - "routeTables": [ - { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubRouteTables/hubRouteTable1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "name": "hubRouteTable1", - "properties": { - "provisioningState": "Succeeded", - "routes": [ - { - "name": "route1", - "destinationType": "CIDR", - "destinations": [ - "10.0.0.0/8", - "20.0.0.0/8", - "30.0.0.0/8" - ], - "nextHopType": "ResourceId", - "nextHop": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azureFirewall1" - } - ], - "labels": [ - "label1", - "label2" - ], - "associatedConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2/hubVirtualNetworkConnections/connection1" - ], - "propagatingConnections": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" - ] - } - } - ], "addressPrefix": "10.168.0.0/24", "sku": "Basic" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index 83919bdea4a5..b8231e76009f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4185,13 +4185,6 @@ "$ref": "#/definitions/VirtualHubRouteTable", "description": "The routeTable associated with this virtual hub." }, - "routeTables": { - "type": "array", - "description": "List of all RouteTables associated with this VirtualHub.", - "items": { - "$ref": "#/definitions/HubRouteTable" - } - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -4733,11 +4726,15 @@ "$ref": "./network.json#/definitions/SubResource" } ], - "description": "RouteTable Resource." + "description": "RouteTable resource in a virtual hub." }, "HubRoute": { "required": [ - "name" + "name", + "destinationType", + "destinations", + "nextHopType", + "nextHop" ], "properties": { "name": { @@ -4746,7 +4743,7 @@ }, "destinationType": { "type": "string", - "description": "The type of destinations." + "description": "The type of destinations (eg: CIDR, ResourceId, Service)." }, "destinations": { "type": "array", @@ -4757,7 +4754,7 @@ }, "nextHopType": { "type": "string", - "description": "The type of next hops." + "description": "The type of next hop (eg: ResourceId)." }, "nextHop": { "type": "string", From e3297b82b44e1efb477f72448cd188e1c89563d7 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Thu, 30 Apr 2020 17:36:45 -0700 Subject: [PATCH 18/20] onemore fix --- .../Microsoft.Network/stable/2020-04-01/virtualWan.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index b8231e76009f..ba73eab7e9d5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4702,9 +4702,6 @@ "description": "Parameters for RouteTable." }, "HubRouteTable": { - "required": [ - "name" - ], "properties": { "properties": { "x-ms-client-flatten": true, From 846d919edf5ffb60a76b5c88c132bb01ed2a65bc Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Fri, 1 May 2020 08:25:33 -0700 Subject: [PATCH 19/20] added type --- .../stable/2020-04-01/examples/HubRouteTableGet.json | 3 ++- .../stable/2020-04-01/examples/HubRouteTableList.json | 6 ++++-- .../stable/2020-04-01/examples/HubRouteTablePut.json | 6 ++++-- .../Microsoft.Network/stable/2020-04-01/virtualWan.json | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json index e0f57d9d7c2a..c2bc243e9467 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableGet.json @@ -39,7 +39,8 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] - } + }, + "type": "Microsoft.Network/virtualHubs/hubRouteTables" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json index 015cd7a5ac18..097cd3fd2f9c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTableList.json @@ -39,7 +39,8 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] - } + }, + "type": "Microsoft.Network/virtualHubs/hubRouteTables" }, { "name": "hubRouteTable2", @@ -71,7 +72,8 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn2", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn1" ] - } + }, + "type": "Microsoft.Network/virtualHubs/hubRouteTables" } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json index 91038d87f4b8..70a2bb93a795 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/HubRouteTablePut.json @@ -60,7 +60,8 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] - } + }, + "type": "Microsoft.Network/virtualHubs/hubRouteTables" } }, "201": { @@ -95,7 +96,8 @@ "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/erg1/expressRouteConnections/erConn1", "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw1/vpnConnections/vpnConn2" ] - } + }, + "type": "Microsoft.Network/virtualHubs/hubRouteTables" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index ba73eab7e9d5..c3be2c7eec09 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4716,7 +4716,8 @@ "type": "string", "readOnly": true, "description": "A unique read-only string that changes whenever the resource is updated." - } + }, + "type": "Microsoft.Network/virtualHubs/hubRouteTables" }, "allOf": [ { From a43c60d9e10c3178f12aa1997d9718d9c97e8d20 Mon Sep 17 00:00:00 2001 From: Ritvika Nagula Date: Fri, 1 May 2020 14:25:18 -0700 Subject: [PATCH 20/20] added type --- .../Microsoft.Network/stable/2020-04-01/virtualWan.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json index c3be2c7eec09..3062c1da736d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/virtualWan.json @@ -4717,7 +4717,11 @@ "readOnly": true, "description": "A unique read-only string that changes whenever the resource is updated." }, - "type": "Microsoft.Network/virtualHubs/hubRouteTables" + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + } }, "allOf": [ {