Reverting the changes made for address space update as the changes in service code are not in yet (#11754)

harics24 · Hari Prasad Perabattula · web-flow · commit 1aebb6e0cf3f · 2020-11-20T10:48:43.000+08:00
Co-authored-by: Hari Prasad Perabattula &lt;haperaba@microsoft.com&gt;
diff --git a/custom-words.txt b/custom-words.txt
@@ -1769,7 +1769,6 @@ Unregistering
 Unregisters
 unrestorable
 unsubstituted
-Unsynced
 untagged
 Untracked
 unvalidated
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringCreate.json
@@ -11,7 +11,6 @@
         "allowForwardedTraffic": true,
         "allowGatewayTransit": false,
         "useRemoteGateways": false,
-        "syncRemoteAddressSpace": true,
         "remoteVirtualNetwork": {
           "id": "/subscriptions/subid/resourceGroups/peerTest/providers/Microsoft.Network/virtualNetworks/vnet2"
         }
@@ -36,18 +35,12 @@
               "12.0.0.0/8"
             ]
           },
-          "remoteVirtualNetworkAddressSpace": {
-            "addressPrefixes": [
-              "12.0.0.0/8"
-            ]
-          },
           "remoteBgpCommunities": {
             "virtualNetworkCommunity": "12076:20002",
             "regionalCommunity": "12076:50004"
           },
           "peeringState": "Initiated",
-          "provisioningState": "Succeeded",
-          "peeringSyncLevel": "FullySynced"
+          "provisioningState": "Succeeded"
         }
       }
     },
@@ -68,18 +61,12 @@
               "12.0.0.0/8"
             ]
           },
-          "remoteVirtualNetworkAddressSpace": {
-            "addressPrefixes": [
-              "12.0.0.0/8"
-            ]
-          },
           "remoteBgpCommunities": {
             "virtualNetworkCommunity": "12076:20002",
             "regionalCommunity": "12076:50004"
           },
           "peeringState": "Initiated",
-          "provisioningState": "Succeeded",
-          "peeringSyncLevel": "FullySynced"
+          "provisioningState": "Succeeded"
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringGet.json
@@ -24,18 +24,12 @@
               "12.0.0.0/8"
             ]
           },
-          "remoteVirtualNetworkAddressSpace": {
-            "addressPrefixes": [
-              "12.0.0.0/8"
-            ]
-          },
           "remoteBgpCommunities": {
             "virtualNetworkCommunity": "12076:20002",
             "regionalCommunity": "12076:50004"
           },
           "peeringState": "Initiated",
-          "provisioningState": "Succeeded",
-          "peeringSyncLevel": "FullySynced"
+          "provisioningState": "Succeeded"
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringList.json
@@ -25,18 +25,12 @@
                   "12.0.0.0/8"
                 ]
               },
-              "remoteVirtualNetworkAddressSpace": {
-                "addressPrefixes": [
-                  "12.0.0.0/8"
-                ]
-              },
               "remoteBgpCommunities": {
                 "virtualNetworkCommunity": "12076:20002",
                 "regionalCommunity": "12076:50004"
               },
               "peeringState": "Initiated",
-              "provisioningState": "Succeeded",
-              "peeringSyncLevel": "FullySynced"
+              "provisioningState": "Succeeded"
             }
           },
           {
@@ -55,18 +49,12 @@
                   "13.0.0.0/8"
                 ]
               },
-              "remoteVirtualNetworkAddressSpace": {
-                "addressPrefixes": [
-                  "13.0.0.0/8"
-                ]
-              },
               "remoteBgpCommunities": {
                 "virtualNetworkCommunity": "12076:20003",
                 "regionalCommunity": "12076:50004"
               },
               "peeringState": "Initiated",
-              "provisioningState": "Succeeded",
-              "peeringSyncLevel": "FullySynced"
+              "provisioningState": "Succeeded"
             }
           }
         ]
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json
@@ -1550,11 +1550,7 @@
         },
         "remoteAddressSpace": {
           "$ref": "#/definitions/AddressSpace",
-          "description": "The reference to the address space peered with the remote virtual network."
-        },
-        "remoteVirtualNetworkAddressSpace": {
-          "$ref": "#/definitions/AddressSpace",
-          "description": "The reference to the current address space of the remote virtual network."
+          "description": "The reference to the remote virtual network address space."
         },
         "remoteBgpCommunities": {
           "$ref": "#/definitions/VirtualNetworkBgpCommunities",
@@ -1574,25 +1570,6 @@
             "modelAsString": true
           }
         },
