Skip to content

[ANM] Remove $ from $Skiptoken and restructure Hub and NetworkGroups #15840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lirenhe merged 27 commits into from
Sep 1, 2021
Merged

[ANM] Remove $ from $Skiptoken and restructure Hub and NetworkGroups #15840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4e07577
Add ResourceGuid to NetworkManager
yanfa317 Jun 17, 2021
6f79cbb
add list by config
yanfa317 Jun 25, 2021
d835030
Revert "Add ResourceGuid to NetworkManager"
yanfa317 Jun 25, 2021
d6af618
resourceGuid
yanfa317 Jun 25, 2021
8ba96a1
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
yanfa317 Jul 20, 2021
60cec31
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
yanfa317 Jul 21, 2021
c4c1ae5
[NetworkManager] Remove discriminator from ActiveConfiguration
yanfa317 Jul 21, 2021
33ead47
revert change
yanfa317 Jul 21, 2021
aed0651
fix format
yanfa317 Jul 21, 2021
06ee276
Fix as commnets
yanfa317 Jul 21, 2021
4aab9e1
fix test
yanfa317 Jul 22, 2021
75f8882
Update Example
yanfa317 Jul 27, 2021
698aedf
Split current APIs
yanfa317 Aug 3, 2021
b8b5ffb
Fix lintdiff
yanfa317 Aug 3, 2021
a5e5790
fix as commnets
yanfa317 Aug 5, 2021
af73f04
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs-pr
yanfa317 Aug 9, 2021
e73ddf7
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs-pr
yanfa317 Aug 12, 2021
4cfe186
small change and update default package id
yanfa317 Aug 17, 2021
e6efa8b
remove subnet level api
yanfa317 Aug 18, 2021
49c2028
merge fix
yanfa317 Aug 28, 2021
b245908
remove $ fro $skiptoken
yanfa317 Aug 28, 2021
ba4dc03
Change hub and groupids
yanfa317 Aug 31, 2021
0ae4ed9
fix bug
yanfa317 Aug 31, 2021
4e705d4
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs-pr
yanfa317 Aug 31, 2021
9206575
fix prettier
yanfa317 Aug 31, 2021
022b631
Fix as comments
yanfa317 Aug 31, 2021
20269e1
Fix type
yanfa317 Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ...eview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"regions": [
"westus"
],
"$skipToken": "fakeSkipTokenCode"
"skipToken": "fakeSkipTokenCode"
}
},
"responses": {
Expand All @@ -24,7 +24,12 @@
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"hubs": [
{
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"isGlobal": "True",
"deleteExistingPeering": "True",
"appliesToGroups": [
Expand All @@ -43,10 +48,10 @@
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"memberType": "Microsoft.Network/virtualNetworks",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
Expand All @@ -56,7 +61,7 @@
]
}
],
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...twork/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"regions": [
"westus"
],
"$skipToken": "fakeSkipTokenCode"
"skipToken": "fakeSkipTokenCode"
}
},
"responses": {
Expand Down Expand Up @@ -64,10 +64,10 @@
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"memberType": "Microsoft.Network/virtualNetworks",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
Expand All @@ -77,7 +77,7 @@
]
}
],
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...etwork/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"regions": [
"westus"
],
"$skipToken": "fakeSkipTokenCode"
"skipToken": "fakeSkipTokenCode"
}
},
"responses": {
Expand Down Expand Up @@ -61,10 +61,10 @@
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"memberType": "Microsoft.Network/virtualNetworks",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
Expand All @@ -74,7 +74,7 @@
]
}
],
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...oft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "testRuleCollection",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
Expand Down
2 changes: 1 addition & 1 deletion ...ft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "testRuleCollection",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
Expand Down
2 changes: 1 addition & 1 deletion ...oft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig",
"name": "myTestSecurityConfig",
"type": "Microsoft.Network/networkManagers/securityConfigurations",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
Expand Down
9 changes: 7 additions & 2 deletions ...twork/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"hubs": [
{
"resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"isGlobal": "True",
"deleteExistingPeering": "True",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
"networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"useHubGateway": "True",
"groupConnectivity": "None",
"isGlobal": "False"
Expand Down
9 changes: 7 additions & 2 deletions ...work/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,17 @@
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"hubs": [
{
"resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"deleteExistingPeering": "True",
"isGlobal": "True",
"appliesToGroups": [
{
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/netwrokGroups/group1",
"useHubGateway": "True",
"groupConnectivity": "None",
"isGlobal": "False"
Expand Down
25 changes: 20 additions & 5 deletions ...twork/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,17 @@
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
"hubs": [
{
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"deleteExistingPeering": "True",
"isGlobal": "True",
"appliesToGroups": [
{
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagerGroups/group1",
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"useHubGateway": "True",
"groupConnectivity": "None",
"isGlobal": "False"
Expand All @@ -43,7 +48,12 @@
"displayName": "myTestConnectivityConfig",
"description": "Sample Connectivity Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
"hubs": [
{
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"deleteExistingPeering": "True",
"isGlobal": "True",
"appliesToGroups": [
Expand Down Expand Up @@ -75,12 +85,17 @@
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"hubs": [
{
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"deleteExistingPeering": "True",
"isGlobal": "True",
"appliesToGroups": [
{
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagerGroups/group1",
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"useHubGateway": "True",
"groupConnectivity": "None",
"isGlobal": "False"
Expand Down
4 changes: 2 additions & 2 deletions ...crosoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"200": {
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityUserConfigurations/Policy1/ruleCollections/testRuleCollection/rules/SampleUserRule",
"type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules",
"type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections/rules",
"name": "SampleDefaultUserRule",
"kind": "Default",
"systemData": {
Expand Down Expand Up @@ -59,7 +59,7 @@
"201": {
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleDefaultUserRule",
"type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules",
"type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections/rules",
"name": "SampleDefaultUserRule",
"kind": "Default",
"systemData": {
Expand Down
4 changes: 2 additions & 2 deletions ...osoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"Connectivity",
"AdminPolicy"
],
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
},
"responses": {
Expand Down Expand Up @@ -44,7 +44,7 @@
"errorMessage": ""
}
],
"$skipToken": "NextFakeSkipTokenCode"
"skipToken": "NextFakeSkipTokenCode"
}
}
}
Expand Down
15 changes: 10 additions & 5 deletions ...ew/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"resourceGroupName": "myResourceGroup",
"virtualNetworkName": "testVirtualNetwork",
"parameters": {
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
},
"responses": {
Expand All @@ -19,7 +19,12 @@
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"hubs": [
{
"resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"resourceType": "Microsoft.Network/virtualNetworks"
}
],
"isGlobal": "True",
"deleteExistingPeering": "True",
"appliesToGroups": [
Expand All @@ -38,10 +43,10 @@
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"memberType": "Microsoft.Network/virtualNetworks",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
Expand All @@ -51,7 +56,7 @@
]
}
],
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...rk/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"resourceGroupName": "myResourceGroup",
"virtualNetworkName": "testVirtualNetwork",
"parameters": {
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
},
"responses": {
Expand Down Expand Up @@ -62,7 +62,7 @@
"memberType": "VirtualNetwork",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
Expand All @@ -72,7 +72,7 @@
]
}
],
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...twork/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"networkManagerName": "testNetworkManager",
"networkGroupName": "TestNetworkGroup",
"parameters": {
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
},
"responses": {
Expand All @@ -20,7 +20,7 @@
"membershipType": "Static"
}
],
"$skipToken": "NextFakeSkipTokenCode"
"skipToken": "NextFakeSkipTokenCode"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...21-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"networkManagerName": "testNetworkManager",
"parameters": {
"conditionalMembers": "location='useast2'",
"$skipToken": "FakeSkipTokenCode"
"skipToken": "FakeSkipTokenCode"
}
},
"responses": {
Expand All @@ -20,7 +20,7 @@
"membershipType": "Static"
}
],
"$skipToken": "NextFakeSkipTokenCode"
"skipToken": "NextFakeSkipTokenCode"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
"memberType": "VirtualNetwork",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1",
"subnetId": ""
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1"
}
],
"conditionalMembership": "",
Expand Down
2 changes: 1 addition & 1 deletion ...anager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"memberType": "VirtualNetwork",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1"
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1"
}
],
"conditionalMembership": "",
Expand Down
Loading