From 7a9e940655351ba6fc698469e1ad53db2c487cdd Mon Sep 17 00:00:00 2001 From: Girish Motwani Date: Thu, 1 Mar 2018 15:19:47 -0800 Subject: [PATCH 1/4] Update CrossConnection Route Table Summary record Fix the name for CrossConnection Put Operation --- ...essRouteCrossConnectionBgpPeeringList.json | 6 +-- ...uteCrossConnectionListByResourceGroup.json | 4 +- ...outeCrossConnectionsRouteTableSummary.json | 12 ++--- .../expressRouteCrossConnection.json | 47 +++++++++++++++++-- 4 files changed, 53 insertions(+), 16 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json index 2156e72cc084..f3eacd3a4f56 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json @@ -1,7 +1,7 @@ { "parameters": { "crossConnectionName": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b", - "resourceGroupName": "rg1", + "resourceGroupName": "CrossConnection-SiliconValley", "api-version": "2018-02-01", "subscriptionId": "subid" }, @@ -10,8 +10,8 @@ "body": { "value": [ { - "name": "AzurePrivatePeering", - "id": "/subscriptions/99c33776-9f4e-4e58-abe8-9263db1b9c6e/resourceGroups/CrossConnection-Boydton1DC/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-9547feab-3c14-4e8b-8d0e-b5e74cd5ed7a/peerings/AzurePrivatePeering", + "name": "AzurePrivatePeering", + "id": "/subscriptions/subid/resourceGroups/CrossConnection-SiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b/peerings/AzurePrivatePeering", "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", "properties": { "provisioningState": "Succeeded", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionListByResourceGroup.json index a08813fb211c..2735345fac26 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionListByResourceGroup.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-02-01", - "resourceGroupName": "CrossConnectionSiliconValley", + "resourceGroupName": "CrossConnection-SiliconValley", "subscriptionId": "subid" }, "responses": { @@ -10,7 +10,7 @@ "value": [ { "name": "CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b", - "id": "/subscriptions/subid/resourceGroups/CrossConnectionSiliconValley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b", + "id": "/subscriptions/subid/resourceGroups/CrossConnectionSilicon-Valley/providers/Microsoft.Network/expressRouteCrossConnections/CrossConnection-6e918437-5077-4ffe-b45f-0b7c0672da4b", "type": "Microsoft.Network/expressRouteCrossConnections", "location": "brazilsouth", "properties": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json index 24f8063d6317..a8921dfc8d7f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json @@ -13,17 +13,15 @@ "value": [ { "neighbor": "10.6.1.112", - "v": 4 , - "as": 65514, + "asn": 65514, "upDown": "1d14h", - "statePfxRcd": "Active" + "prefixesReceived": "Active" }, { "neighbor": "10.6.1.113", - "v": 4 , - "as": 65514, + "asn": 65514, "upDown": "1d14h", - "statePfxRcd": "1" + "prefixesReceived": "1" } ] } @@ -31,4 +29,4 @@ "202": { } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json index bc955e76c3ee..08b676231313 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json @@ -156,7 +156,7 @@ "tags": [ "ExpressRouteCrossConnections" ], - "operationId": "ExpressRouteCrossConnections_Put", + "operationId": "ExpressRouteCrossConnections_CreateOrUpdate", "description": "Update the specified ExpressRouteCrossConnection.", "parameters": [ { @@ -455,13 +455,13 @@ "200": { "description": "Update successful. The operation returns the resulting ExpressRouteCrossConnectionPeering resource.", "schema": { - "$ref": "#/definitions/ExpressRouteCircuitPeering" + "$ref": "./expressRouteCircuit.json#/definitions/ExpressRouteCircuitPeering" } }, "201": { "description": "Create successful. The operation returns the resulting ExpressRouteCrossConnectionPeering resource.", "schema": { - "$ref": "#/definitions/ExpressRouteCircuitPeering" + "$ref": "./expressRouteCircuit.json#/definitions/ExpressRouteCircuitPeering" } } }, @@ -582,7 +582,7 @@ "200": { "description": "Request successful. The operation returns the resulting ExpressRouteCrossConnectionsRouteTableSummary resource.", "schema": { - "$ref": "./expressRouteCircuit.json#/definitions/ExpressRouteCircuitsRoutesTableSummaryListResult" + "$ref": "#/definitions/ExpressRouteCrossConnectionsRoutesTableSummaryListResult" } }, "202": { @@ -661,6 +661,45 @@ } }, "definitions": { + "ExpressRouteCrossConnectionRoutesTableSummary": { + "properties": { + "neighbor": { + "type": "string", + "description": "Neighbor" + }, + "asn": { + "type": "integer", + "format": "int32", + "description": "Autonomous system number." + }, + "upDown": { + "type": "string", + "description": "The length of time that the BGP session has been in the Established state, or the current status if not in the Established state." + }, + "prefixesReceived": { + "type": "string", + "description": "Current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group." + } + }, + "description": "The routes table associated with the ExpressRouteCircuit." + }, + "ExpressRouteCrossConnectionsRoutesTableSummaryListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ExpressRouteCrossConnectionRoutesTableSummary" + }, + "description": "A list of the routes table." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of results." + } + }, + "description": "Response for ListRoutesTable associated with the Express Route Cross Connections." + }, + "ExpressRouteCircuitReference": { "properties": { "id": { From b9a1c90b4ce1af3646ea449f2d67e33927671af0 Mon Sep 17 00:00:00 2001 From: Girish Motwani Date: Fri, 2 Mar 2018 13:51:03 -0800 Subject: [PATCH 2/4] Address review comments --- .../stable/2018-02-01/expressRouteCrossConnection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json index 08b676231313..64c824747f7a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json @@ -693,13 +693,13 @@ "description": "A list of the routes table." }, "nextLink": { + "readOnly": true, "type": "string", "description": "The URL to get the next set of results." } }, "description": "Response for ListRoutesTable associated with the Express Route Cross Connections." }, - "ExpressRouteCircuitReference": { "properties": { "id": { From d91cff55564e47742b70bfd3a70531499b3b2275 Mon Sep 17 00:00:00 2001 From: Girish Motwani Date: Fri, 2 Mar 2018 14:44:11 -0800 Subject: [PATCH 3/4] Update prefixesReceived to stateOrPrefixesReceived --- .../ExpressRouteCrossConnectionsRouteTableSummary.json | 4 ++-- .../stable/2018-02-01/expressRouteCrossConnection.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json index a8921dfc8d7f..d0f16aefbf99 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/ExpressRouteCrossConnectionsRouteTableSummary.json @@ -15,13 +15,13 @@ "neighbor": "10.6.1.112", "asn": 65514, "upDown": "1d14h", - "prefixesReceived": "Active" + "stateOrPrefixesReceived": "Active" }, { "neighbor": "10.6.1.113", "asn": 65514, "upDown": "1d14h", - "prefixesReceived": "1" + "stateOrPrefixesReceived": "1" } ] } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json index 64c824747f7a..fdbdb8c6d312 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json @@ -676,7 +676,7 @@ "type": "string", "description": "The length of time that the BGP session has been in the Established state, or the current status if not in the Established state." }, - "prefixesReceived": { + "stateOrPrefixesReceived": { "type": "string", "description": "Current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group." } From 21e87bb25124a362f13b7198f77c4ad02c80a8ae Mon Sep 17 00:00:00 2001 From: Girish Motwani Date: Mon, 5 Mar 2018 10:17:24 -0800 Subject: [PATCH 4/4] address review comments - add meaningful description for Neighbour --- .../stable/2018-02-01/expressRouteCrossConnection.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json index fdbdb8c6d312..eeb8c46b9278 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/expressRouteCrossConnection.json @@ -665,7 +665,7 @@ "properties": { "neighbor": { "type": "string", - "description": "Neighbor" + "description": "IP address of Neighbor router" }, "asn": { "type": "integer",