-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Remove discriminator from ActiveConfiguration and split activeconfiguraiton APIs to config level #15282
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.
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
Merged
Remove discriminator from ActiveConfiguration and split activeconfiguraiton APIs to config level #15282
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
4e07577
Add ResourceGuid to NetworkManager
yanfa317 6f79cbb
add list by config
yanfa317 d835030
Revert "Add ResourceGuid to NetworkManager"
yanfa317 d6af618
resourceGuid
yanfa317 8ba96a1
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
yanfa317 60cec31
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
yanfa317 c4c1ae5
[NetworkManager] Remove discriminator from ActiveConfiguration
yanfa317 33ead47
revert change
yanfa317 aed0651
fix format
yanfa317 06ee276
Fix as commnets
yanfa317 4aab9e1
fix test
yanfa317 75f8882
Update Example
yanfa317 698aedf
Split current APIs
yanfa317 b8b5ffb
Fix lintdiff
yanfa317 a5e5790
fix as commnets
yanfa317 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
205 changes: 0 additions & 205 deletions
205
...ft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json
This file was deleted.
Oops, something went wrong.
63 changes: 63 additions & 0 deletions
63
...eview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| { | ||
| "title": "Get Azure Virtual Network Manager Active Connectivity Configuration", | ||
| "parameters": { | ||
| "api-version": "2021-02-01-preview", | ||
| "subscriptionId": "subscriptionA", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "networkManagerName": "testNetworkManager", | ||
| "parameters": { | ||
| "regions": [ | ||
| "westus" | ||
| ], | ||
| "$skipToken": "fakeSkipTokenCode" | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "region": "westus", | ||
| "commitTime": "2020-07-10T18:03:22.2578238+05:30", | ||
| "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", | ||
| "properties": { | ||
| "displayName": "myTestConnectivityConfig", | ||
| "description": "Sample Configuration", | ||
| "connectivityTopology": "HubAndSpoke", | ||
| "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", | ||
| "useHubGateway": "True", | ||
| "groupConnectivity": "None", | ||
| "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" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "$skipToken": "FakeSkipTokenCode" | ||
| } | ||
| } | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
...twork/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| { | ||
| "title": "Get Azure Virtual Network Manager Active Security Admin Rules", | ||
| "parameters": { | ||
| "api-version": "2021-02-01-preview", | ||
| "subscriptionId": "subscriptionA", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "networkManagerName": "testNetworkManager", | ||
| "parameters": { | ||
| "regions": [ | ||
| "westus" | ||
| ], | ||
| "$skipToken": "fakeSkipTokenCode" | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "region": "westus", | ||
| "commitTime": "2020-07-10T18:03:22.2578238+05:30", | ||
| "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", | ||
yanfa317 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "configurationDisplayName": "SampleConfig", | ||
yanfa317 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "configurationDescription": "SampleDescription", | ||
yanfa317 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "ruleCollectionDisplayName": "SampleRuleCollection", | ||
| "ruleCollectionDescription": "SampleRuleCollectionDescription", | ||
| "ruleCollectionAppliesToGroups": [ | ||
| { | ||
| "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" | ||
| } | ||
| ], | ||
| "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" | ||
| }, | ||
| "ruleGroups": [ | ||
| { | ||
| "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": "FakeSkipTokenCode" | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.