From d37ad0c560a207cc62402c3a0cf92a3d1013b32c Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Tue, 11 Aug 2020 21:26:57 -0700 Subject: [PATCH 01/10] Add virtual hub bgp connections subresources virtualRouterPeerAdvertisedRoute and virtualRouterPeerLearnedRoute with POST opertion --- .../VirtualRouterPeerAdvertisedRouteGet.json | 13 ++ .../VirtualRouterPeerLearnedRouteGet.json | 13 ++ .../stable/2020-06-01/virtualWan.json | 161 ++++++++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json new file mode 100644 index 000000000000..1f0b6a5d17a1 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "virtualRouterName": "virtualRouter1", + "peerName": "peer1" + }, + "responses": { + "202": {}, + "200": { + "body": {} + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json new file mode 100644 index 000000000000..1f0b6a5d17a1 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "virtualRouterName": "virtualRouter1", + "peerName": "peer1" + }, + "responses": { + "202": {}, + "200": { + "body": {} + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json index af4f29898cb9..bf28f7e0c3a3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json @@ -4362,6 +4362,114 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{hubName}/bgpConnections/{connectionname}/learnedRoutes": { + "post": { + "operationId": "VirtualHubBgpConnections_GetLearnedRoutes", + "description": "Retrieves a list of routes the virtual router peer has learned.", + "parameters": [ + { + "name": "virtualRouterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual router." + }, + { + "name": "peerName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual router peer." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "List of advertised BGP routes.", + "schema": { + "$ref": "#/definitions/PeerRouteList" + } + }, + "202": { + "description": "Accepted and the operation will complete asynchronously." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "GetVirtualRouterPeerLearnedRoutes": { + "$ref": "./examples/VirtualRouterPeerLearnedRouteGet.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{hubName}/bgpConnections/{connectionname}/advertisedRoutes": { + "post": { + "operationId": "VirtualHubBgpConnections_GetAdvertisedRoutes", + "description": "Retrieves a list of routes the virtual router peer is advertising to the specified peer.", + "parameters": [ + { + "name": "virtualRouterName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual router." + }, + { + "name": "peerName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual router peer." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "List of learned BGP routes.", + "schema": { + "$ref": "#/definitions/PeerRouteListResult" + } + }, + "202": { + "description": "Accepted and the operation will complete asynchronously." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "GetVirtualRouterPeerAdvertisedRoutes": { + "$ref": "./examples/VirtualRouterPeerAdvertisedRouteGet.json" + } + }, + "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}/ipConfigurations/{ipConfigName}": { "get": { "operationId": "VirtualHubIpConfiguration_Get", @@ -5342,6 +5450,59 @@ }, "description": "Properties of the bgp connection." }, + "PeerRoute": { + "properties": { + "localAddress": { + "type": "string", + "readOnly": true, + "description": "The peer's local address." + }, + "network": { + "type": "string", + "readOnly": true, + "description": "The route's network prefix." + }, + "nextHop": { + "type": "string", + "readOnly": true, + "description": "The route's next hop." + }, + "sourcePeer": { + "type": "string", + "readOnly": true, + "description": "The peer this route was learned from." + }, + "origin": { + "type": "string", + "readOnly": true, + "description": "The source this route was learned from." + }, + "asPath": { + "type": "string", + "readOnly": true, + "description": "The route's AS path sequence." + }, + "weight": { + "type": "integer", + "format": "int32", + "readOnly": true, + "description": "The route's weight." + } + }, + "description": "Peer routing details." + }, + "PeerRouteList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/PeerRoute" + }, + "description": "List of peer routes." + } + }, + "description": "List of virtual router peer routes." + }, "HubIpConfiguration": { "properties": { "properties": { From a9f762db9531076096d54b1a9694c2d099325c84 Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Wed, 12 Aug 2020 15:07:39 -0700 Subject: [PATCH 02/10] Add examples --- .../VirtualRouterPeerAdvertisedRouteGet.json | 55 ++++++++++++++++++- .../VirtualRouterPeerLearnedRouteGet.json | 25 ++++++++- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json index 1f0b6a5d17a1..e33a86a515d2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json @@ -7,7 +7,60 @@ "responses": { "202": {}, "200": { - "body": {} + "body": { + "VirtualRouter_0": [ + { + "localAddress": "10.85.3.4", + "network": "10.45.0.0/16", + "nextHop": "10.85.3.4", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.4", + "network": "10.85.0.0/16", + "nextHop": "10.85.3.4", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.4", + "network": "10.100.0.0/16", + "nextHop": "10.85.3.4", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + } + ], + "VirtualRouter_1": [ + { + "localAddress": "10.85.3.5", + "network": "10.45.0.0/16", + "nextHop": "10.85.3.5", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.5", + "network": "10.85.0.0/16", + "nextHop": "10.85.3.5", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.5", + "network": "10.100.0.0/16", + "nextHop": "10.85.3.5", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + } + ] + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json index 1f0b6a5d17a1..266e7bf6c35c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json @@ -7,7 +7,30 @@ "responses": { "202": {}, "200": { - "body": {} + "body": { + "VirtualRouter_0": [ + { + "localAddress": "10.85.3.4", + "network": "10.101.0.0/16", + "nextHop": "10.85.4.4", + "sourcePeer": "10.85.4.4", + "origin": "EBgp", + "asPath": "65002-65001", + "weight": 32768 + } + ], + "VirtualRouter_1": [ + { + "localAddress": "10.85.3.5", + "network": "10.101.0.0/16", + "nextHop": "10.85.4.4", + "sourcePeer": "10.85.4.4", + "origin": "EBgp", + "asPath": "65002-65001", + "weight": 32768 + } + ] + } } } } From f6f42c40bd720ec7ec8ee85be560dd56832b1877 Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Wed, 12 Aug 2020 20:19:18 -0700 Subject: [PATCH 03/10] Change name of operationid --- ...VirtualRouterPeerListAdvertisedRoute.json} | 34 +----- ...=> VirtualRouterPeerListLearnedRoute.json} | 12 +- .../stable/2020-06-01/virtualWan.json | 114 ++++++++++++++---- 3 files changed, 99 insertions(+), 61 deletions(-) rename specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/{VirtualRouterPeerAdvertisedRouteGet.json => VirtualRouterPeerListAdvertisedRoute.json} (50%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/{VirtualRouterPeerLearnedRouteGet.json => VirtualRouterPeerListLearnedRoute.json} (81%) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json similarity index 50% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json index e33a86a515d2..4857c665fe62 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json @@ -1,14 +1,16 @@ { "parameters": { "api-version": "2020-06-01", - "virtualRouterName": "virtualRouter1", - "peerName": "peer1" + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "hubName": "virtualRouter1", + "connectionName": "peer1" }, "responses": { "202": {}, "200": { "body": { - "VirtualRouter_0": [ + "value": [ { "localAddress": "10.85.3.4", "network": "10.45.0.0/16", @@ -33,32 +35,6 @@ "asPath": "65515", "weight": 0 } - ], - "VirtualRouter_1": [ - { - "localAddress": "10.85.3.5", - "network": "10.45.0.0/16", - "nextHop": "10.85.3.5", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - }, - { - "localAddress": "10.85.3.5", - "network": "10.85.0.0/16", - "nextHop": "10.85.3.5", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - }, - { - "localAddress": "10.85.3.5", - "network": "10.100.0.0/16", - "nextHop": "10.85.3.5", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - } ] } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListLearnedRoute.json similarity index 81% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListLearnedRoute.json index 266e7bf6c35c..8698df29e77c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListLearnedRoute.json @@ -1,14 +1,16 @@ { "parameters": { "api-version": "2020-06-01", - "virtualRouterName": "virtualRouter1", - "peerName": "peer1" + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "hubName": "virtualRouter1", + "connectionName": "peer1" }, "responses": { "202": {}, "200": { "body": { - "VirtualRouter_0": [ + "value": [ { "localAddress": "10.85.3.4", "network": "10.101.0.0/16", @@ -17,9 +19,7 @@ "origin": "EBgp", "asPath": "65002-65001", "weight": 32768 - } - ], - "VirtualRouter_1": [ + }, { "localAddress": "10.85.3.5", "network": "10.101.0.0/16", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json index bf28f7e0c3a3..31bb94db3605 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json @@ -4362,24 +4362,31 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{hubName}/bgpConnections/{connectionname}/learnedRoutes": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{hubName}/bgpConnections/{connectionName}/learnedRoutes": { "post": { - "operationId": "VirtualHubBgpConnections_GetLearnedRoutes", - "description": "Retrieves a list of routes the virtual router peer has learned.", + "operationId": "VirtualHubBgpConnections_ListLearnedRoutes", + "description": "Retrieves a list of routes the virtual hub bgp connection has learned.", "parameters": [ { - "name": "virtualRouterName", + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "hubName", "in": "path", "required": true, "type": "string", - "description": "The name of the virtual router." + "description": "The name of the virtual hub." }, { - "name": "peerName", + "name": "connectionName", "in": "path", "required": true, "type": "string", - "description": "The name of the virtual router peer." + "description": "The name of the virtual hub bgp connection." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -4392,7 +4399,7 @@ "200": { "description": "List of advertised BGP routes.", "schema": { - "$ref": "#/definitions/PeerRouteList" + "$ref": "#/definitions/LearnedRouteList" } }, "202": { @@ -4406,8 +4413,8 @@ } }, "x-ms-examples": { - "GetVirtualRouterPeerLearnedRoutes": { - "$ref": "./examples/VirtualRouterPeerLearnedRouteGet.json" + "VirtualRouterPeerListLearnedRoutes": { + "$ref": "./examples/VirtualRouterPeerListLearnedRoute.json" } }, "x-ms-long-running-operation": true, @@ -4416,24 +4423,31 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{hubName}/bgpConnections/{connectionname}/advertisedRoutes": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{hubName}/bgpConnections/{connectionName}/advertisedRoutes": { "post": { - "operationId": "VirtualHubBgpConnections_GetAdvertisedRoutes", - "description": "Retrieves a list of routes the virtual router peer is advertising to the specified peer.", + "operationId": "VirtualHubBgpConnections_ListAdvertisedRoutes", + "description": "Retrieves a list of routes the virtual hub bgp connection is advertising to the specified peer.", "parameters": [ { - "name": "virtualRouterName", + "name": "resourceGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the virtual router." + "description": "The name of the resource group." }, { - "name": "peerName", + "name": "hubName", "in": "path", "required": true, "type": "string", - "description": "The name of the virtual router peer." + "description": "The name of the virtual hub." + }, + { + "name": "connectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the virtual hub bgp connection." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -4446,7 +4460,7 @@ "200": { "description": "List of learned BGP routes.", "schema": { - "$ref": "#/definitions/PeerRouteListResult" + "$ref": "#/definitions/AdvertisedRouteList" } }, "202": { @@ -4460,8 +4474,8 @@ } }, "x-ms-examples": { - "GetVirtualRouterPeerAdvertisedRoutes": { - "$ref": "./examples/VirtualRouterPeerAdvertisedRouteGet.json" + "VirtualRouterPeerListAdvertisedRoutes": { + "$ref": "./examples/VirtualRouterPeerListAdvertisedRoute.json" } }, "x-ms-long-running-operation": true, @@ -5450,7 +5464,55 @@ }, "description": "Properties of the bgp connection." }, - "PeerRoute": { + "AdvertisedRoute": { + "properties": { + "localAddress": { + "type": "string", + "readOnly": true, + "description": "The peer's local address." + }, + "network": { + "type": "string", + "readOnly": true, + "description": "The route's network prefix." + }, + "nextHop": { + "type": "string", + "readOnly": true, + "description": "The route's next hop." + }, + "origin": { + "type": "string", + "readOnly": true, + "description": "The source this route was learned from." + }, + "asPath": { + "type": "string", + "readOnly": true, + "description": "The route's AS path sequence." + }, + "weight": { + "type": "integer", + "format": "int32", + "readOnly": true, + "description": "The route's weight." + } + }, + "description": "Peer advertised routing details." + }, + "AdvertisedRouteList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/AdvertisedRoute" + }, + "description": "List of peer advertised routes." + } + }, + "description": "List of virtual router peer advertised routes." + }, + "LearnedRoute": { "properties": { "localAddress": { "type": "string", @@ -5489,19 +5551,19 @@ "description": "The route's weight." } }, - "description": "Peer routing details." + "description": "Peer learned routing details." }, - "PeerRouteList": { + "LearnedRouteList": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/PeerRoute" + "$ref": "#/definitions/LearnedRoute" }, - "description": "List of peer routes." + "description": "List of peer learned routes." } }, - "description": "List of virtual router peer routes." + "description": "List of virtual router peer learned routes." }, "HubIpConfiguration": { "properties": { From 34bc612b0206dabccd56bb710601ae92a3187f2d Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Wed, 12 Aug 2020 23:43:13 -0700 Subject: [PATCH 04/10] change output of advertised route --- .../VirtualRouterPeerListAdvertisedRoute.json | 3 + .../stable/2020-06-01/virtualWan.json | 64 +++---------------- 2 files changed, 11 insertions(+), 56 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json index 4857c665fe62..306043112c01 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json @@ -15,6 +15,7 @@ "localAddress": "10.85.3.4", "network": "10.45.0.0/16", "nextHop": "10.85.3.4", + "sourcePeer": "10.85.3.4", "origin": "Igp", "asPath": "65515", "weight": 0 @@ -23,6 +24,7 @@ "localAddress": "10.85.3.4", "network": "10.85.0.0/16", "nextHop": "10.85.3.4", + "sourcePeer": "10.85.3.4", "origin": "Igp", "asPath": "65515", "weight": 0 @@ -31,6 +33,7 @@ "localAddress": "10.85.3.4", "network": "10.100.0.0/16", "nextHop": "10.85.3.4", + "sourcePeer": "10.85.3.4", "origin": "Igp", "asPath": "65515", "weight": 0 diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json index 31bb94db3605..e995b7ddf3da 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json @@ -4399,7 +4399,7 @@ "200": { "description": "List of advertised BGP routes.", "schema": { - "$ref": "#/definitions/LearnedRouteList" + "$ref": "#/definitions/PeerRouteList" } }, "202": { @@ -4460,7 +4460,7 @@ "200": { "description": "List of learned BGP routes.", "schema": { - "$ref": "#/definitions/AdvertisedRouteList" + "$ref": "#/definitions/PeerRouteList" } }, "202": { @@ -5464,55 +5464,7 @@ }, "description": "Properties of the bgp connection." }, - "AdvertisedRoute": { - "properties": { - "localAddress": { - "type": "string", - "readOnly": true, - "description": "The peer's local address." - }, - "network": { - "type": "string", - "readOnly": true, - "description": "The route's network prefix." - }, - "nextHop": { - "type": "string", - "readOnly": true, - "description": "The route's next hop." - }, - "origin": { - "type": "string", - "readOnly": true, - "description": "The source this route was learned from." - }, - "asPath": { - "type": "string", - "readOnly": true, - "description": "The route's AS path sequence." - }, - "weight": { - "type": "integer", - "format": "int32", - "readOnly": true, - "description": "The route's weight." - } - }, - "description": "Peer advertised routing details." - }, - "AdvertisedRouteList": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/AdvertisedRoute" - }, - "description": "List of peer advertised routes." - } - }, - "description": "List of virtual router peer advertised routes." - }, - "LearnedRoute": { + "PeerRoute": { "properties": { "localAddress": { "type": "string", @@ -5551,19 +5503,19 @@ "description": "The route's weight." } }, - "description": "Peer learned routing details." + "description": "Peer routing details." }, - "LearnedRouteList": { + "PeerRouteList": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/LearnedRoute" + "$ref": "#/definitions/PeerRoute" }, - "description": "List of peer learned routes." + "description": "List of peer routes." } }, - "description": "List of virtual router peer learned routes." + "description": "List of virtual router peer routes." }, "HubIpConfiguration": { "properties": { From b8e22cc45f197a927527481ccc2c6534b50d23d9 Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Thu, 6 Aug 2020 22:19:53 -0700 Subject: [PATCH 05/10] Add PUT InboundSecurityRules for NVA --- .../examples/InboundSecurityRulePut.json | 56 +++++++ .../examples/NetworkVirtualApplianceGet.json | 5 + ...rkVirtualApplianceListByResourceGroup.json | 5 + ...orkVirtualApplianceListBySubscription.json | 5 + .../examples/NetworkVirtualAppliancePut.json | 10 ++ .../2020-06-01/networkVirtualAppliance.json | 156 ++++++++++++++++++ 6 files changed, 237 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/InboundSecurityRulePut.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/InboundSecurityRulePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/InboundSecurityRulePut.json new file mode 100644 index 000000000000..5720bada9d5b --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/InboundSecurityRulePut.json @@ -0,0 +1,56 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "ruleCollectionName": "rule1", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "networkVirtualApplianceName": "nva", + "parameters": { + "properties": { + "rules": [ + { + "protocol": "TCP", + "sourceAddressPrefix": "50.20.121.5/32", + "destinationPortRange": 22 + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "rule1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/InboundSecurityRules/rule1", + "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", + "properties": { + "provisioningState": "Succeeded", + "rules": [ + { + "protocol": "TCP", + "sourceAddressPrefix": "50.20.121.5/32", + "destinationPortRange": 22 + } + ] + } + } + }, + "201": { + "body": { + "name": "rule1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/InboundSecurityRules/rule1", + "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", + "properties": { + "provisioningState": "Succeeded", + "rules": [ + { + "protocol": "TCP", + "sourceAddressPrefix": "50.20.121.5/32", + "destinationPortRange": 22 + } + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceGet.json index d17aae9db7e9..7ca3eb906130 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceGet.json @@ -37,6 +37,11 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1" } ], + "inboundSecurityRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/InboundSecurityRules/rule1" + } + ], "provisioningState": "Succeeded", "bootStrapConfigurationBlobs": [ "https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListByResourceGroup.json index d897debf6f06..e851dc12a0d0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListByResourceGroup.json @@ -38,6 +38,11 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1" } ], + "inboundSecurityRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/InboundSecurityRules/rule1" + } + ], "provisioningState": "Succeeded", "bootStrapConfigurationBlobs": [ "https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListBySubscription.json index f8f5eadb0802..5a6523d431d7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualApplianceListBySubscription.json @@ -37,6 +37,11 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1" } ], + "inboundSecurityRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/InboundSecurityRules/rule1" + } + ], "provisioningState": "Succeeded", "bootStrapConfigurationBlobs": [ "https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualAppliancePut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualAppliancePut.json index e140c02c324f..d26b15442147 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualAppliancePut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/NetworkVirtualAppliancePut.json @@ -66,6 +66,11 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1" } ], + "inboundSecurityRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/InboundSecurityRules/rule1" + } + ], "provisioningState": "Succeeded", "bootStrapConfigurationBlobs": [ "https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig" @@ -119,6 +124,11 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1" } ], + "inboundSecurityRules": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/InboundSecurityRules/rule1" + } + ], "provisioningState": "Succeeded", "bootStrapConfigurationBlobs": [ "https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkVirtualAppliance.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkVirtualAppliance.json index 905060fb1e01..b7ad4a5a71ed 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkVirtualAppliance.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/networkVirtualAppliance.json @@ -682,6 +682,79 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}/inboundSecurityRules/{ruleCollectionName}": { + "put": { + "operationId": "InboundSecurityRule_CreateOrUpdate", + "description": "Creates or updates the specified Network Virtual Appliance Inbound Security Rules.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "networkVirtualApplianceName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Network Virtual Appliance." + }, + { + "name": "ruleCollectionName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of security rule collection." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/InboundSecurityRule" + }, + "description": "Parameters supplied to the create or update Network Virtual Appliance Inbound Security Rules operation." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns the resulting Network Virtual Appliance Inbound Security Rules resource.", + "schema": { + "$ref": "#/definitions/InboundSecurityRule" + } + }, + "201": { + "description": "Request received successfully. The operation returns the resulting Network Virtual Appliance Inbound Security Rules resource.", + "schema": { + "$ref": "#/definitions/InboundSecurityRule" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Create Network Virtual Appliance Inbound Security Rules": { + "$ref": "./examples/InboundSecurityRulePut.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + } } }, "definitions": { @@ -771,6 +844,14 @@ "$ref": "./network.json#/definitions/SubResource" } }, + "inboundSecurityRules": { + "type": "array", + "readOnly": true, + "description": "List of references to InboundSecurityRules.", + "items": { + "$ref": "./network.json#/definitions/SubResource" + } + }, "provisioningState": { "description": "The provisioning state of the resource.", "readOnly": true, @@ -1009,6 +1090,81 @@ } }, "description": "Response for ListNetworkVirtualApplianceSkus API service call." + }, + "InboundSecurityRule": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/InboundSecurityRuleProperties", + "description": "The properties of the Inbound Security Rules." + }, + "name": { + "type": "string", + "description": "Name of security rule collection." + }, + "etag": { + "type": "string", + "readOnly": true, + "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "type": "string", + "readOnly": true, + "description": "NVA inbound security rule type." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/SubResource" + } + ], + "description": "NVA Inbound Security Rule resource." + }, + "InboundSecurityRuleProperties": { + "properties": { + "rules": { + "type": "array", + "readOnly": false, + "description": "List of allowed rules.", + "items": { + "$ref": "#/definitions/InboundSecurityRules" + } + }, + "provisioningState": { + "description": "The provisioning state of the resource.", + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState" + } + }, + "description": "Properties of the Inbound Security Rules resource." + }, + "InboundSecurityRules": { + "properties": { + "protocol": { + "type": "string", + "enum": [ + "TCP", + "UDP" + ], + "x-ms-enum": { + "name": "InboundSecurityRulesProtocol", + "modelAsString": true + }, + "description": "Protocol. This should be either TCP or UDP." + }, + "sourceAddressPrefix": { + "type": "string", + "description": "The CIDR or source IP range. Only /30, /31 and /32 Ip ranges are allowed." + }, + "destinationPortRange": { + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 65535, + "description": "NVA port ranges to be opened up. One needs to provide specific ports." + } + }, + "description": "Properties of the Inbound Security Rules resource." } } } From f998a9abf10c5460aa86ff69c023686c0309482e Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Tue, 11 Aug 2020 21:26:57 -0700 Subject: [PATCH 06/10] merge --- .../VirtualRouterPeerAdvertisedRouteGet.json | 13 +++++++++++++ .../examples/VirtualRouterPeerLearnedRouteGet.json | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json new file mode 100644 index 000000000000..1f0b6a5d17a1 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "virtualRouterName": "virtualRouter1", + "peerName": "peer1" + }, + "responses": { + "202": {}, + "200": { + "body": {} + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json new file mode 100644 index 000000000000..1f0b6a5d17a1 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-06-01", + "virtualRouterName": "virtualRouter1", + "peerName": "peer1" + }, + "responses": { + "202": {}, + "200": { + "body": {} + } + } +} From d0359113408a48e5b0ab13b2325ef83439d3b8c4 Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Wed, 12 Aug 2020 15:07:39 -0700 Subject: [PATCH 07/10] Add examples --- .../VirtualRouterPeerAdvertisedRouteGet.json | 55 ++++++++++++++++++- .../VirtualRouterPeerLearnedRouteGet.json | 25 ++++++++- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json index 1f0b6a5d17a1..e33a86a515d2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json @@ -7,7 +7,60 @@ "responses": { "202": {}, "200": { - "body": {} + "body": { + "VirtualRouter_0": [ + { + "localAddress": "10.85.3.4", + "network": "10.45.0.0/16", + "nextHop": "10.85.3.4", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.4", + "network": "10.85.0.0/16", + "nextHop": "10.85.3.4", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.4", + "network": "10.100.0.0/16", + "nextHop": "10.85.3.4", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + } + ], + "VirtualRouter_1": [ + { + "localAddress": "10.85.3.5", + "network": "10.45.0.0/16", + "nextHop": "10.85.3.5", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.5", + "network": "10.85.0.0/16", + "nextHop": "10.85.3.5", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + }, + { + "localAddress": "10.85.3.5", + "network": "10.100.0.0/16", + "nextHop": "10.85.3.5", + "origin": "Igp", + "asPath": "65515", + "weight": 0 + } + ] + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json index 1f0b6a5d17a1..266e7bf6c35c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json @@ -7,7 +7,30 @@ "responses": { "202": {}, "200": { - "body": {} + "body": { + "VirtualRouter_0": [ + { + "localAddress": "10.85.3.4", + "network": "10.101.0.0/16", + "nextHop": "10.85.4.4", + "sourcePeer": "10.85.4.4", + "origin": "EBgp", + "asPath": "65002-65001", + "weight": 32768 + } + ], + "VirtualRouter_1": [ + { + "localAddress": "10.85.3.5", + "network": "10.101.0.0/16", + "nextHop": "10.85.4.4", + "sourcePeer": "10.85.4.4", + "origin": "EBgp", + "asPath": "65002-65001", + "weight": 32768 + } + ] + } } } } From 8577f7a1ac63b5f6b8537a428a3693006af674af Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Wed, 12 Aug 2020 20:19:18 -0700 Subject: [PATCH 08/10] merge --- .../VirtualRouterPeerAdvertisedRouteGet.json | 66 ------------------- .../VirtualRouterPeerLearnedRouteGet.json | 36 ---------- .../VirtualRouterPeerListAdvertisedRoute.json | 9 +++ .../stable/2020-06-01/virtualWan.json | 62 +++++++++++++++-- 4 files changed, 64 insertions(+), 109 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json deleted file mode 100644 index e33a86a515d2..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "parameters": { - "api-version": "2020-06-01", - "virtualRouterName": "virtualRouter1", - "peerName": "peer1" - }, - "responses": { - "202": {}, - "200": { - "body": { - "VirtualRouter_0": [ - { - "localAddress": "10.85.3.4", - "network": "10.45.0.0/16", - "nextHop": "10.85.3.4", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - }, - { - "localAddress": "10.85.3.4", - "network": "10.85.0.0/16", - "nextHop": "10.85.3.4", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - }, - { - "localAddress": "10.85.3.4", - "network": "10.100.0.0/16", - "nextHop": "10.85.3.4", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - } - ], - "VirtualRouter_1": [ - { - "localAddress": "10.85.3.5", - "network": "10.45.0.0/16", - "nextHop": "10.85.3.5", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - }, - { - "localAddress": "10.85.3.5", - "network": "10.85.0.0/16", - "nextHop": "10.85.3.5", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - }, - { - "localAddress": "10.85.3.5", - "network": "10.100.0.0/16", - "nextHop": "10.85.3.5", - "origin": "Igp", - "asPath": "65515", - "weight": 0 - } - ] - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json deleted file mode 100644 index 266e7bf6c35c..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "parameters": { - "api-version": "2020-06-01", - "virtualRouterName": "virtualRouter1", - "peerName": "peer1" - }, - "responses": { - "202": {}, - "200": { - "body": { - "VirtualRouter_0": [ - { - "localAddress": "10.85.3.4", - "network": "10.101.0.0/16", - "nextHop": "10.85.4.4", - "sourcePeer": "10.85.4.4", - "origin": "EBgp", - "asPath": "65002-65001", - "weight": 32768 - } - ], - "VirtualRouter_1": [ - { - "localAddress": "10.85.3.5", - "network": "10.101.0.0/16", - "nextHop": "10.85.4.4", - "sourcePeer": "10.85.4.4", - "origin": "EBgp", - "asPath": "65002-65001", - "weight": 32768 - } - ] - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json index 306043112c01..f6d300a37d34 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json @@ -15,7 +15,10 @@ "localAddress": "10.85.3.4", "network": "10.45.0.0/16", "nextHop": "10.85.3.4", +<<<<<<< HEAD "sourcePeer": "10.85.3.4", +======= +>>>>>>> f6f42c40b... Change name of operationid "origin": "Igp", "asPath": "65515", "weight": 0 @@ -24,7 +27,10 @@ "localAddress": "10.85.3.4", "network": "10.85.0.0/16", "nextHop": "10.85.3.4", +<<<<<<< HEAD "sourcePeer": "10.85.3.4", +======= +>>>>>>> f6f42c40b... Change name of operationid "origin": "Igp", "asPath": "65515", "weight": 0 @@ -33,7 +39,10 @@ "localAddress": "10.85.3.4", "network": "10.100.0.0/16", "nextHop": "10.85.3.4", +<<<<<<< HEAD "sourcePeer": "10.85.3.4", +======= +>>>>>>> f6f42c40b... Change name of operationid "origin": "Igp", "asPath": "65515", "weight": 0 diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json index e995b7ddf3da..95d41eb11810 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json @@ -4399,7 +4399,7 @@ "200": { "description": "List of advertised BGP routes.", "schema": { - "$ref": "#/definitions/PeerRouteList" + "$ref": "#/definitions/LearnedRouteList" } }, "202": { @@ -5464,7 +5464,55 @@ }, "description": "Properties of the bgp connection." }, - "PeerRoute": { + "AdvertisedRoute": { + "properties": { + "localAddress": { + "type": "string", + "readOnly": true, + "description": "The peer's local address." + }, + "network": { + "type": "string", + "readOnly": true, + "description": "The route's network prefix." + }, + "nextHop": { + "type": "string", + "readOnly": true, + "description": "The route's next hop." + }, + "origin": { + "type": "string", + "readOnly": true, + "description": "The source this route was learned from." + }, + "asPath": { + "type": "string", + "readOnly": true, + "description": "The route's AS path sequence." + }, + "weight": { + "type": "integer", + "format": "int32", + "readOnly": true, + "description": "The route's weight." + } + }, + "description": "Peer advertised routing details." + }, + "AdvertisedRouteList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/AdvertisedRoute" + }, + "description": "List of peer advertised routes." + } + }, + "description": "List of virtual router peer advertised routes." + }, + "LearnedRoute": { "properties": { "localAddress": { "type": "string", @@ -5503,19 +5551,19 @@ "description": "The route's weight." } }, - "description": "Peer routing details." + "description": "Peer learned routing details." }, - "PeerRouteList": { + "LearnedRouteList": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/PeerRoute" + "$ref": "#/definitions/LearnedRoute" }, - "description": "List of peer routes." + "description": "List of peer learned routes." } }, - "description": "List of virtual router peer routes." + "description": "List of virtual router peer learned routes." }, "HubIpConfiguration": { "properties": { From 676b2f606d4e1d92d49e7edf751fd9e8b6b5d20d Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Wed, 12 Aug 2020 20:19:18 -0700 Subject: [PATCH 09/10] merge --- .../examples/VirtualRouterPeerListAdvertisedRoute.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json index f6d300a37d34..306043112c01 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json @@ -15,10 +15,7 @@ "localAddress": "10.85.3.4", "network": "10.45.0.0/16", "nextHop": "10.85.3.4", -<<<<<<< HEAD "sourcePeer": "10.85.3.4", -======= ->>>>>>> f6f42c40b... Change name of operationid "origin": "Igp", "asPath": "65515", "weight": 0 @@ -27,10 +24,7 @@ "localAddress": "10.85.3.4", "network": "10.85.0.0/16", "nextHop": "10.85.3.4", -<<<<<<< HEAD "sourcePeer": "10.85.3.4", -======= ->>>>>>> f6f42c40b... Change name of operationid "origin": "Igp", "asPath": "65515", "weight": 0 @@ -39,10 +33,7 @@ "localAddress": "10.85.3.4", "network": "10.100.0.0/16", "nextHop": "10.85.3.4", -<<<<<<< HEAD "sourcePeer": "10.85.3.4", -======= ->>>>>>> f6f42c40b... Change name of operationid "origin": "Igp", "asPath": "65515", "weight": 0 From 4dc41cee4481348ea53c2af451d4c242553b3a3b Mon Sep 17 00:00:00 2001 From: Litchi Yang Date: Wed, 12 Aug 2020 23:43:13 -0700 Subject: [PATCH 10/10] change output of advertised route --- .../stable/2020-06-01/virtualWan.json | 62 +++---------------- 1 file changed, 7 insertions(+), 55 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json index 95d41eb11810..e995b7ddf3da 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-06-01/virtualWan.json @@ -4399,7 +4399,7 @@ "200": { "description": "List of advertised BGP routes.", "schema": { - "$ref": "#/definitions/LearnedRouteList" + "$ref": "#/definitions/PeerRouteList" } }, "202": { @@ -5464,55 +5464,7 @@ }, "description": "Properties of the bgp connection." }, - "AdvertisedRoute": { - "properties": { - "localAddress": { - "type": "string", - "readOnly": true, - "description": "The peer's local address." - }, - "network": { - "type": "string", - "readOnly": true, - "description": "The route's network prefix." - }, - "nextHop": { - "type": "string", - "readOnly": true, - "description": "The route's next hop." - }, - "origin": { - "type": "string", - "readOnly": true, - "description": "The source this route was learned from." - }, - "asPath": { - "type": "string", - "readOnly": true, - "description": "The route's AS path sequence." - }, - "weight": { - "type": "integer", - "format": "int32", - "readOnly": true, - "description": "The route's weight." - } - }, - "description": "Peer advertised routing details." - }, - "AdvertisedRouteList": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/AdvertisedRoute" - }, - "description": "List of peer advertised routes." - } - }, - "description": "List of virtual router peer advertised routes." - }, - "LearnedRoute": { + "PeerRoute": { "properties": { "localAddress": { "type": "string", @@ -5551,19 +5503,19 @@ "description": "The route's weight." } }, - "description": "Peer learned routing details." + "description": "Peer routing details." }, - "LearnedRouteList": { + "PeerRouteList": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/LearnedRoute" + "$ref": "#/definitions/PeerRoute" }, - "description": "List of peer learned routes." + "description": "List of peer routes." } }, - "description": "List of virtual router peer learned routes." + "description": "List of virtual router peer routes." }, "HubIpConfiguration": { "properties": {