Reverting the changed made for the address space update in peered vNe…

…ts. PR: 11090 (#11731) Co-authored-by: Hari Prasad Perabattula <haperaba@microsoft.com>
Azure · Nov 19, 2020 · 494de57 · 494de57
1 parent 9ec86a4
commit 494de57
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 61 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1863,7 +1863,6 @@ Unregistering
 Unregisters
 unrestorable
 unsubstituted
-Unsynced
 untagged
 Untracked
 unvalidated

diff --git a/...rce-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringCreate.json b/...rce-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/...source-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringGet.json b/...source-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/...ource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringList.json b/...ource-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/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json b/...fication/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",