Skip to content

Commit 7814e86

Browse files
yanfa317yanfa317
authored
[ANM] Remove $ from $Skiptoken and restructure Hub and NetworkGroups (#15840)
* Add ResourceGuid to NetworkManager * add list by config * Revert "Add ResourceGuid to NetworkManager" This reverts commit 4e07577. * resourceGuid * [NetworkManager] Remove discriminator from ActiveConfiguration * revert change * fix format * Fix as commnets * fix test * Update Example * Split current APIs * Fix lintdiff * fix as commnets * small change and update default package id * remove subnet level api * remove $ fro $skiptoken * Change hub and groupids * fix bug * fix prettier * Fix as comments * Fix type
1 parent ef04da1 commit 7814e86

32 files changed

+134
-98
lines changed

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"regions": [
1010
"westus"
1111
],
12-
"$skipToken": "fakeSkipTokenCode"
12+
"skipToken": "fakeSkipTokenCode"
1313
}
1414
},
1515
"responses": {
@@ -24,7 +24,12 @@
2424
"displayName": "myTestConnectivityConfig",
2525
"description": "Sample Configuration",
2626
"connectivityTopology": "HubAndSpoke",
27-
"hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
27+
"hubs": [
28+
{
29+
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
30+
"resourceType": "Microsoft.Network/virtualNetworks"
31+
}
32+
],
2833
"isGlobal": "True",
2934
"deleteExistingPeering": "True",
3035
"appliesToGroups": [
@@ -43,10 +48,10 @@
4348
"properties": {
4449
"displayName": "My Network Group",
4550
"description": "A group for all test Virtual Networks",
46-
"memberType": "VirtualNetwork",
51+
"memberType": "Microsoft.Network/virtualNetworks",
4752
"groupMembers": [
4853
{
49-
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
54+
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
5055
}
5156
],
5257
"conditionalMembership": "",
@@ -56,7 +61,7 @@
5661
]
5762
}
5863
],
59-
"$skipToken": "FakeSkipTokenCode"
64+
"skipToken": "FakeSkipTokenCode"
6065
}
6166
}
6267
}

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"regions": [
1010
"westus"
1111
],
12-
"$skipToken": "fakeSkipTokenCode"
12+
"skipToken": "fakeSkipTokenCode"
1313
}
1414
},
1515
"responses": {
@@ -64,10 +64,10 @@
6464
"properties": {
6565
"displayName": "My Network Group",
6666
"description": "A group for all test Virtual Networks",
67-
"memberType": "VirtualNetwork",
67+
"memberType": "Microsoft.Network/virtualNetworks",
6868
"groupMembers": [
6969
{
70-
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
70+
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
7171
}
7272
],
7373
"conditionalMembership": "",
@@ -77,7 +77,7 @@
7777
]
7878
}
7979
],
80-
"$skipToken": "FakeSkipTokenCode"
80+
"skipToken": "FakeSkipTokenCode"
8181
}
8282
}
8383
}

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"regions": [
1010
"westus"
1111
],
12-
"$skipToken": "fakeSkipTokenCode"
12+
"skipToken": "fakeSkipTokenCode"
1313
}
1414
},
1515
"responses": {
@@ -61,10 +61,10 @@
6161
"properties": {
6262
"displayName": "My Network Group",
6363
"description": "A group for all test Virtual Networks",
64-
"memberType": "VirtualNetwork",
64+
"memberType": "Microsoft.Network/virtualNetworks",
6565
"groupMembers": [
6666
{
67-
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
67+
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
6868
}
6969
],
7070
"conditionalMembership": "",
@@ -74,7 +74,7 @@
7474
]
7575
}
7676
],
77-
"$skipToken": "FakeSkipTokenCode"
77+
"skipToken": "FakeSkipTokenCode"
7878
}
7979
}
8080
}

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"body": {
1313
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
1414
"name": "testRuleCollection",
15-
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
15+
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
1616
"systemData": {
1717
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
1818
"createdByType": "User",

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{
1414
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
1515
"name": "testRuleCollection",
16-
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
16+
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
1717
"systemData": {
1818
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
1919
"createdByType": "User",

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"body": {
4848
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig",
4949
"name": "myTestSecurityConfig",
50-
"type": "Microsoft.Network/networkManagers/securityConfigurations",
50+
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations",
5151
"systemData": {
5252
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
5353
"createdByType": "User",

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,17 @@
2525
"displayName": "myTestConnectivityConfig",
2626
"description": "Sample Configuration",
2727
"connectivityTopology": "HubAndSpoke",
28-
"hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
28+
"hubs": [
29+
{
30+
"resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
31+
"resourceType": "Microsoft.Network/virtualNetworks"
32+
}
33+
],
2934
"isGlobal": "True",
3035
"deleteExistingPeering": "True",
3136
"appliesToGroups": [
3237
{
33-
"networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
38+
"networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
3439
"useHubGateway": "True",
3540
"groupConnectivity": "None",
3641
"isGlobal": "False"

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,17 @@
2626
"displayName": "myTestConnectivityConfig",
2727
"description": "Sample Configuration",
2828
"connectivityTopology": "HubAndSpoke",
29-
"hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
29+
"hubs": [
30+
{
31+
"resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
32+
"resourceType": "Microsoft.Network/virtualNetworks"
33+
}
34+
],
3035
"deleteExistingPeering": "True",
3136
"isGlobal": "True",
3237
"appliesToGroups": [
3338
{
34-
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
39+
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/netwrokGroups/group1",
3540
"useHubGateway": "True",
3641
"groupConnectivity": "None",
3742
"isGlobal": "False"

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@
1111
"displayName": "myTestConnectivityConfig",
1212
"description": "Sample Configuration",
1313
"connectivityTopology": "HubAndSpoke",
14-
"hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
14+
"hubs": [
15+
{
16+
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
17+
"resourceType": "Microsoft.Network/virtualNetworks"
18+
}
19+
],
1520
"deleteExistingPeering": "True",
1621
"isGlobal": "True",
1722
"appliesToGroups": [
1823
{
19-
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagerGroups/group1",
24+
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
2025
"useHubGateway": "True",
2126
"groupConnectivity": "None",
2227
"isGlobal": "False"
@@ -43,7 +48,12 @@
4348
"displayName": "myTestConnectivityConfig",
4449
"description": "Sample Connectivity Configuration",
4550
"connectivityTopology": "HubAndSpoke",
46-
"hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
51+
"hubs": [
52+
{
53+
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
54+
"resourceType": "Microsoft.Network/virtualNetworks"
55+
}
56+
],
4757
"deleteExistingPeering": "True",
4858
"isGlobal": "True",
4959
"appliesToGroups": [
@@ -75,12 +85,17 @@
7585
"displayName": "myTestConnectivityConfig",
7686
"description": "Sample Configuration",
7787
"connectivityTopology": "HubAndSpoke",
78-
"hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
88+
"hubs": [
89+
{
90+
"resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig",
91+
"resourceType": "Microsoft.Network/virtualNetworks"
92+
}
93+
],
7994
"deleteExistingPeering": "True",
8095
"isGlobal": "True",
8196
"appliesToGroups": [
8297
{
83-
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagerGroups/group1",
98+
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
8499
"useHubGateway": "True",
85100
"groupConnectivity": "None",
86101
"isGlobal": "False"

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"200": {
1919
"body": {
2020
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityUserConfigurations/Policy1/ruleCollections/testRuleCollection/rules/SampleUserRule",
21-
"type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules",
21+
"type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections/rules",
2222
"name": "SampleDefaultUserRule",
2323
"kind": "Default",
2424
"systemData": {
@@ -59,7 +59,7 @@
5959
"201": {
6060
"body": {
6161
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleDefaultUserRule",
62-
"type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules",
62+
"type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections/rules",
6363
"name": "SampleDefaultUserRule",
6464
"kind": "Default",
6565
"systemData": {

0 commit comments

Comments
 (0)