-        "peeringSyncLevel": {
-          "type": "string",
-          "description": "The peering sync status of the virtual network peering.",
-          "enum": [
-            "FullySynced",
-            "RemoteUnsynced",
-            "LocalUnsynced",
-            "LocalAndRemoteUnsynced"
-          ],
-          "x-ms-enum": {
-            "name": "VirtualNetworkPeeringLevel",
-            "modelAsString": true
-          }
-        },
-        "syncRemoteAddressSpace": {
-          "type": "boolean",
-          "default": false,
-          "description": "Provided when user wants to sync the peering with address space on the remote virtual network after the address space is updated."
-        },
         "provisioningState": {
           "readOnly": true,
           "$ref": "./network.json#/definitions/ProvisioningState",
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringCreate.json
@@ -11,7 +11,6 @@
         "allowForwardedTraffic": true,
         "allowGatewayTransit": false,
         "useRemoteGateways": false,
-        "syncRemoteAddressSpace": true,
         "remoteVirtualNetwork": {
           "id": "/subscriptions/subid/resourceGroups/peerTest/providers/Microsoft.Network/virtualNetworks/vnet2"
         }
@@ -36,18 +35,12 @@
               "12.0.0.0/8"
             ]
           },
-          "remoteVirtualNetworkAddressSpace": {
-            "addressPrefixes": [
-              "12.0.0.0/8"
-            ]
-          },
           "remoteBgpCommunities": {
             "virtualNetworkCommunity": "12076:20002",
             "regionalCommunity": "12076:50004"
           },
           "peeringState": "Initiated",
-          "provisioningState": "Succeeded",
-          "peeringSyncLevel": "FullySynced"
+          "provisioningState": "Succeeded"
         }
       }
     },
@@ -68,18 +61,12 @@
               "12.0.0.0/8"
             ]
           },
-          "remoteVirtualNetworkAddressSpace": {
-            "addressPrefixes": [
-              "12.0.0.0/8"
-            ]
-          },
           "remoteBgpCommunities": {
             "virtualNetworkCommunity": "12076:20002",
             "regionalCommunity": "12076:50004"
           },
           "peeringState": "Initiated",
-          "provisioningState": "Succeeded",
-          "peeringSyncLevel": "FullySynced"
+          "provisioningState": "Succeeded"
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringGet.json
@@ -24,18 +24,12 @@
               "12.0.0.0/8"
             ]
           },
-          "remoteVirtualNetworkAddressSpace": {
-            "addressPrefixes": [
-              "12.0.0.0/8"
-            ]
-          },
           "remoteBgpCommunities": {
             "virtualNetworkCommunity": "12076:20002",
             "regionalCommunity": "12076:50004"
           },
           "peeringState": "Initiated",
-          "provisioningState": "Succeeded",
-          "peeringSyncLevel": "FullySynced"
+          "provisioningState": "Succeeded"
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringList.json
@@ -25,18 +25,12 @@
                   "12.0.0.0/8"
                 ]
               },
-              "remoteVirtualNetworkAddressSpace": {
-                "addressPrefixes": [
-                  "12.0.0.0/8"
-                ]
-              },
               "remoteBgpCommunities": {
                 "virtualNetworkCommunity": "12076:20002",
                 "regionalCommunity": "12076:50004"
               },
               "peeringState": "Initiated",
-              "provisioningState": "Succeeded",
-              "peeringSyncLevel": "FullySynced"
+              "provisioningState": "Succeeded"
             }
           },
           {
@@ -55,18 +49,12 @@
                   "13.0.0.0/8"
                 ]
               },
-              "remoteVirtualNetworkAddressSpace": {
-                "addressPrefixes": [
-                  "13.0.0.0/8"
-                ]
-              },
               "remoteBgpCommunities": {
                 "virtualNetworkCommunity": "12076:20003",
                 "regionalCommunity": "12076:50004"
               },
               "peeringState": "Initiated",
