From 6c4312edb758be23c2bdd7f8c2da0b8b76541187 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Thu, 18 Oct 2018 20:05:15 +0300 Subject: [PATCH] Cherry pick NRP's changes from master to October branch (#4251) * Remove error code from swagger (#4103) * Modifying example templates : enabling Ipv6 support for Private Peering (#4232) * Modifying example templates : enabling Ipv6 support for Private Peering * Resolving oav validation error --- .../ExpressRouteCircuitPeeringCreate.json | 18 +++++++++++++++-- .../ExpressRouteCircuitPeeringList.json | 5 +++++ ...sRouteCrossConnectionBgpPeeringCreate.json | 20 ++++++++++++++++--- ...ressRouteCrossConnectionBgpPeeringGet.json | 7 ++++++- ...essRouteCrossConnectionBgpPeeringList.json | 7 ++++++- .../2018-08-01/expressRouteGateway.json | 3 --- 6 files changed, 50 insertions(+), 10 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json index 1abd9d31ca2e..a6baf5083f12 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json @@ -11,7 +11,11 @@ "peerASN": 200, "primaryPeerAddressPrefix": "192.168.16.252/30", "secondaryPeerAddressPrefix": "192.168.18.252/30", - "vlanId": 200 + "vlanId": 200, + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126" + } } } }, @@ -34,6 +38,11 @@ "vlanId": 200, "gatewayManagerEtag": "", "lastModifiedBy": "Customer", + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126", + "state": "Enabled" + }, "expressRouteConnection": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName" } @@ -57,7 +66,12 @@ "state": "Enabled", "vlanId": 200, "gatewayManagerEtag": "", - "lastModifiedBy": "Customer", + "lastModifiedBy": "Customer", + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126", + "state": "Enabled" + }, "expressRouteConnection": "" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json index ffaab9b7395f..e5f2ebb8ced8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json @@ -70,6 +70,11 @@ "vlanId": 200, "gatewayManagerEtag": "103", "lastModifiedBy": "Customer", + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126", + "state": "Enabled" + }, "expressRouteConnection": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/expressRouteGateways/expressRouteGatewayName/expressRouteConnections/connectionName" } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json index f09b381a4358..9e54c4977070 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json @@ -11,7 +11,11 @@ "peerASN": 200, "primaryPeerAddressPrefix": "192.168.16.252/30", "secondaryPeerAddressPrefix": "192.168.18.252/30", - "vlanId": 200 + "vlanId": 200, + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126" + } } } }, @@ -33,7 +37,12 @@ "state": "Enabled", "vlanId": 200, "gatewayManagerEtag": "", - "lastModifiedBy": "Customer" + "lastModifiedBy": "Customer", + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126", + "state": "Enabled" + } } } }, @@ -54,7 +63,12 @@ "state": "Enabled", "vlanId": 200, "gatewayManagerEtag": "", - "lastModifiedBy": "Customer" + "lastModifiedBy": "Customer", + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126", + "state": "Enabled" + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json index a043bc9f1363..db8c8d4b443b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json @@ -24,7 +24,12 @@ "state": "Enabled", "vlanId": 200, "gatewayManagerEtag": "", - "lastModifiedBy": "Customer" + "lastModifiedBy": "Customer", + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126", + "state": "Enabled" + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json index 1c3b137cb1a5..7e0297c1a40f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json @@ -25,7 +25,12 @@ "state": "Enabled", "vlanId": 200, "gatewayManagerEtag": "", - "lastModifiedBy": "Customer" + "lastModifiedBy": "Customer", + "ipv6PeeringConfig": { + "primaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::/126", + "secondaryPeerAddressPrefix": "3FFE:FFFF:0:CD30::4/126", + "state": "Enabled" + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json index 8d212cbfb166..29e1ed248e2d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json @@ -199,9 +199,6 @@ "schema": { "$ref": "#/definitions/ExpressRouteGateway" } - }, - "404": { - "description": "Not found. The specified resource does not exist." } } },