Skip to content

Commit

Permalink
Reverting the changes made for address space update as the changes in…
Browse files Browse the repository at this point in the history 
… service code are not in yet (#11754)

Co-authored-by: Hari Prasad Perabattula <haperaba@microsoft.com>
  • Loading branch information
@harics24
harics24 and Hari Prasad Perabattula authored Nov 20, 2020
1 parent 05b40bc commit 1aebb6e
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 121 deletions.
1 change: 0 additions & 1 deletion custom-words.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,6 @@ Unregistering
Unregisters
unrestorable
unsubstituted
Unsynced
untagged
Untracked
unvalidated
Expand Down
17 changes: 2 additions & 15 deletions ...rce-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringCreate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"allowForwardedTraffic": true,
"allowGatewayTransit": false,
"useRemoteGateways": false,
"syncRemoteAddressSpace": true,
"remoteVirtualNetwork": {
"id": "/subscriptions/subid/resourceGroups/peerTest/providers/Microsoft.Network/virtualNetworks/vnet2"
}
Expand All @@ -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"
}
}
},
Expand All @@ -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"
}
}
}
Expand Down
8 changes: 1 addition & 7 deletions ...source-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringGet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
16 changes: 2 additions & 14 deletions ...ource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualNetworkPeeringList.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand All @@ -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"
}
}
]
Expand Down
25 changes: 1 addition & 24 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
17 changes: 2 additions & 15 deletions ...rce-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringCreate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"allowForwardedTraffic": true,
"allowGatewayTransit": false,
"useRemoteGateways": false,
"syncRemoteAddressSpace": true,
"remoteVirtualNetwork": {
"id": "/subscriptions/subid/resourceGroups/peerTest/providers/Microsoft.Network/virtualNetworks/vnet2"
}
Expand All @@ -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"
}
}
},
Expand All @@ -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"
}
}
}
Expand Down
8 changes: 1 addition & 7 deletions ...source-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringGet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
16 changes: 2 additions & 14 deletions ...ource-manager/Microsoft.Network/stable/2020-08-01/examples/VirtualNetworkPeeringList.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand All @@ -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"
}
}
]
Expand Down
25 changes: 1 addition & 24 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2020-08-01/virtualNetwork.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 1aebb6e

Please sign in to comment.