-              "provisioningState": "Succeeded",
-              "peeringSyncLevel": "FullySynced"
+              "provisioningState": "Succeeded"
             }
           }
         ]
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json
@@ -1550,11 +1550,7 @@
         },
         "remoteAddressSpace": {
           "$ref": "#/definitions/AddressSpace",
-          "description": "The reference to the address space peered with the remote virtual network."
-        },
-        "remoteVirtualNetworkAddressSpace": {
-          "$ref": "#/definitions/AddressSpace",
-          "description": "The reference to the current address space of the remote virtual network."
+          "description": "The reference to the remote virtual network address space."
         },
         "remoteBgpCommunities": {
           "$ref": "#/definitions/VirtualNetworkBgpCommunities",
@@ -1574,25 +1570,6 @@
             "modelAsString": true
           }
         },
-        "peeringSyncLevel": {
-          "type": "string",
-          "description": "The peering sync status of the virtual network peering.",
-          "enum": [
-            "FullySynced",
-            "RemoteUnsynced",
-            "LocalUnsynced",
-            "LocalAndRemoteUnsynced"
-          ],
-          "x-ms-enum": {
-            "name": "VirtualNetworkPeeringLevel",
-            "modelAsString": true
-          }
-        },
-        "syncRemoteAddressSpace": {
-          "type": "boolean",
-          "default": false,
-          "description": "Provided when user wants to sync the peering with address space on the remote virtual network after the address space is updated."
-        },
         "provisioningState": {
           "readOnly": true,
           "$ref": "./network.json#/definitions/ProvisioningState",

Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,12 @@`
`24`	`24`	`"12.0.0.0/8"`
`25`	`25`	`]`
`26`	`26`	`},`
`27`		`- "remoteVirtualNetworkAddressSpace": {`
`28`		`- "addressPrefixes": [`
`29`		`- "12.0.0.0/8"`
`30`		`- ]`
`31`		`- },`
`32`	`27`	`"remoteBgpCommunities": {`
`33`	`28`	`"virtualNetworkCommunity": "12076:20002",`
`34`	`29`	`"regionalCommunity": "12076:50004"`
`35`	`30`	`},`
`36`	`31`	`"peeringState": "Initiated",`
`37`		`- "provisioningState": "Succeeded",`
`38`		`- "peeringSyncLevel": "FullySynced"`
	`32`	`+ "provisioningState": "Succeeded"`
`39`	`33`	`}`
`40`	`34`	`}`
`41`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,18 +25,12 @@`
`25`	`25`	`"12.0.0.0/8"`
`26`	`26`	`]`
`27`	`27`	`},`
`28`		`- "remoteVirtualNetworkAddressSpace": {`
`29`		`- "addressPrefixes": [`
`30`		`- "12.0.0.0/8"`
`31`		`- ]`
`32`		`- },`
`33`	`28`	`"remoteBgpCommunities": {`
`34`	`29`	`"virtualNetworkCommunity": "12076:20002",`
`35`	`30`	`"regionalCommunity": "12076:50004"`
`36`	`31`	`},`
`37`	`32`	`"peeringState": "Initiated",`
`38`		`- "provisioningState": "Succeeded",`
`39`		`- "peeringSyncLevel": "FullySynced"`
	`33`	`+ "provisioningState": "Succeeded"`
`40`	`34`	`}`
`41`	`35`	`},`
`42`	`36`	`{`
`@@ -55,18 +49,12 @@`
`55`	`49`	`"13.0.0.0/8"`
`56`	`50`	`]`
`57`	`51`	`},`
`58`		`- "remoteVirtualNetworkAddressSpace": {`
`59`		`- "addressPrefixes": [`
`60`		`- "13.0.0.0/8"`
`61`		`- ]`
`62`		`- },`
`63`	`52`	`"remoteBgpCommunities": {`
`64`	`53`	`"virtualNetworkCommunity": "12076:20003",`
`65`	`54`	`"regionalCommunity": "12076:50004"`
`66`	`55`	`},`
`67`	`56`	`"peeringState": "Initiated",`
`68`		`- "provisioningState": "Succeeded",`
`69`		`- "peeringSyncLevel": "FullySynced"`
	`57`	`+ "provisioningState": "Succeeded"`
`70`	`58`	`}`
`71`	`59`	`}`
`72`	`60`	`]`