merge

Azure · Sep 9, 2020 · 8577f7a · 8577f7a
1 parent d035911
commit 8577f7a
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 109 deletions.
diff --git a/...ger/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json b/...ger/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerAdvertisedRouteGet.json
diff --git a/...anager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json b/...anager/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerLearnedRouteGet.json
diff --git a/...er/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json b/...er/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
@@ -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": {