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
Azure · Oct 18, 2018 · 6c4312e · 6c4312e
1 parent 758c143
commit 6c4312e
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 10 deletions.
diff --git a/...anager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringCreate.json b/...anager/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/...-manager/Microsoft.Network/stable/2018-08-01/examples/ExpressRouteCircuitPeeringList.json b/...-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/...osoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringCreate.json b/...osoft.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/...icrosoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringGet.json b/...icrosoft.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/...crosoft.Network/stable/2018-08-01/examples/ExpressRouteCrossConnectionBgpPeeringList.json b/...crosoft.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/...ion/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteGateway.json b/...ion/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."
                     }
                 }
             },