Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
53ad377
Add New Data Model RuleCollection to NetworkManager
yanfa317 Apr 14, 2021
7fd214d
fix typo
yanfa317 Apr 14, 2021
a950a83
test
yanfa317 Apr 14, 2021
0a53f84
test
yanfa317 Apr 14, 2021
ffce721
Fix discriminator
yanfa317 Apr 14, 2021
dc0371b
fix type
yanfa317 Apr 14, 2021
27d83cb
Fix discriminator
yanfa317 Apr 14, 2021
2df686b
Fix type
yanfa317 Apr 14, 2021
b1c0256
fix type
yanfa317 Apr 14, 2021
48a44b1
Fix type
yanfa317 Apr 14, 2021
bce950a
Fix discriminator
yanfa317 Apr 14, 2021
2637948
Fix discriminator
yanfa317 Apr 14, 2021
901bcce
fix type
yanfa317 Apr 14, 2021
9c8f6cb
fix type
yanfa317 Apr 14, 2021
a5a6735
Fix bug
yanfa317 Apr 14, 2021
bcc6fc4
Fix type
yanfa317 Apr 14, 2021
9d7dc08
Fix format
yanfa317 Apr 15, 2021
3cb0a7c
Fix name
yanfa317 Apr 15, 2021
45dc1b3
Fix name
yanfa317 Apr 15, 2021
24673af
fix spell
yanfa317 Apr 15, 2021
94bf9ba
fix description
yanfa317 Apr 15, 2021
2581fcf
Fix spell
yanfa317 Apr 15, 2021
fdbe274
change to kind
yanfa317 Apr 15, 2021
74e417e
fix lint
yanfa317 Apr 15, 2021
f19a644
fix lint
yanfa317 Apr 15, 2021
f6a7ec9
fix lint
yanfa317 Apr 15, 2021
2b41df4
fix lint
yanfa317 Apr 15, 2021
336c14f
fix lint
yanfa317 Apr 15, 2021
377017f
fix lint
yanfa317 Apr 15, 2021
6752dcb
Fix post body
yanfa317 Apr 16, 2021
39393f7
Fix as comments
yanfa317 Apr 16, 2021
bd197ed
fix bug
yanfa317 Apr 16, 2021
559a74d
fix bug
yanfa317 Apr 16, 2021
49be417
fix bug
yanfa317 Apr 17, 2021
e3abbfd
fix bug
yanfa317 Apr 17, 2021
57d8903
fix bug
yanfa317 Apr 17, 2021
0ae33b7
fix bug
yanfa317 Apr 17, 2021
3d86b93
change rule kind
yanfa317 Apr 20, 2021
5519a9c
Fix as comments
yanfa317 Apr 21, 2021
5788ff8
Fix as comments
yanfa317 Apr 21, 2021
3529d5e
update lastest version
yanfa317 Apr 21, 2021
ee692e4
Update type
yanfa317 Apr 21, 2021
0ffe9e3
Update Skiptoken
yanfa317 Apr 21, 2021
58c006d
Fix discription
yanfa317 Apr 23, 2021
69adaa9
Fix NG
yanfa317 Apr 27, 2021
f3893bc
Fix NG
yanfa317 Apr 27, 2021
41c008f
add more example
yanfa317 Apr 29, 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,62 +4,201 @@
"api-version": "2021-02-01-preview",
"subscriptionId": "subscriptionA",
"resourceGroupName": "myResourceGroup",
"networkManagerName": "testNetworkManager"
"networkManagerName": "testNetworkManager",
"parameters": {
"regions": [
"westus"
],
"$skipToken": "fakeSkipTokenCode"
}
},
"responses": {
"200": {
"body": {
"value": [
{
"configType": "Connectivity",
"connectivityConfiguration": {
"name": "myTestConnectivityConfig",
"region": "westus",
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
"committedConfiguration": {
"kind": "ConnectivityConfiguration",
"id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig",
"type": "Microsoft.Network/networkManagers/connectivityConfigurations",
"properties": {
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpokeTopology",
"connectivityTopology": "HubAndSpoke",
"hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"deleteExistingPeering": true,
"isGlobal": true,
"deleteExistingPeering": "True",
"isGlobal": "True",
"appliesToGroups": [
{
"networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
"useHubGateway": true,
"groupConnectivity": "Transitive",
"isGlobal": false
"useHubGateway": "True",
"groupConnectivity": "None",
"isGlobal": "True"
}
],
"provisioningState": "Succeeded"
}
},
"securityAdminRule": null,
"securityUserRule": null,
"configurationGroups": [
{
"name": "group1",
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"type": "Microsoft.Network/networkManagers/networkGroups",
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"groupMembers": [
{
"resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
},
"configurationGroups": [
{
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
"provisioningState": "Succeeded"
}
}
]
}
},
{
"region": "westus",
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
"committedConfiguration": {
"kind": "SecurityUserRuleCollection",
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"properties": {
"configurationDisplayName": "SampleUserConfig",
"configurationDescription": "Sample User Config",
"displayName": "testRuleCollection",
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"rules": [
{
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule",
"kind": "Custom",
"properties": {
"displayName": "SampleUserRule",
"description": "Sample User Rule",
"protocol": "Tcp",
"sources": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"destinations": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"sourcePortRanges": [
"0-65535"
],
"destinationPortRanges": [
"22"
],
"direction": "Inbound",
"provisioningState": "Succeeded"
}
],
"conditionalMembership": "",
"provisioningState": "Succeeded"
}
],
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1"
}
]
},
"configurationGroups": [
{
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
"provisioningState": "Succeeded"
}
}
}
],
]
}
},
{
"region": "westus",
"commitTime": "2020-07-10T18:03:22.2578238+05:30"
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
"committedConfiguration": {
"kind": "SecurityAdminRuleCollection",
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"properties": {
"configurationDisplayName": "SampleAdminConfig",
"configurationDescription": "Sample Admin Config",
"displayName": "testRuleCollection",
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"rules": [
{
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule",
"kind": "Default",
"properties": {
"displayName": "SampleAdminRule",
"description": "Sample Admin Rule",
"flag": "AllowVnetInbound",
"protocol": "Tcp",
"sources": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"destinations": [
{
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"sourcePortRanges": [
"0-65535"
],
"destinationPortRanges": [
"22"
],
"direction": "Inbound",
"access": "Deny",
"priority": 1,
"provisioningState": "Succeeded"
}
}
],
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1"
}
]
},
"configurationGroups": [
{
"id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
"properties": {
"displayName": "My Network Group",
"description": "A group for all test Virtual Networks",
"memberType": "VirtualNetwork",
"groupMembers": [
{
"vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
}
],
"conditionalMembership": "",
"provisioningState": "Succeeded"
}
}
]
}
}
],
"nextLink": "{baseurl}/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/activeConfigurations?api-version=22021-02-01-preview&$skipToken=10"
"$skipToken": "nextFakeSkipToken"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"parameters": {
"api-version": "2021-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkManagerName": "testNetworkManager",
"configurationName": "myTestSecurityConfig",
"ruleCollectionName": "testRuleCollection"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"parameters": {
"api-version": "2021-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkManagerName": "testNetworkManager",
"ruleCollectionName": "testRuleCollection",
"configurationName": "myTestSecurityConfig"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "testRuleCollection",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
"createdAt": "2021-01-11T18:52:27Z",
"lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-11T18:52:27Z"
},
"properties": {
"displayName": "testRuleCollection",
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"parameters": {
"api-version": "2021-02-01-preview",
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkManagerName": "testNetworkManager",
"configurationName": "myTestSecurityConfig"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "testRuleCollection",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
"createdAt": "2021-01-11T18:52:27Z",
"lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-01-11T18:52:27Z"
},
"properties": {
"displayName": "testRuleCollection",
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
}
]
}
}
],
"nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections?api-version=2021-02-01-preview&$skipToken=10"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"resourceGroupName": "rg1",
"configurationName": "myTestSecurityConfig",
"networkManagerName": "testNetworkManager",
"securityConfiguration": {
"ruleCollectionName": "testRuleCollection",
"ruleCollection": {
"properties": {
"description": "A sample policy",
"securityType": "UserPolicy",
"deleteExistingNSGs": true,
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
Expand All @@ -21,9 +20,9 @@
"responses": {
"200": {
"body": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig",
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"name": "myTestSecurityConfig",
"type": "Microsoft.Network/networkManagers/securityConfigurations",
"type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
"systemData": {
"createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
"createdByType": "User",
Expand All @@ -36,8 +35,6 @@
"displayName": "myTestSecurityConfig",
"description": "A sample policy",
"provisioningState": "Succeeded",
"securityType": "UserPolicy",
"deleteExistingNSGs": true,
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
Expand All @@ -63,8 +60,6 @@
"displayName": "myTestSecurityConfig",
"description": "A sample policy",
"provisioningState": "Succeeded",
"securityType": "UserPolicy",
"deleteExistingNSGs": true,
"appliesToGroups": [
{
"networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"resourceGroupName": "rg1",
"configurationName": "myTestSecurityConfig",
"networkManagerName": "testNetworkManager",
"ruleCollectionName": "testRuleCollection",
"ruleName": "SampleAdminRule"
},
"responses": {
Expand Down
Loading