Skip to content
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

Remove discriminator from ActiveConfiguration and split activeconfiguraiton APIs to config level #15282

Merged
merged 15 commits into from
Aug 6, 2021
Merged

Remove discriminator from ActiveConfiguration and split activeconfiguraiton APIs to config level #15282

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 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
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
268 changes: 126 additions & 142 deletions ...ft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,186 +19,170 @@
{
"region": "westus",
"commitTime": "2020-07-10T18:03:22.2578238+05:30",
"committedConfiguration": {
"kind": "ConnectivityConfiguration",
"configurationType": "Connectivity",
"connectivityConfiguration": {
"id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig",
"properties": {
"displayName": "myTestConnectivityConfig",
"description": "Sample Configuration",
"connectivityTopology": "HubAndSpoke",
"hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"deleteExistingPeering": "True",
"hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
"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/groups/group1",
"useHubGateway": "True",
"groupConnectivity": "None",
"isGlobal": "True"
"isGlobal": "False"
}
],
"provisioningState": "Succeeded"
},
"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"
}
}
},
"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",
"configurationType": "UserPolicy",
"securityUserRule": {
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule",
"configurationDisplayName": "SampleConfig",
"configurationDescription": "SampleDescription",
"ruleCollectionDisplayName": "SampleRuleCollection",
"ruleCollectionDescription": "SampleRuleCollectionDescription",
"ruleCollectionAppliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1"
}
],
"kind": "Custom",
"properties": {
"configurationDisplayName": "SampleUserConfig",
"configurationDescription": "Sample User Config",
"displayName": "testRuleCollection",
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"rules": [
"displayName": "SampleUserRule",
"description": "Sample User Rule",
"protocol": "Tcp",
"sources": [
{
"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"
}
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"appliesToGroups": [
"destinations": [
{
"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"
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"sourcePortRanges": [
"0-65535"
],
"destinationPortRanges": [
"22"
],
"direction": "Inbound",
"provisioningState": "Succeeded"
}
},
"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": "SecurityAdminRuleCollection",
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
"configurationType": "AdminPolicy",
"securityAdminRule": {
"id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule",
"configurationDisplayName": "SampleConfig",
"configurationDescription": "SampleDescription",
"ruleCollectionDisplayName": "SampleRuleCollection",
"ruleCollectionDescription": "SampleRuleCollectionDescription",
"ruleCollectionAppliesToGroups": [
{
"networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1"
}
],
"kind": "Default",
"properties": {
"configurationDisplayName": "SampleAdminConfig",
"configurationDescription": "Sample Admin Config",
"displayName": "testRuleCollection",
"description": "A sample rule collection",
"provisioningState": "Succeeded",
"rules": [
"displayName": "SampleAdminRule",
"description": "Sample Admin Rule",
"flag": "AllowVnetInbound",
"protocol": "Tcp",
"sources": [
{
"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"
}
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"appliesToGroups": [
"destinations": [
{
"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"
"addressPrefixType": "IPPrefix",
"addressPrefix": "*"
}
],
"sourcePortRanges": [
"0-65535"
],
"destinationPortRanges": [
"22"
],
"direction": "Inbound",
"access": "Deny",
"priority": 1,
"provisioningState": "Succeeded"
}
},
"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"
}
]
}
}
]
}
],
"$skipToken": "nextFakeSkipToken"
"$skipToken": "FakeSkipTokenCode"
}
}
}
Expand Down
Loading