Skip to content

Commit 129f4e5

Browse files
yanfa317yanfa317
authored
Remove discriminator from ActiveConfiguration and split activeconfiguraiton APIs to config level (#15282)
* 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
1 parent 8570821 commit 129f4e5

20 files changed

+995
-774
lines changed

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

Lines changed: 0 additions & 205 deletions
This file was deleted.

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"title": "Get Azure Virtual Network Manager Active Connectivity Configuration",
3+
"parameters": {
4+
"api-version": "2021-02-01-preview",
5+
"subscriptionId": "subscriptionA",
6+
"resourceGroupName": "myResourceGroup",
7+
"networkManagerName": "testNetworkManager",
8+
"parameters": {
9+
"regions": [
10+
"westus"
11+
],
12+
"$skipToken": "fakeSkipTokenCode"
13+
}
14+
},
15+
"responses": {
16+
"200": {
17+
"body": {
18+
"value": [
19+
{
20+
"region": "westus",
21+
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
22+
"id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig",
23+
"properties": {
24+
"displayName": "myTestConnectivityConfig",
25+
"description": "Sample Configuration",
26+
"connectivityTopology": "HubAndSpoke",
27+
"hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
28+
"isGlobal": "True",
29+
"deleteExistingPeering": "True",
30+
"appliesToGroups": [
31+
{
32+
"networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
33+
"useHubGateway": "True",
34+
"groupConnectivity": "None",
35+
"isGlobal": "False"
36+
}
37+
],
38+
"provisioningState": "Succeeded"
39+
},
40+
"configurationGroups": [
41+
{
42+
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
43+
"properties": {
44+
"displayName": "My Network Group",
45+
"description": "A group for all test Virtual Networks",
46+
"memberType": "VirtualNetwork",
47+
"groupMembers": [
48+
{
49+
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
50+
}
51+
],
52+
"conditionalMembership": "",
53+
"provisioningState": "Succeeded"
54+
}
55+
}
56+
]
57+
}
58+
],
59+
"$skipToken": "FakeSkipTokenCode"
60+
}
61+
}
62+
}
63+
}

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"title": "Get Azure Virtual Network Manager Active Security Admin Rules",
3+
"parameters": {
4+
"api-version": "2021-02-01-preview",
5+
"subscriptionId": "subscriptionA",
6+
"resourceGroupName": "myResourceGroup",
7+
"networkManagerName": "testNetworkManager",
8+
"parameters": {
9+
"regions": [
10+
"westus"
11+
],
12+
"$skipToken": "fakeSkipTokenCode"
13+
}
14+
},
15+
"responses": {
16+
"200": {
17+
"body": {
18+
"value": [
19+
{
20+
"region": "westus",
21+
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
22+
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule",
23+
"configurationDisplayName": "SampleConfig",
24+
"configurationDescription": "SampleDescription",
25+
"ruleCollectionDisplayName": "SampleRuleCollection",
26+
"ruleCollectionDescription": "SampleRuleCollectionDescription",
27+
"ruleCollectionAppliesToGroups": [
28+
{
29+
"networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1"
30+
}
31+
],
32+
"kind": "Default",
33+
"properties": {
34+
"displayName": "SampleAdminRule",
35+
"description": "Sample Admin Rule",
36+
"flag": "AllowVnetInbound",
37+
"protocol": "Tcp",
38+
"sources": [
39+
{
40+
"addressPrefixType": "IPPrefix",
41+
"addressPrefix": "*"
42+
}
43+
],
44+
"destinations": [
45+
{
46+
"addressPrefixType": "IPPrefix",
47+
"addressPrefix": "*"
48+
}
49+
],
50+
"sourcePortRanges": [
51+
"0-65535"
52+
],
53+
"destinationPortRanges": [
54+
"22"
55+
],
56+
"direction": "Inbound",
57+
"access": "Deny",
58+
"priority": 1,
59+
"provisioningState": "Succeeded"
60+
},
61+
"ruleGroups": [
62+
{
63+
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
64+
"properties": {
65+
"displayName": "My Network Group",
66+
"description": "A group for all test Virtual Networks",
67+
"memberType": "VirtualNetwork",
68+
"groupMembers": [
69+
{
70+
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
71+
}
72+
],
73+
"conditionalMembership": "",
74+
"provisioningState": "Succeeded"
75+
}
76+
}
77+
]
78+
}
79+
],
80+
"$skipToken": "FakeSkipTokenCode"
81+
}
82+
}
83+
}
84+
}

0 commit comments

Comments
 (0)