From 2fb4058438e88f7ed8d0f5598cba50ca152cc959 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Wed, 28 Apr 2021 21:46:40 -0700 Subject: [PATCH] Add New Data Model RuleCollection to NetworkManager (#13827) * Add New Data Model RuleCollection to NetworkManager * fix typo * test * test * Fix discriminator * fix type * Fix discriminator * Fix type * fix type * Fix type * Fix discriminator * Fix discriminator * fix type * fix type * Fix bug * Fix type * Fix format * Fix name * Fix name * fix spell * fix description * Fix spell * change to kind * fix lint * fix lint * fix lint * fix lint * fix lint * fix lint * Fix post body * Fix as comments * fix bug * fix bug * fix bug * fix bug * fix bug * fix bug * change rule kind * Fix as comments * Fix as comments * update lastest version * Update type * Update Skiptoken * Fix discription * Fix NG * Fix NG * add more example --- ...NetworkManagerActiveConfigurationList.json | 207 ++++- ...tworkManagerAdminRuleCollectionDelete.json | 14 + .../NetworkManagerAdminRuleCollectionGet.json | 37 + ...NetworkManagerAdminRuleCollectionList.json | 41 + ...NetworkManagerAdminRuleCollectionPut.json} | 13 +- .../NetworkManagerAdminRuleDelete.json | 1 + .../examples/NetworkManagerAdminRuleGet.json | 15 +- .../examples/NetworkManagerAdminRulePut.json | 41 +- .../NetworkManagerAdminRulesList.json | 17 +- .../examples/NetworkManagerCommitPost.json | 15 +- ...rkManagerConnectivityConfigurationGet.json | 12 +- ...kManagerConnectivityConfigurationList.json | 12 +- ...rkManagerConnectivityConfigurationPut.json | 36 +- .../NetworkManagerDefaultAdminRuleGet.json | 57 ++ .../NetworkManagerDefaultAdminRulePut.json | 105 +++ .../NetworkManagerDefaultUserRuleGet.json | 55 ++ .../NetworkManagerDefaultUserRulePut.json | 101 +++ .../NetworkManagerDeploymentStatusList.json | 5 +- ...orkManagerEffectiveConfigurationsList.json | 196 ++++- ...erEffectiveConfigurationsListBySubnet.json | 189 ++++ ...rkManagerEffectiveVirtualNetworksList.json | 10 +- ...veVirtualNetworksListByNetworkManager.json | 8 +- .../examples/NetworkManagerGet.json | 2 +- .../examples/NetworkManagerGroupGet.json | 3 +- .../examples/NetworkManagerGroupList.json | 2 +- .../examples/NetworkManagerGroupPut.json | 9 +- .../examples/NetworkManagerList.json | 2 - .../examples/NetworkManagerListAll.json | 2 +- .../examples/NetworkManagerPatch.json | 2 +- .../examples/NetworkManagerPut.json | 6 - ...agerSecurityAdminConfigurationDelete.json} | 0 ...ManagerSecurityAdminConfigurationGet.json} | 7 +- ...ManagerSecurityAdminConfigurationList.json | 37 + ...kManagerSecurityAdminConfigurationPut.json | 62 ++ ...erSecurityConfigurationEvaluateImport.json | 124 --- ...orkManagerSecurityConfigurationImport.json | 34 - ...anagerSecurityUserConfigurationDelete.json | 13 + ...rkManagerSecurityUserConfigurationGet.json | 33 + ...ManagerSecurityUserConfigurationList.json} | 7 +- ...rkManagerSecurityUserConfigurationPut.json | 62 ++ ...etworkManagerUserRuleCollectionDelete.json | 14 + .../NetworkManagerUserRuleCollectionGet.json | 37 + .../NetworkManagerUserRuleCollectionList.json | 41 + .../NetworkManagerUserRuleCollectionPut.json | 72 ++ .../NetworkManagerUserRuleDelete.json | 1 + .../examples/NetworkManagerUserRuleGet.json | 10 +- .../examples/NetworkManagerUserRulePut.json | 24 +- .../examples/NetworkManagerUserRulesList.json | 14 +- .../2021-02-01-preview/networkManager.json | 80 +- .../networkManagerActiveConfiguration.json | 76 +- ...tworkManagerConnectivityConfiguration.json | 44 +- .../networkManagerEffectiveConfiguration.json | 378 ++++++-- .../networkManagerGroup.json | 52 +- ...orkManagerSecurityAdminConfiguration.json} | 675 ++++++-------- ...tworkManagerSecurityUserConfiguration.json | 830 ++++++++++++++++++ .../network/resource-manager/readme.md | 107 +-- 56 files changed, 3037 insertions(+), 1012 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionDelete.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/{NetworkManagerSecurityConfigurationPut.json => NetworkManagerAdminRuleCollectionPut.json} (85%) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/{NetworkManagerSecurityConfigurationDelete.json => NetworkManagerSecurityAdminConfigurationDelete.json} (100%) rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/{NetworkManagerSecurityConfigurationGet.json => NetworkManagerSecurityAdminConfigurationGet.json} (80%) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationEvaluateImport.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationImport.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationDelete.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/{NetworkManagerSecurityConfigurationList.json => NetworkManagerSecurityUserConfigurationList.json} (82%) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionDelete.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/{networkManagerSecurityConfiguration.json => networkManagerSecurityAdminConfiguration.json} (66%) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json index 508ab168393c..d34d2aed0503 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json @@ -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" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionDelete.json new file mode 100644 index 000000000000..200dc0249bc9 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig", + "ruleCollectionName": "testRuleCollection" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json new file mode 100644 index 000000000000..0f975692a4bb --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json @@ -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" + } + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json new file mode 100644 index 000000000000..49e04b4dbf73 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json @@ -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" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json similarity index 85% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationPut.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json index c4d2ff2a2790..ec9dc2e17b78 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json @@ -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" @@ -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", @@ -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" @@ -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" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleDelete.json index 61766a808cfd..f8cc0dfa5d1d 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleDelete.json @@ -5,6 +5,7 @@ "resourceGroupName": "rg1", "configurationName": "myTestSecurityConfig", "networkManagerName": "testNetworkManager", + "ruleCollectionName": "testRuleCollection", "ruleName": "SampleAdminRule" }, "responses": { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json index d29046b428aa..a7dea3683b32 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json @@ -5,14 +5,16 @@ "resourceGroupName": "rg1", "configurationName": "myTestSecurityConfig", "networkManagerName": "testNetworkManager", + "ruleCollectionName": "testRuleCollection", "ruleName": "SampleAdminRule" }, "responses": { "200": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig/adminRules/SampleAdminRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/AdminRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", "name": "SampleAdminRule", + "kind": "Custom", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -25,13 +27,13 @@ "displayName": "SampleAdminRule", "description": "This is Sample Admin Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -46,11 +48,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/networkGroups/testGroup" - } - ], "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json index 4e22e5c78520..7d38b0c7d5cf 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json @@ -5,18 +5,20 @@ "resourceGroupName": "rg1", "networkManagerName": "testNetworkManager", "configurationName": "myTestSecurityConfig", + "ruleCollectionName": "testRuleCollection", "ruleName": "SampleAdminRule", "adminRule": { + "kind": "Custom", "properties": { "description": "This is Sample Admin Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "ServiceTag", "addressPrefix": "Internet" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -30,21 +32,17 @@ ], "access": "Deny", "priority": 1, - "direction": "Inbound", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" - } - ] + "direction": "Inbound" } } }, "responses": { "200": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityConfigurations/myTestSecurityConfig/adminRules/SampleAdminRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/AdminRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", "name": "SampleAdminRule", + "kind": "Custom", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -56,13 +54,13 @@ "properties": { "description": "This is Sample Admin Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "ServiceTag", "addressPrefix": "Internet" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -77,20 +75,16 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" - } - ], "provisioningState": "Succeeded" } } }, "201": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityConfigurations/myTestSecurityConfig/adminRules/SampleAdminRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/AdminRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/rules/SampleAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", "name": "SampleAdminRule", + "kind": "Custom", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -102,13 +96,13 @@ "properties": { "description": "This is Sample Admin Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "ServiceTag", "addressPrefix": "Internet" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -123,11 +117,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" - } - ], "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json index aaa55f5ec4c2..38f8fef50044 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json @@ -4,6 +4,7 @@ "subscriptionId": "subId", "resourceGroupName": "rg1", "networkManagerName": "testNetworkManager", + "ruleCollectionName": "testRuleCollection", "configurationName": "myTestSecurityConfig" }, "responses": { @@ -11,8 +12,8 @@ "body": { "value": [ { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityConfigurations/myTestSecurityConfig/adminRules/SampleAdminRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/AdminRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", "name": "SampleAdminRule", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", @@ -22,16 +23,17 @@ "lastModifiedByType": "User", "lastModifiedAt": "2021-01-11T18:52:27Z" }, + "kind": "Custom", "properties": { "description": "This is Sample Admin Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -46,16 +48,11 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/networkGroups/testGroup" - } - ], "provisioningState": "Succeeded" } } ], - "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagers/myTestSecurityConfig/adminRules?api-version=2021-02-01-preview&$skipToken=10" + "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagers/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules?api-version=2021-02-01-preview&$skipToken=10" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json index b3a97e651ba2..962b122a4294 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json @@ -12,10 +12,21 @@ "configurationIds": [ "/subscriptions/subscriptionC/resourceGroups/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/SampleSecurityConfig" ], - "commitType": "AdminPolicy" + "commitType": "AdminSecurity" } }, "responses": { - "200": {} + "202": { + "body": { + "commitId": "testCommitId", + "targetLocations": [ + "usest" + ], + "configurationIds": [ + "/subscriptions/subscriptionC/resourceGroups/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/SampleSecurityConfig" + ], + "commitType": "AdminSecurity" + } + } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json index 51a5821be1a0..9d1f7bbaf8ab 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json @@ -24,16 +24,16 @@ "properties": { "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", - "connectivityTopology": "HubAndSpokeTopology", + "connectivityTopology": "HubAndSpoke", "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "isGlobal": true, - "deleteExistingPeering": true, + "isGlobal": "True", + "deleteExistingPeering": "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": "False" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json index 049b03e847cb..1da054d3a714 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json @@ -25,16 +25,16 @@ "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": "False" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json index 7652e09b7cda..6b95e1b019dd 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json @@ -10,16 +10,16 @@ "properties": { "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", - "connectivityTopology": "HubAndSpokeTopology", + "connectivityTopology": "HubAndSpoke", "hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "deleteExistingPeering": true, - "isGlobal": true, + "deleteExistingPeering": "True", + "isGlobal": "True", "appliesToGroups": [ { "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagerGroups/group1", - "useHubGateway": true, - "groupConnectivity": "Transitive", - "isGlobal": false + "useHubGateway": "True", + "groupConnectivity": "None", + "isGlobal": "False" } ] } @@ -42,16 +42,16 @@ "properties": { "displayName": "myTestConnectivityConfig", "description": "Sample Connectivity Configuration", - "connectivityTopology": "HubAndSpokeTopology", + "connectivityTopology": "HubAndSpoke", "hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "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": "False" } ], "provisioningState": "Succeeded" @@ -74,16 +74,16 @@ "properties": { "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", - "connectivityTopology": "HubAndSpokeTopology", + "connectivityTopology": "HubAndSpoke", "hubId": "subscriptions/subscriptionA/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/networkManagerGroups/group1", - "useHubGateway": true, - "groupConnectivity": "Transitive", - "isGlobal": false + "useHubGateway": "True", + "groupConnectivity": "None", + "isGlobal": "False" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json new file mode 100644 index 000000000000..cffdf54e631f --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json @@ -0,0 +1,57 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "configurationName": "myTestSecurityConfig", + "networkManagerName": "testNetworkManager", + "ruleCollectionName": "testRuleCollection", + "ruleName": "SampleDefaultAdminRule" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleDefaultAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", + "name": "SampleDefaultAdminRule", + "kind": "Default", + "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": { + "flag": "AllowVnetInbound", + "displayName": "SampleDefaultAdminRule", + "description": "This is Sample Default Admin Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "access": "Deny", + "priority": 1, + "direction": "Inbound", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json new file mode 100644 index 000000000000..224559196dc7 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json @@ -0,0 +1,105 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig", + "ruleCollectionName": "testRuleCollection", + "ruleName": "SampleDefaultAdminRule", + "adminRule": { + "kind": "Default", + "properties": { + "flag": "AllowVnetInbound" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleDefaultAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", + "name": "SampleDefaultAdminRule", + "kind": "Default", + "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": { + "flag": "AllowVnetInbound", + "description": "This is Sample Default Admin Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "ServiceTag", + "addressPrefix": "Internet" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "access": "Deny", + "priority": 1, + "direction": "Inbound", + "provisioningState": "Succeeded" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/rules/SampleDefaultAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", + "name": "SampleDefaultAdminRule", + "kind": "Default", + "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": { + "flag": "AllowVnetInbound", + "description": "This is Sample Default Admin Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "ServiceTag", + "addressPrefix": "Internet" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "access": "Deny", + "priority": 1, + "direction": "Inbound", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json new file mode 100644 index 000000000000..c8adcacd2598 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json @@ -0,0 +1,55 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "ruleCollectionName": "testRuleCollection", + "configurationName": "myTestSecurityConfig", + "networkManagerName": "testNetworkManager", + "ruleName": "SampleDefaultUserRule" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleDefaultUserRule", + "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", + "name": "SampleDefaultUserRule", + "kind": "Default", + "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": { + "flag": "AllowVnetInbound", + "displayName": "SampleDefaultUserRule", + "description": "Sample Default User Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json new file mode 100644 index 000000000000..9073e69aec49 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json @@ -0,0 +1,101 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig", + "ruleCollectionName": "testRuleCollection", + "ruleName": "SampleDefaultUserRule", + "userRule": { + "kind": "Default", + "properties": { + "flag": "AllowVnetInbound" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityUserConfigurations/Policy1/ruleCollections/testRuleCollection/rules/SampleUserRule", + "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", + "name": "SampleDefaultUserRule", + "kind": "Default", + "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": { + "flag": "AllowVnetInbound", + "description": "Sample Default User Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "provisioningState": "Succeeded" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleDefaultUserRule", + "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", + "name": "SampleDefaultUserRule", + "kind": "Default", + "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": { + "flag": "AllowVnetInbound", + "description": "Sample User Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json index 46f45aa6c422..e4070ae0b344 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json @@ -13,7 +13,8 @@ "deploymentTypes": [ "Connectivity", "AdminPolicy" - ] + ], + "$skipToken": "FakeSkipTokenCode" } }, "responses": { @@ -43,7 +44,7 @@ "errorMessage": "" } ], - "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/deploymentStatus?api-version=2021-02-01-preview&$skipToken=10" + "$skipToken": "NextFakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json index c5f67d42ab46..34f200e69116 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json @@ -4,66 +4,176 @@ "api-version": "2021-02-01-preview", "subscriptionId": "subscriptionA", "resourceGroupName": "myResourceGroup", - "virtualNetworkName": "testVirtualNetwork" + "virtualNetworkName": "testVirtualNetwork", + "parameters": { + "$skipToken": "FakeSkipTokenCode" + } }, "responses": { "200": { "body": { "value": [ { - "configType": "Connectivity", - "connectivityConfiguration": { - "name": "myTestConnectivityConfig", - "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", - "type": "Microsoft.Network/networkManagers/connectivityConfigurations", - "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": "myTestConnectivityConfig", - "description": "Sample Configuration", - "connectivityTopology": "HubAndSpokeTopology", - "hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "deleteExistingPeering": true, - "isGlobal": true, - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", - "useHubGateway": true, - "groupConnectivity": "Transitive", - "isGlobal": false + "kind": "ConnectivityConfiguration", + "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" + } + } + ] + }, + { + "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" } - ], - "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" + } } + ] + }, + { + "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" + } + ] }, - "securityAdminRule": null, - "securityUserRule": null, "configurationGroups": [ { - "name": "group1", "id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1", - "type": "Microsoft.Network/networkManagers/networkGroups", - "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": "My Network Group", "description": "A group for all test Virtual Networks", "memberType": "VirtualNetwork", "groupMembers": [ { - "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" + "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" } ], "conditionalMembership": "", @@ -73,7 +183,7 @@ ] } ], - "nextLink": "{baseurl}/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/testVirtualNetwork?api-version=2021-02-01-preview&$skipToken=10" + "$skipToken": "FakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json new file mode 100644 index 000000000000..cf7dcf245fc4 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json @@ -0,0 +1,189 @@ +{ + "title": "List Azure Virtual Network Manager Effective Configuration by Subnet", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subscriptionA", + "resourceGroupName": "myResourceGroup", + "virtualNetworkName": "testVirtualNetwork", + "subnetName": "testSubnet", + "parameters": { + "$skipToken": "FakeSkipTokenCode" + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "kind": "ConnectivityConfiguration", + "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" + } + } + ] + }, + { + "kind": "SecurityUserRuleCollection", + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", + "properties": { + "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" + } + } + ], + "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" + } + } + ] + }, + { + "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" + } + } + ] + } + ], + "$skipToken": "NextFakeSkipTokenCode" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json index c7b6068c21ce..77e6534be6ca 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json @@ -5,7 +5,10 @@ "subscriptionId": "subscriptionC", "resourceGroupName": "rg1", "networkManagerName": "testNetworkManager", - "networkGroupName": "TestNetworkGroup" + "networkGroupName": "TestNetworkGroup", + "parameters": { + "$skipToken": "FakeSkipTokenCode" + } }, "responses": { "200": { @@ -17,10 +20,7 @@ "membershipType": "Static" } ], - "totalRecords": 2, - "firstIndex": 1, - "pageSize": 10, - "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/TestNetworkGroup/effectiveVirtualNetworks?api-version=2021-02-01-preview&$skipToken=10" + "$skipToken": "NextFakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json index bca383c7c8d5..d28c208753f5 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json @@ -6,7 +6,8 @@ "resourceGroupName": "rg1", "networkManagerName": "testNetworkManager", "parameters": { - "conditionalMembers": "location='useast2'" + "conditionalMembers": "location='useast2'", + "$skipToken": "FakeSkipTokenCode" } }, "responses": { @@ -19,10 +20,7 @@ "membershipType": "Static" } ], - "totalRecords": 1, - "firstIndex": 1, - "pageSize": 10, - "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/effectiveVirtualNetworks?api-version=2021-02-01-preview&$skipToken=10" + "$skipToken": "NextFakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json index 6a28776bcd89..763addbf35bb 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json @@ -30,7 +30,7 @@ ] }, "networkManagerScopeAccesses": [ - "Security" + "UserSecurity" ], "provisioningState": "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json index e69da703e107..81a8884ec628 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json @@ -27,7 +27,8 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" + "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1", + "subnetId": "" } ], "conditionalMembership": "", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json index 5e4dd8701d5c..2857e2c241f2 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json @@ -28,7 +28,7 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" + "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" } ], "conditionalMembership": "", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json index fc7ae985854d..3c3ac5b8c03e 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json @@ -13,7 +13,8 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" + "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1", + "subnetId": "" } ], "conditionalMembership": "" @@ -43,7 +44,8 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" + "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1", + "subnetId": "" } ], "conditionalMembership": "", @@ -73,7 +75,8 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" + "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1", + "subnetId": "" } ], "conditionalMembership": "", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json index 816d4de4023a..50f571f4958a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json @@ -32,8 +32,6 @@ ] }, "networkManagerScopeAccesses": [ - "Security", - "Routing", "Connectivity" ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json index b0cd2b1bd307..4a53208631dc 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json @@ -31,7 +31,7 @@ ] }, "networkManagerScopeAccesses": [ - "Security" + "UserSecurity" ], "provisioningState": "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json index b26863743ead..8f9037afec2c 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json @@ -42,7 +42,7 @@ ] }, "networkManagerScopeAccesses": [ - "Security" + "UserSecurity" ], "provisioningState": "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json index 406721317e3f..95f43c7e8fad 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json @@ -18,8 +18,6 @@ ] }, "networkManagerScopeAccesses": [ - "Security", - "Routing", "Connectivity" ] } @@ -52,8 +50,6 @@ ] }, "networkManagerScopeAccesses": [ - "Security", - "Routing", "Connectivity" ], "provisioningState": "Succeeded" @@ -86,8 +82,6 @@ ] }, "networkManagerScopeAccesses": [ - "Security", - "Routing", "Connectivity" ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationDelete.json similarity index 100% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationDelete.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationDelete.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationGet.json similarity index 80% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationGet.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationGet.json index 954a49402e54..db64b57fad1b 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationGet.json @@ -25,12 +25,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", - "deleteExistingNSGs": true, - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" - } - ] + "deleteExistingNSGs": "True" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json new file mode 100644 index 000000000000..6d5536e42812 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityConfigurations", + "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": "Sample policy", + "description": "A sample policy", + "provisioningState": "Succeeded", + "securityType": "AdminPolicy", + "deleteExistingNSGs": "True" + } + } + ], + "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations?api-version=2021-02-01-preview&$skipToken=10" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json new file mode 100644 index 000000000000..feaae888ed13 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json @@ -0,0 +1,62 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "configurationName": "myTestSecurityConfig", + "networkManagerName": "testNetworkManager", + "securityAdminConfiguration": { + "properties": { + "description": "A sample policy", + "securityType": "AdminPolicy", + "deleteExistingNSGs": "True" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityConfigurations", + "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": "myTestSecurityConfig", + "description": "A sample policy", + "provisioningState": "Succeeded", + "securityType": "AdminPolicy", + "deleteExistingNSGs": "True" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityConfigurations", + "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": "myTestSecurityConfig", + "description": "A sample policy", + "provisioningState": "Succeeded", + "securityType": "AdminPolicy", + "deleteExistingNSGs": "True" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationEvaluateImport.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationEvaluateImport.json deleted file mode 100644 index 06af22a26397..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationEvaluateImport.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkManagerName": "testNetworkManager", - "configurationName": "myTestConfig", - "parameters": { - "networkSecurityGroupImports": [ - { - "networkSecurityGroupUri": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg/securityRules/rule1" - } - ], - "importDenyRulesAsAdminRules": true, - "adminSecurityConfigurationUri": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/adminConfig", - "removeAllowVnetInboundRule": true, - "removeAllowAzureLoadBalancerInboundRule": true, - "removeAllowVnetOutboundRule": true, - "removeAllowInternetOutboundRule": true - } - }, - "responses": { - "200": { - "body": { - "value": [ - { - "securityType": "UserPolicy", - "securityUserRule": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityConfigurations/myTestConfig/userRules/SampleRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/userRules", - "name": "SampleRule", - "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": { - "description": "Sample user rule", - "protocol": "Tcp", - "source": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destination": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "provisioningState": "Succeeded" - } - }, - "securityAdminRule": null - }, - { - "securityType": "AdminPolicy", - "securityUserRule": null, - "securityAdminRule": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityConfigurations/adminConfig/adminRules/SampleAdminRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/adminRules", - "name": "SampleAdminRule", - "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": { - "description": "Sample admin rule", - "protocol": "Tcp", - "source": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destination": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "access": "Deny", - "priority": 1, - "direction": "Inbound", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/networkGroups/testGroup" - } - ], - "provisioningState": "Succeeded" - } - } - } - ], - "failedImport": { - "failureCode": "123", - "failureReason": "None" - }, - "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestConfig/evaluateImport?api-version=2020-08-01&$skipToken=10" - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationImport.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationImport.json deleted file mode 100644 index cd7a4bea5340..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationImport.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkManagerName": "testNetworkManager", - "configurationName": "myTestConfig", - "parameters": { - "networkSecurityGroupImports": [ - { - "networkSecurityGroupUri": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityGroups/testnsg/securityRules/rule1" - } - ], - "importDenyRulesAsAdminRules": true, - "adminSecurityConfigurationUri": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/adminConfig", - "removeAllowVnetInboundRule": true, - "removeAllowAzureLoadBalancerInboundRule": true, - "removeAllowVnetOutboundRule": true, - "removeAllowInternetOutboundRule": true - } - }, - "responses": { - "200": { - "body": { - "userSecurityConfiguration": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestConfig", - "adminSecurityConfiguration": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/adminConfig", - "failedImport": { - "failureCode": "123", - "failureReason": "None" - } - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationDelete.json new file mode 100644 index 000000000000..938bd903784c --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationDelete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json new file mode 100644 index 000000000000..4c07b47433e3 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityConfigurations", + "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": "myTestSecurityConfig", + "description": "A sample policy", + "provisioningState": "Succeeded", + "securityType": "UserPolicy", + "deleteExistingNSGs": "True" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationList.json similarity index 82% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationList.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationList.json index 14131ec154f0..41b9a56f35d0 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationList.json @@ -26,12 +26,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", - "deleteExistingNSGs": true, - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" - } - ] + "deleteExistingNSGs": "True" } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json new file mode 100644 index 000000000000..dbdfceff66c0 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json @@ -0,0 +1,62 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "configurationName": "myTestSecurityConfig", + "networkManagerName": "testNetworkManager", + "securityUserConfiguration": { + "properties": { + "description": "A sample policy", + "securityType": "UserPolicy", + "deleteExistingNSGs": "True" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityConfigurations", + "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": "myTestSecurityConfig", + "description": "A sample policy", + "provisioningState": "Succeeded", + "securityType": "UserPolicy", + "deleteExistingNSGs": "True" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityConfigurations", + "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": "myTestSecurityConfig", + "description": "A sample policy", + "provisioningState": "Succeeded", + "securityType": "UserPolicy", + "deleteExistingNSGs": "True" + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionDelete.json new file mode 100644 index 000000000000..200dc0249bc9 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig", + "ruleCollectionName": "testRuleCollection" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json new file mode 100644 index 000000000000..8f55c9d627ad --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json @@ -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/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", + "name": "testRuleCollection", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/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" + } + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json new file mode 100644 index 000000000000..86f6b6c1b164 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json @@ -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/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", + "name": "testRuleCollection", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/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/securityUserConfigurations/myTestSecurityConfig/ruleCollections?api-version=2021-02-01-preview&$skipToken=10" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json new file mode 100644 index 000000000000..d91c5d8a74fd --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "configurationName": "myTestSecurityConfig", + "networkManagerName": "testNetworkManager", + "ruleCollectionName": "testRuleCollection", + "userRuleCollection": { + "properties": { + "description": "A sample policy", + "appliesToGroups": [ + { + "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/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": "myTestSecurityConfig", + "description": "A sample policy", + "provisioningState": "Succeeded", + "appliesToGroups": [ + { + "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" + } + ] + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityUserConfigurations/myTestSecurityConfig", + "name": "myTestSecurityConfig", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/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": "myTestSecurityConfig", + "description": "A sample policy", + "provisioningState": "Succeeded", + "appliesToGroups": [ + { + "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" + } + ] + } + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleDelete.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleDelete.json index 54beb5ca9b4a..3fbaf4ba00c0 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleDelete.json @@ -5,6 +5,7 @@ "resourceGroupName": "rg1", "configurationName": "myTestSecurityConfig", "networkManagerName": "testNetworkManager", + "ruleCollectionName": "testRuleCollection", "ruleName": "SampleUserRule" }, "responses": { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json index cbabd8525041..10459a5f40ce 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json @@ -3,6 +3,7 @@ "api-version": "2021-02-01-preview", "subscriptionId": "subId", "resourceGroupName": "rg1", + "ruleCollectionName": "testRuleCollection", "configurationName": "myTestSecurityConfig", "networkManagerName": "testNetworkManager", "ruleName": "SampleUserRule" @@ -10,9 +11,10 @@ "responses": { "200": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig/userRules/SampleUserRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/UserRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", + "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", "name": "SampleUserRule", + "kind": "Custom", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -25,13 +27,13 @@ "displayName": "SampleUserRule", "description": "Sample User Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json index 5063fafbacfa..c9538b7cac28 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json @@ -5,18 +5,20 @@ "resourceGroupName": "rg1", "networkManagerName": "testNetworkManager", "configurationName": "myTestSecurityConfig", + "ruleCollectionName": "testRuleCollection", "ruleName": "SampleUserRule", "userRule": { + "kind": "Custom", "properties": { "description": "Sample User Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -35,9 +37,10 @@ "responses": { "200": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityConfigurations/Policy1/userRules/SampleUserRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/userRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityUserConfigurations/Policy1/ruleCollections/testRuleCollection/rules/SampleUserRule", + "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", "name": "SampleUserRule", + "kind": "Custom", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -49,13 +52,13 @@ "properties": { "description": "Sample User Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -74,9 +77,10 @@ }, "201": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig/userRules/SampleUserRule", - "type": "Microsoft.Network/networkManagers/SecurityConfigurations/UserRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", + "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", "name": "SampleUserRule", + "kind": "Custom", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -88,13 +92,13 @@ "properties": { "description": "Sample User Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json index 3d96f51722bc..450a68d6d5dc 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json @@ -4,16 +4,18 @@ "subscriptionId": "subId", "resourceGroupName": "rg1", "networkManagerName": "testNetworkManager", - "configurationName": "myTestConnectivityConfig" + "ruleCollectionName": "testRuleCollection", + "configurationName": "myTestSecurityConfig" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityConfigurations/myTestConnectivityConfig/userRules/SampleUserRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/UserRules", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", + "type": "Microsoft.Network/networkManagers/securityConfigurations/ruleCollections/UserRules", "name": "SampleUserRule", + "kind": "Custom", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -25,13 +27,13 @@ "properties": { "description": "Sample User Rule", "protocol": "Tcp", - "source": [ + "sources": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" } ], - "destination": [ + "destinations": [ { "addressPrefixType": "IPPrefix", "addressPrefix": "*" @@ -48,7 +50,7 @@ } } ], - "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestConnectivityConfig/userRules?api-version=2021-02-01-preview&$skipToken=10" + "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules?api-version=2021-02-01-preview&$skipToken=10" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json index 32b91f0cf733..e5493cedb794 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json @@ -215,8 +215,11 @@ } ], "responses": { - "200": { - "description": "Commit Succeed" + "202": { + "description": "Accepted and the operation will complete asynchronously", + "schema": { + "$ref": "#/definitions/NetworkManagerCommit" + } }, "default": { "description": "Error response describing why the operation failed.", @@ -252,7 +255,7 @@ "NetworkManagers" ], "operationId": "NetworkManagerDeploymentStatus_List", - "description": "Post List of Network Manager Deployment Status.", + "description": "Post to List of Network Manager Deployment Status.", "parameters": [ { "name": "parameters", @@ -262,12 +265,6 @@ "$ref": "#/definitions/NetworkManagerDeploymentStatusParameter" }, "description": "Parameters supplied to specify which Managed Network deployment status is." - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" } ], "responses": { @@ -284,9 +281,6 @@ } } }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "x-ms-examples": { "NetworkManagerDeploymentStatusList": { "$ref": "./examples/NetworkManagerDeploymentStatusList.json" @@ -394,9 +388,6 @@ ], "operationId": "EffectiveVirtualNetworks_ListByNetworkManager", "description": "List effective virtual networks in a network manager.", - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -428,7 +419,7 @@ ], "responses": { "200": { - "description": "OK - Returns a list of effective Virtual Networks.", + "description": "OK - Returns a list of effective virtual networks.", "schema": { "$ref": "./networkManagerGroup.json#/definitions/EffectiveVirtualNetworksListResult" } @@ -441,7 +432,7 @@ } }, "x-ms-examples": { - "List Network Manager": { + "List Effective Virtual Networks By Network Manager": { "$ref": "./examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json" } } @@ -524,15 +515,7 @@ "type": "array", "items": { "type": "string", - "enum": [ - "Security", - "Routing", - "Connectivity" - ], - "x-ms-enum": { - "name": "ScopeAccesses", - "modelAsString": true - } + "$ref": "#/definitions/ConfigurationType" }, "description": "Scope Access." }, @@ -546,6 +529,11 @@ }, "NetworkManagerCommit": { "properties": { + "commitId": { + "type": "string", + "readOnly": true, + "description": "Commit Id." + }, "targetLocations": { "type": "array", "items": { @@ -562,16 +550,7 @@ }, "commitType": { "type": "string", - "enum": [ - "AdminPolicy", - "UserPolicy", - "Routing", - "Connectivity" - ], - "x-ms-enum": { - "name": "CommitType", - "modelAsString": true - }, + "$ref": "#/definitions/ConfigurationType", "description": "Commit Type." } }, @@ -589,9 +568,13 @@ "deploymentTypes": { "type": "array", "items": { - "$ref": "#/definitions/DeploymentType" + "$ref": "#/definitions/ConfigurationType" }, - "description": "List of configurations' deployment types." + "description": "List of deployment types." + }, + "$skipToken": { + "description": "Continuation token for pagination, capturing the next page size and offset, as well as the context of the query.", + "type": "string" } }, "description": "Network Manager Deployment Status Parameter." @@ -605,9 +588,9 @@ }, "description": "Gets a page of Network Manager Deployment Status" }, - "nextLink": { - "type": "string", - "description": "Gets the URL to get the next page of results." + "$skipToken": { + "description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.", + "type": "string" } }, "description": "A list of Network Manager Deployment Status" @@ -646,7 +629,7 @@ }, "deploymentType": { "type": "string", - "$ref": "#/definitions/DeploymentType" + "$ref": "#/definitions/ConfigurationType" }, "errorMessage": { "type": "string", @@ -655,16 +638,15 @@ }, "description": "Network Manager Deployment Status." }, - "DeploymentType": { + "ConfigurationType": { "type": "string", "enum": [ - "AdminPolicy", - "UserPolicy", - "Routing", + "AdminSecurity", + "UserSecurity", "Connectivity" ], "x-ms-enum": { - "name": "DeploymentType", + "name": "ConfigurationType", "modelAsString": true }, "description": "Configuration Deployment Type." @@ -674,6 +656,10 @@ "conditionalMembers": { "type": "string", "description": "Conditional Members." + }, + "$skipToken": { + "description": "Continuation token for pagination, capturing the next page size and offset, as well as the context of the query.", + "type": "string" } }, "description": "Effective Virtual Networks Parameter." diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json index 37d12ade20aa..81623cd01620 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/activeConfigurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/listActiveConfigurations": { "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -49,21 +49,16 @@ "$ref": "#/parameters/NetworkManagerNameParameter" }, { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - }, - { - "name": "region", - "in": "query", - "description": "Location name", + "name": "parameters", + "in": "body", "required": false, - "type": "string", - "x-ms-parameter-location": "method" + "schema": { + "$ref": "#/definitions/ActiveConfigurationParameter" + }, + "description": "Effective Virtual Networks Parameter." } ], - "get": { + "post": { "tags": [ "NetworkManagerActiveConfigurations" ], @@ -87,9 +82,6 @@ "List Active Configurations": { "$ref": "./examples/NetworkManagerActiveConfigurationList.json" } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } } } @@ -105,13 +97,13 @@ "region": { "type": "string", "description": "Deployment region." + }, + "committedConfiguration": { + "type": "object", + "$ref": "./networkManagerEffectiveConfiguration.json#/definitions/EffectiveConfiguration", + "description": "Configuration such as connectivity configuration or security rule collection." } }, - "allOf": [ - { - "$ref": "./networkManagerEffectiveConfiguration.json#/definitions/EffectiveConfiguration" - } - ], "description": "Active Configuration." }, "ActiveConfigurationListResult": { @@ -123,12 +115,29 @@ }, "description": "Gets a page of active configurations." }, - "nextLink": { - "type": "string", - "description": "Gets the URL to get the next set of results." + "$skipToken": { + "description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.", + "type": "string" } }, "description": "Result of the request to list active configurations. It contains a list of active configurations and a URL link to get the next set of results." + }, + "ActiveConfigurationParameter": { + "properties": { + "regions": { + "type": "array", + "items": { + "type": "string", + "description": "region Name." + }, + "description": "List of regions." + }, + "$skipToken": { + "description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.", + "type": "string" + } + }, + "description": "Effective Virtual Networks Parameter." } }, "parameters": { @@ -147,25 +156,6 @@ "type": "string", "description": "The name of the network manager.", "x-ms-parameter-location": "method" - }, - "ListTopParameter": { - "name": "$top", - "description": "An optional query parameter which specifies the maximum number of records to be returned by the server.", - "in": "query", - "required": false, - "type": "integer", - "format": "int32", - "minimum": 1, - "maximum": 20, - "x-ms-parameter-location": "method" - }, - "ListSkipTokenParameter": { - "name": "$skipToken", - "description": "SkipToken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skipToken parameter that specifies a starting point to use for subsequent calls.", - "in": "query", - "required": false, - "type": "string", - "x-ms-parameter-location": "method" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json index 116118530f2e..39348f651e58 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json @@ -250,8 +250,8 @@ "connectivityTopology": { "type": "string", "enum": [ - "HubAndSpokeTopology", - "MeshTopology" + "HubAndSpoke", + "Mesh" ], "x-ms-enum": { "name": "ConnectivityTopology", @@ -264,7 +264,15 @@ "description": "The hub vnet Id." }, "isGlobal": { - "type": "boolean", + "type": "string", + "enum": [ + "False", + "True" + ], + "x-ms-enum": { + "name": "IsGlobal", + "modelAsString": true + }, "description": "Flag if global mesh is supported." }, "appliesToGroups": { @@ -280,7 +288,15 @@ "description": "The provisioning state of the connectivity configuration resource." }, "deleteExistingPeering": { - "type": "boolean", + "type": "string", + "enum": [ + "False", + "True" + ], + "x-ms-enum": { + "name": "DeleteExistingPeering", + "modelAsString": true + }, "description": "Flag if need to remove current existing peerings." } }, @@ -297,11 +313,27 @@ "description": "Network group Id." }, "useHubGateway": { - "type": "boolean", + "type": "string", + "enum": [ + "False", + "True" + ], + "x-ms-enum": { + "name": "UseHubGateway", + "modelAsString": true + }, "description": "Flag if need to use hub gateway." }, "isGlobal": { - "type": "boolean", + "type": "string", + "enum": [ + "False", + "True" + ], + "x-ms-enum": { + "name": "IsGlobal", + "modelAsString": true + }, "description": "Flag if global is supported." }, "groupConnectivity": { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json index 5dc6d1b8f262..1e84f4cc7eed 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/networkManagerEffectiveConfigurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/listNetworkManagerEffectiveConfigurations": { "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -49,13 +49,16 @@ "$ref": "./network.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions" + }, + "description": "Parameters supplied to list correct page." } ], - "get": { + "post": { "tags": [ "NetworkManagerEffectiveConfiguration" ], @@ -75,55 +78,349 @@ } } }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "x-ms-examples": { "List effective configuration": { "$ref": "./examples/NetworkManagerEffectiveConfigurationsList.json" } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/listNetworkManagerEffectiveConfigurations": { + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/VirtualNetworkNameParameter" + }, + { + "name": "subnetName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the subnet." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions" + }, + "description": "Parameters supplied to list correct page." + } + ], + "post": { + "tags": [ + "NetworkManagerEffectiveConfiguration" + ], + "operationId": "EffectiveConfigurations_ListBySubnet", + "description": "List all configurations in a subnet.", + "responses": { + "200": { + "description": "OK - Returns information about all effective configurations in a subnet.", + "schema": { + "$ref": "#/definitions/NetworkManagerEffectiveConfigurationListResult" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List effective configuration in a subnet": { + "$ref": "./examples/NetworkManagerEffectiveConfigurationsListBySubnet.json" + } + } + } } }, "definitions": { "EffectiveConfiguration": { "properties": { - "configType": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "kind": { "type": "string", "enum": [ - "AdminPolicy", - "UserPolicy", - "Connectivity" + "ConnectivityConfiguration", + "SecurityUserRuleCollection", + "SecurityAdminRuleCollection" ], "x-ms-enum": { - "name": "ConfigType", + "name": "EffectiveConfigurationKind", "modelAsString": true }, - "description": "Effective configuration." - }, - "connectivityConfiguration": { - "$ref": "./networkManagerConnectivityConfiguration.json#/definitions/ConnectivityConfiguration", - "description": "Connectivity configuration object." - }, - "securityAdminRule": { - "$ref": "./networkManagerSecurityConfiguration.json#/definitions/AdminRule", - "description": "Security admin rule object." - }, - "securityUserRule": { - "$ref": "./networkManagerSecurityConfiguration.json#/definitions/UserRule", - "description": "Security user rule object." + "description": "Effective configuration Type." }, "configurationGroups": { "type": "array", "items": { - "$ref": "./networkManagerGroup.json#/definitions/NetworkGroup" + "$ref": "#/definitions/ConfigurationGroup" }, "description": "Effective configuration groups." } }, + "required": [ + "kind" + ], + "discriminator": "kind", "description": "The network manager effective configuration" }, + "EffectiveConnectivityConfiguration": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "./networkManagerConnectivityConfiguration.json#/definitions/ConnectivityConfigurationProperties", + "description": "Properties of a network manager connectivity configuration" + } + }, + "allOf": [ + { + "$ref": "#/definitions/EffectiveConfiguration" + } + ], + "description": "The network manager connectivity configuration resource", + "x-ms-discriminator-value": "ConnectivityConfiguration" + }, + "SecurityUserRuleCollection": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecurityUserRuleCollectionProperties", + "description": "The security user rule collection properties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/EffectiveConfiguration" + } + ], + "description": "The network manager effective security user rule collection", + "x-ms-discriminator-value": "SecurityUserRuleCollection" + }, + "SecurityAdminRuleCollection": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecurityAdminRuleCollectionProperties", + "description": "The security admin rule collection properties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/EffectiveConfiguration" + } + ], + "description": "The network manager effective security admin rule collection", + "x-ms-discriminator-value": "SecurityAdminRuleCollection" + }, + "SecurityUserRuleCollectionProperties": { + "properties": { + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/UserBaseRule" + }, + "description": "Base user rule List" + } + }, + "allOf": [ + { + "$ref": "#/definitions/RuleCollectionProperties" + } + ], + "description": "The network manager security user rule collection properties" + }, + "SecurityAdminRuleCollectionProperties": { + "properties": { + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/AdminBaseRule" + }, + "description": "Base admin rule List" + } + }, + "allOf": [ + { + "$ref": "#/definitions/RuleCollectionProperties" + } + ], + "description": "The network manager security rule admin collection properties" + }, + "RuleCollectionProperties": { + "properties": { + "configurationDisplayName": { + "type": "string", + "description": "A display name of the rule collection." + }, + "configurationDescription": { + "type": "string", + "description": "A description of the rule collection." + }, + "displayName": { + "type": "string", + "description": "A display name of the rule collection." + }, + "description": { + "type": "string", + "description": "A description of the rule collection." + }, + "appliesToGroups": { + "type": "array", + "items": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/NetworkManagerSecurityGroupItem" + }, + "description": "Groups for configuration" + }, + "provisioningState": { + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the the resource." + } + }, + "description": "The network manager security rule collection properties" + }, + "AdminBaseRule": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "kind": { + "type": "string", + "description": "Whether the rule collection is custom or default.", + "enum": [ + "Custom", + "Default" + ], + "x-ms-enum": { + "name": "EffectiveAdminRuleKind", + "modelAsString": true + } + } + }, + "required": [ + "kind" + ], + "discriminator": "kind", + "description": "Network base rule." + }, + "EffectiveAdminRule": { + "properties": { + "properties": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AdminPropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security admin rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/AdminBaseRule" + } + ], + "description": "Network admin rule.", + "x-ms-discriminator-value": "Custom" + }, + "EffectiveDefaultAdminRule": { + "properties": { + "properties": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/DefaultAdminPropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the default security admin rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/AdminBaseRule" + } + ], + "description": "Network default admin rule.", + "x-ms-discriminator-value": "Default" + }, + "UserBaseRule": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "kind": { + "type": "string", + "description": "Whether the rule collection is custom or default.", + "enum": [ + "Custom", + "Default" + ], + "x-ms-enum": { + "name": "EffectiveUserRuleKind", + "modelAsString": true + } + } + }, + "required": [ + "kind" + ], + "discriminator": "kind", + "description": "Network base rule." + }, + "EffectiveUserRule": { + "properties": { + "properties": { + "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/UserRulePropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security user rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/UserBaseRule" + } + ], + "description": "Network security user rule.", + "x-ms-discriminator-value": "Custom" + }, + "EffectiveDefaultUserRule": { + "properties": { + "properties": { + "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/DefaultUserRulePropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security default user rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/UserBaseRule" + } + ], + "description": "Network security default user rule.", + "x-ms-discriminator-value": "Default" + }, + "ConfigurationGroup": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "./networkManagerGroup.json#/definitions/NetworkGroupProperties", + "description": "The network configuration group properties" + } + }, + "description": "The network configuration group resource" + }, "NetworkManagerEffectiveConfigurationListResult": { "properties": { "value": { @@ -133,9 +430,9 @@ }, "description": "Gets a page of NetworkManagerEffectiveConfiguration" }, - "nextLink": { - "type": "string", - "description": "Gets the URL to get the next set of results." + "$skipToken": { + "description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.", + "type": "string" } }, "description": "Result of the request to list networkManagerEffectiveConfiguration. It contains a list of groups and a URL link to get the next set of results." @@ -157,25 +454,6 @@ "type": "string", "description": "The name of the virtual network.", "x-ms-parameter-location": "method" - }, - "ListTopParameter": { - "name": "$top", - "description": "An optional query parameter which specifies the maximum number of records to be returned by the server.", - "in": "query", - "required": false, - "type": "integer", - "format": "int32", - "minimum": 1, - "maximum": 20, - "x-ms-parameter-location": "method" - }, - "ListSkipTokenParameter": { - "name": "$skipToken", - "description": "SkipToken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skipToken parameter that specifies a starting point to use for subsequent calls.", - "in": "query", - "required": false, - "type": "string", - "x-ms-parameter-location": "method" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json index 8ecfe3f15f57..b15d672de320 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json @@ -226,9 +226,6 @@ ], "operationId": "EffectiveVirtualNetworks_ListByNetworkGroup", "description": "Lists all effective virtual networks by specified network group.", - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -246,10 +243,13 @@ "$ref": "./network.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/QueryRequestOptions" + }, + "description": "Parameters supplied to list correct page." } ], "responses": { @@ -356,13 +356,26 @@ "groupMembersItem": { "type": "object", "properties": { - "resourceId": { + "vnetId": { "type": "string", - "description": "Resource Id." + "description": "Vnet Id." + }, + "subnetId": { + "type": "string", + "description": "Subnet Id." } }, "description": "GroupMembers Item." }, + "QueryRequestOptions": { + "properties": { + "$skipToken": { + "description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.", + "type": "string" + } + }, + "description": "Query Request Options" + }, "EffectiveVirtualNetworksListResult": { "properties": { "value": { @@ -372,24 +385,9 @@ }, "description": "Gets a page of EffectiveVirtualNetwork" }, - "totalRecords": { - "description": "Total Records.", - "format": "int32", - "type": "integer" - }, - "firstIndex": { - "description": "First Index.", - "format": "int32", - "type": "integer" - }, - "pageSize": { - "description": "Page Size.", - "format": "int32", - "type": "integer" - }, - "nextLink": { - "type": "string", - "description": "Gets the URL to get the next set of results." + "$skipToken": { + "description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.", + "type": "string" } }, "description": "Result of the request to list Effective Virtual Network. It contains a list of groups and a URL link to get the next set of results." diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json similarity index 66% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityConfiguration.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json index 7a0589d0477b..866078791d18 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "title": "SecurityConfiguration", + "title": "SecurityAdminConfiguration", "version": "2021-02-01-preview" }, "host": "management.azure.com", @@ -33,13 +33,13 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations": { "get": { "tags": [ - "SecurityConfigurations" + "SecurityAdminConfigurations" ], - "operationId": "SecurityConfigurations_List", - "description": "Lists all the network manager security configurations in a network manager, in a paginated format.", + "operationId": "SecurityAdminConfigurations_List", + "description": "Lists all the network manager security admin configurations in a network manager, in a paginated format.", "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -62,7 +62,7 @@ ], "responses": { "200": { - "description": "Get successful. The operation returns all security configuration resources in the specified network manager, in a paginated format", + "description": "Get successful. The operation returns all security admin configuration resources in the specified network manager, in a paginated format", "schema": { "$ref": "#/definitions/SecurityConfigurationListResult" } @@ -78,130 +78,13 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { - "List security configurations in a network manager": { - "$ref": "./examples/NetworkManagerSecurityConfigurationList.json" + "List security admin configurations in a network manager": { + "$ref": "./examples/NetworkManagerSecurityAdminConfigurationList.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations/{configurationName}/import": { - "post": { - "tags": [ - "SecurityConfigurations" - ], - "operationId": "SecurityConfigurations_Import", - "description": "Imports network security rules to network manager security rules.", - "parameters": [ - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkManagerNameParameter" - }, - { - "$ref": "#/parameters/SecurityConfigurationParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/NetworkManagerSecurityConfigurationImport" - }, - "description": "Import Security configuration parameter" - } - ], - "responses": { - "200": { - "description": "Post successful.", - "schema": { - "$ref": "#/definitions/SecurityConfigurationImportResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Import NSG Rules": { - "$ref": "./examples/NetworkManagerSecurityConfigurationImport.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations/{configurationName}/evaluateImport": { - "post": { - "tags": [ - "SecurityConfigurations" - ], - "operationId": "SecurityConfigurations_EvaluateImport", - "description": "The operation to evaluate import NSG to security configurations.", - "parameters": [ - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkManagerNameParameter" - }, - { - "$ref": "#/parameters/SecurityConfigurationParameter" - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/NetworkManagerSecurityConfigurationImport" - }, - "description": "Import security configuration parameter" - } - ], - "responses": { - "200": { - "description": "Post successful.", - "schema": { - "$ref": "#/definitions/SecurityConfigurationRuleListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "Evaluate import NSG Rules": { - "$ref": "./examples/NetworkManagerSecurityConfigurationEvaluateImport.json" - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations/{configurationName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}": { "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -221,10 +104,10 @@ ], "get": { "tags": [ - "SecurityConfigurations" + "SecurityAdminConfigurations" ], - "description": "Retrieves a network manager security Configuration.", - "operationId": "SecurityConfigurations_Get", + "description": "Retrieves a network manager security admin configuration.", + "operationId": "SecurityAdminConfigurations_Get", "responses": { "200": { "description": "successful operation", @@ -240,37 +123,37 @@ } }, "x-ms-examples": { - "Get security configurations": { - "$ref": "./examples/NetworkManagerSecurityConfigurationGet.json" + "Get security admin configurations": { + "$ref": "./examples/NetworkManagerSecurityAdminConfigurationGet.json" } } }, "put": { "tags": [ - "SecurityConfigurations" + "SecurityAdminConfigurations" ], - "description": "Creates or updates a network manager security Configuration.", - "operationId": "SecurityConfigurations_CreateOrUpdate", + "description": "Creates or updates a network manager security admin configuration.", + "operationId": "SecurityAdminConfigurations_CreateOrUpdate", "parameters": [ { - "name": "securityConfiguration", + "name": "securityAdminConfiguration", "in": "body", "required": true, "schema": { "$ref": "#/definitions/SecurityConfiguration" }, - "description": "The security configuration to create or update" + "description": "The security admin configuration to create or update" } ], "responses": { "200": { - "description": "Updated Configuration", + "description": "Updated Admin Configuration", "schema": { "$ref": "#/definitions/SecurityConfiguration" } }, "201": { - "description": "Created Configuration", + "description": "Created Admin Configuration", "schema": { "$ref": "#/definitions/SecurityConfiguration" } @@ -283,17 +166,17 @@ } }, "x-ms-examples": { - "Create network manager security Configuration": { - "$ref": "./examples/NetworkManagerSecurityConfigurationPut.json" + "Create network manager security admin configuration": { + "$ref": "./examples/NetworkManagerSecurityAdminConfigurationPut.json" } } }, "delete": { "tags": [ - "SecurityConfigurations" + "SecurityAdminConfigurations" ], - "description": "Deletes a network manager security Configuration.", - "operationId": "SecurityConfigurations_Delete", + "description": "Deletes a network manager security admin configuration.", + "operationId": "SecurityAdminConfigurations_Delete", "responses": { "200": { "description": "OK" @@ -309,47 +192,47 @@ } }, "x-ms-examples": { - "Delete network manager security Configuration": { - "$ref": "./examples/NetworkManagerSecurityConfigurationDelete.json" + "Delete network manager security admin configuration": { + "$ref": "./examples/NetworkManagerSecurityAdminConfigurationDelete.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations/{configurationName}/adminRules": { - "parameters": [ - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkManagerNameParameter" - }, - { - "$ref": "#/parameters/SecurityConfigurationParameter" - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - } - ], + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections": { "get": { "tags": [ - "AdminRules" + "AdminRuleCollections" + ], + "operationId": "AdminRuleCollections_List", + "description": "Lists all the rule collections in a security admin configuration, in a paginated format.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } ], - "description": "Retrieves a network manager security configuration admin rule.", - "operationId": "AdminRules_List", "responses": { "200": { - "description": "Successful operation", + "description": "Get successful. The operation returns all ruleCollections in the specified security configuration, in a paginated format", "schema": { - "$ref": "#/definitions/AdminRuleListResult" + "$ref": "#/definitions/RuleCollectionListResult" } }, "default": { @@ -359,17 +242,17 @@ } } }, - "x-ms-examples": { - "List security admin rules": { - "$ref": "./examples/NetworkManagerAdminRulesList.json" - } - }, "x-ms-pageable": { "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List security admin rule collections": { + "$ref": "./examples/NetworkManagerAdminRuleCollectionList.json" + } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations/{configurationName}/adminRules/{ruleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}": { "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -387,20 +270,20 @@ "$ref": "#/parameters/SecurityConfigurationParameter" }, { - "$ref": "#/parameters/SecurityConfigurationsRuleParameter" + "$ref": "#/parameters/RuleCollectionParameter" } ], "get": { "tags": [ - "AdminRules" + "AdminRuleCollections" ], - "description": "Gets a network manager security configuration admin rule in a subscription.", - "operationId": "AdminRules_Get", + "description": "Gets a network manager security admin configuration rule collection.", + "operationId": "AdminRuleCollections_Get", "responses": { "200": { "description": "Successful operation", "schema": { - "$ref": "#/definitions/AdminRule" + "$ref": "#/definitions/RuleCollection" } }, "default": { @@ -411,39 +294,39 @@ } }, "x-ms-examples": { - "Gets security admin rule": { - "$ref": "./examples/NetworkManagerAdminRuleGet.json" + "Gets security admin rule collection": { + "$ref": "./examples/NetworkManagerAdminRuleCollectionGet.json" } } }, "put": { "tags": [ - "AdminRules" + "AdminRuleCollections" ], - "description": "Creates or updates an admin rule.", - "operationId": "AdminRules_CreateOrUpdate", + "description": "Creates or updates an admin rule collection.", + "operationId": "AdminRuleCollections_CreateOrUpdate", "parameters": [ { - "name": "adminRule", + "name": "ruleCollection", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/AdminRule" + "$ref": "#/definitions/RuleCollection" }, - "description": "The admin rule to create or update" + "description": "The Rule Collection to create or update" } ], "responses": { "200": { - "description": "Updated rule", + "description": "Updated Rule Collection", "schema": { - "$ref": "#/definitions/AdminRule" + "$ref": "#/definitions/RuleCollection" } }, "201": { - "description": "Created rule", + "description": "Created Rule Collection", "schema": { - "$ref": "#/definitions/AdminRule" + "$ref": "#/definitions/RuleCollection" } }, "default": { @@ -454,17 +337,17 @@ } }, "x-ms-examples": { - "Create an admin rule": { - "$ref": "./examples/NetworkManagerAdminRulePut.json" + "Create or Update an admin rule collection": { + "$ref": "./examples/NetworkManagerAdminRuleCollectionPut.json" } } }, "delete": { "tags": [ - "AdminRules" + "AdminRuleCollections" ], - "description": "Deletes an admin rule.", - "operationId": "AdminRules_Delete", + "description": "Deletes an admin rule collection.", + "operationId": "AdminRuleCollections_Delete", "responses": { "200": { "description": "OK" @@ -480,13 +363,13 @@ } }, "x-ms-examples": { - "Deletes an admin rule.": { - "$ref": "./examples/NetworkManagerAdminRuleDelete.json" + "Deletes an admin rule collection": { + "$ref": "./examples/NetworkManagerAdminRuleCollectionDelete.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations/{configurationName}/userRules": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules": { "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -503,6 +386,9 @@ { "$ref": "#/parameters/SecurityConfigurationParameter" }, + { + "$ref": "#/parameters/RuleCollectionParameter" + }, { "$ref": "#/parameters/ListTopParameter" }, @@ -512,15 +398,15 @@ ], "get": { "tags": [ - "UserRules" + "AdminRules" ], - "description": "Lists all user rules in a security configuration.", - "operationId": "UserRules_List", + "description": "List all network manager security configuration admin rules.", + "operationId": "AdminRules_List", "responses": { "200": { "description": "Successful operation", "schema": { - "$ref": "#/definitions/UserRuleListResult" + "$ref": "#/definitions/AdminRuleListResult" } }, "default": { @@ -531,8 +417,8 @@ } }, "x-ms-examples": { - "List security user rules": { - "$ref": "./examples/NetworkManagerUserRulesList.json" + "List security admin rules": { + "$ref": "./examples/NetworkManagerAdminRulesList.json" } }, "x-ms-pageable": { @@ -540,7 +426,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityConfigurations/{configurationName}/userRules/{ruleName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules/{ruleName}": { "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -557,21 +443,24 @@ { "$ref": "#/parameters/SecurityConfigurationParameter" }, + { + "$ref": "#/parameters/RuleCollectionParameter" + }, { "$ref": "#/parameters/SecurityConfigurationsRuleParameter" } ], "get": { "tags": [ - "UserRules" + "AdminRules" ], - "description": "Gets a user rule.", - "operationId": "UserRules_Get", + "description": "Gets a network manager security configuration admin rule.", + "operationId": "AdminRules_Get", "responses": { "200": { "description": "Successful operation", "schema": { - "$ref": "#/definitions/UserRule" + "$ref": "#/definitions/BaseAdminRule" } }, "default": { @@ -582,39 +471,42 @@ } }, "x-ms-examples": { - "Gets a user rule": { - "$ref": "./examples/NetworkManagerUserRuleGet.json" + "Gets security admin rule": { + "$ref": "./examples/NetworkManagerAdminRuleGet.json" + }, + "Gets security default admin rule": { + "$ref": "./examples/NetworkManagerDefaultAdminRuleGet.json" } } }, "put": { "tags": [ - "UserRules" + "AdminRules" ], - "description": "Creates or updates a user rule.", - "operationId": "UserRules_CreateOrUpdate", + "description": "Creates or updates an admin rule.", + "operationId": "AdminRules_CreateOrUpdate", "parameters": [ { - "name": "userRule", + "name": "adminRule", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/UserRule" + "$ref": "#/definitions/BaseAdminRule" }, - "description": "The user rule to create or update" + "description": "The admin rule to create or update" } ], "responses": { "200": { "description": "Updated rule", "schema": { - "$ref": "#/definitions/UserRule" + "$ref": "#/definitions/BaseAdminRule" } }, "201": { "description": "Created rule", "schema": { - "$ref": "#/definitions/UserRule" + "$ref": "#/definitions/BaseAdminRule" } }, "default": { @@ -625,20 +517,23 @@ } }, "x-ms-examples": { - "Create a user rule": { - "$ref": "./examples/NetworkManagerUserRulePut.json" + "Create an admin rule": { + "$ref": "./examples/NetworkManagerAdminRulePut.json" + }, + "Create a default admin rule": { + "$ref": "./examples/NetworkManagerDefaultAdminRulePut.json" } } }, "delete": { "tags": [ - "UserRules" + "AdminRules" ], - "description": "Deletes a user rule.", - "operationId": "UserRules_Delete", + "description": "Deletes an admin rule.", + "operationId": "AdminRules_Delete", "responses": { "200": { - "description": "Delete Succeed." + "description": "OK" }, "204": { "description": "Request successful. Resource does not exist." @@ -651,8 +546,8 @@ } }, "x-ms-examples": { - "Delete a user rule.": { - "$ref": "./examples/NetworkManagerUserRuleDelete.json" + "Deletes an admin rule": { + "$ref": "./examples/NetworkManagerAdminRuleDelete.json" } } } @@ -677,17 +572,17 @@ "$ref": "./network.json#/definitions/ProxyResource" } ], - "description": "Defines the security Configuration" + "description": "Defines the security configuration" }, "SecurityConfigurationPropertiesFormat": { "properties": { "displayName": { "type": "string", - "description": "A display name of the security Configuration." + "description": "A display name of the security configuration." }, "description": { "type": "string", - "description": "A description of the security Configuration." + "description": "A description of the security configuration." }, "securityType": { "type": "string", @@ -702,20 +597,21 @@ } }, "deleteExistingNSGs": { - "type": "boolean", - "description": "Flag if need to delete existing network security groups." - }, - "appliesToGroups": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkManagerSecurityGroupItem" + "type": "string", + "enum": [ + "False", + "True" + ], + "x-ms-enum": { + "name": "DeleteExistingNSGs", + "modelAsString": true }, - "description": "Groups for configuration" + "description": "Flag if need to delete existing network security groups." }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the scope assignment resource." + "description": "The provisioning state of the resource." } }, "description": "Defines the security Configuration properties." @@ -734,66 +630,98 @@ "description": "Gets the URL to get the next page of results." } }, - "description": "A list of managed network security configurations" + "description": "A list of network manager security configurations" }, "AdminRuleListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/AdminRule" + "$ref": "#/definitions/BaseAdminRule" }, "description": "A list of admin rules" }, "nextLink": { "type": "string", - "description": "Gets the URL to get the next set of results." + "description": "The URL to get the next set of results." } }, - "description": "Security configuration admin rule list result." + "description": "security configuration admin rule list result." }, - "UserRuleListResult": { + "RuleCollectionListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/UserRule" + "$ref": "#/definitions/RuleCollection" }, - "description": "A list of user rules" + "description": "A list of network manager security configuration rule collections" }, "nextLink": { "type": "string", "description": "Gets the URL to get the next set of results." } }, - "description": "Security configuration user rule list result." + "description": "Security configuration rule collection list result." }, - "SecurityConfigurationRuleListResult": { + "RuleCollection": { "properties": { - "value": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/RuleCollectionPropertiesFormat", + "description": "Indicates the properties for the network manager rule collection." + }, + "systemData": { + "readOnly": true, + "description": "The system metadata related to this resource.", + "$ref": "./network.json#/definitions/SystemData" + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/ProxyResource" + } + ], + "description": "Defines the rule collection." + }, + "RuleCollectionPropertiesFormat": { + "properties": { + "displayName": { + "type": "string", + "description": "A display name of the rule collection." + }, + "description": { + "type": "string", + "description": "A description of the rule collection." + }, + "appliesToGroups": { "type": "array", "items": { - "$ref": "#/definitions/SecurityConfigurationRule" + "$ref": "#/definitions/NetworkManagerSecurityGroupItem" }, - "description": "A list of network manager security configuration rules" - }, - "failedImport": { - "$ref": "#/definitions/FailedImport", - "description": "Failed Imports." + "description": "Groups for configuration" }, - "nextLink": { - "type": "string", - "description": "Gets the URL to get the next set of results." + "provisioningState": { + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the resource." } }, - "description": "Security configuration rule list result." + "description": "Defines the rule collection properties." }, - "AdminRule": { + "BaseAdminRule": { "properties": { - "properties": { - "$ref": "#/definitions/AdminPropertiesFormat", - "x-ms-client-flatten": true, - "description": "Indicates the properties of the security admin rule" + "kind": { + "type": "string", + "description": "Whether the rule is custom or default.", + "enum": [ + "Custom", + "Default" + ], + "x-ms-enum": { + "name": "AdminRuleKind", + "modelAsString": true + } }, "systemData": { "readOnly": true, @@ -806,10 +734,29 @@ "$ref": "./network.json#/definitions/ProxyResource" } ], - "description": "Network admin rule." + "required": [ + "kind" + ], + "discriminator": "kind", + "description": "Network base admin rule." + }, + "AdminRule": { + "properties": { + "properties": { + "$ref": "#/definitions/AdminPropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security admin rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/BaseAdminRule" + } + ], + "description": "Network admin rule.", + "x-ms-discriminator-value": "Custom" }, "AdminPropertiesFormat": { - "type": "object", "properties": { "displayName": { "type": "string", @@ -817,21 +764,21 @@ }, "description": { "type": "string", - "description": "A description for this rule." + "description": "A description for this rule. Restricted to 140 chars." }, "protocol": { "type": "string", "$ref": "#/definitions/RuleProtocol", "description": "Network protocol this rule applies to." }, - "source": { + "sources": { "type": "array", "items": { "$ref": "#/definitions/AddressPrefixItem" }, "description": "The CIDR or source IP ranges." }, - "destination": { + "destinations": { "type": "array", "items": { "$ref": "#/definitions/AddressPrefixItem" @@ -861,6 +808,8 @@ "priority": { "type": "integer", "format": "int32", + "minimum": 1, + "maximum": 4096, "description": "The priority of the rule. The value can be between 1 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule." }, "direction": { @@ -870,14 +819,7 @@ "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the security Configuration resource." - }, - "appliesToGroups": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkManagerSecurityGroupItem" - }, - "description": "Groups for configuration" + "description": "The provisioning state of the resource." } }, "required": [ @@ -885,53 +827,58 @@ "access", "direction" ], - "description": "Security rule resource." + "description": "Security admin rule resource." }, - "UserRule": { + "DefaultAdminRule": { "properties": { "properties": { - "$ref": "#/definitions/UserRulePropertiesFormat", + "$ref": "#/definitions/DefaultAdminPropertiesFormat", "x-ms-client-flatten": true, - "description": "Indicates the properties of the security user rule" - }, - "systemData": { - "readOnly": true, - "description": "The system metadata related to this resource.", - "$ref": "./network.json#/definitions/SystemData" + "description": "Indicates the properties of the security admin rule" } }, "allOf": [ { - "$ref": "./network.json#/definitions/ProxyResource" + "$ref": "#/definitions/BaseAdminRule" } ], - "description": "Network security admin rule." + "description": "Network default admin rule.", + "x-ms-discriminator-value": "Default" }, - "UserRulePropertiesFormat": { + "DefaultAdminPropertiesFormat": { "type": "object", "properties": { "displayName": { "type": "string", + "readOnly": true, "description": "A friendly name for the rule." }, "description": { "type": "string", + "readOnly": true, "description": "A description for this rule. Restricted to 140 chars." }, + "flag": { + "type": "string", + "description": "Default rule flag." + }, "protocol": { "type": "string", + "readOnly": true, "$ref": "#/definitions/RuleProtocol", "description": "Network protocol this rule applies to." }, - "source": { + "sources": { "type": "array", + "readOnly": true, "items": { "$ref": "#/definitions/AddressPrefixItem" }, "description": "The CIDR or source IP ranges." }, - "destination": { + "destinations": { "type": "array", + "readOnly": true, "items": { "$ref": "#/definitions/AddressPrefixItem" }, @@ -939,6 +886,7 @@ }, "sourcePortRanges": { "type": "array", + "readOnly": true, "items": { "type": "string", "description": "The source port." @@ -947,27 +895,36 @@ }, "destinationPortRanges": { "type": "array", + "readOnly": true, "items": { "type": "string", "description": "The destination port." }, "description": "The destination port ranges." }, + "access": { + "$ref": "#/definitions/SecurityConfigurationRuleAccess", + "readOnly": true, + "description": "Indicates the access allowed for this particular rule" + }, + "priority": { + "type": "integer", + "format": "int32", + "readOnly": true, + "description": "The priority of the rule. The value can be between 1 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule." + }, "direction": { "$ref": "#/definitions/SecurityConfigurationRuleDirection", + "readOnly": true, "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the security Configuration resource." + "description": "The provisioning state of the resource." } }, - "required": [ - "protocol", - "direction" - ], - "description": "Security rule resource." + "description": "Security default admin rule resource." }, "SecurityConfigurationRuleAccess": { "type": "string", @@ -1041,108 +998,6 @@ } }, "description": "Address prefix item." - }, - "NetworkManagerSecurityConfigurationImport": { - "properties": { - "networkSecurityGroupImports": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkSecurityGroupImport" - }, - "description": "List of nsg uris." - }, - "importDenyRulesAsAdminRules": { - "type": "boolean", - "description": "Flag if import deny rules as admin rules." - }, - "adminSecurityConfigurationUri": { - "type": "string", - "description": "Admin security configuration Uri." - }, - "removeAllowVnetInboundRule": { - "type": "boolean", - "description": "Flag if need to remove allow vnet inbound rule." - }, - "removeAllowAzureLoadBalancerInboundRule": { - "type": "boolean", - "description": "Flag if need to remove allow azure load balancer inbound rule." - }, - "removeAllowVnetOutboundRule": { - "type": "boolean", - "description": "Flag if need to remove allow vnet outbound rule." - }, - "removeAllowInternetOutboundRule": { - "type": "boolean", - "description": "Flag if need to remove allow Internet outbound rule." - } - }, - "description": "Network manager security configuration import parameters." - }, - "SecurityConfigurationImportResult": { - "properties": { - "userSecurityConfiguration": { - "type": "string", - "description": "User security configuration Id." - }, - "adminSecurityConfiguration": { - "type": "string", - "description": "Admin security configuration Id." - }, - "failedImport": { - "$ref": "#/definitions/FailedImport", - "description": "failed imports code and reason" - } - }, - "description": "Security configuration import Result." - }, - "FailedImport": { - "type": "object", - "description": "Failed imports object.", - "properties": { - "failureCode": { - "type": "string", - "description": "Failure code." - }, - "failureReason": { - "type": "string", - "description": "Failure reason." - } - } - }, - "NetworkSecurityGroupImport": { - "type": "object", - "description": "Network Security Group Import.", - "properties": { - "networkSecurityGroupUri": { - "type": "string", - "description": "Network Security Group Uri." - } - } - }, - "SecurityConfigurationRule": { - "properties": { - "securityType": { - "type": "string", - "enum": [ - "AdminPolicy", - "UserPolicy" - ], - "x-ms-enum": { - "name": "SecurityType", - "modelAsString": true - }, - "description": "Commit Type." - }, - "securityAdminRule": { - "$ref": "#/definitions/AdminRule", - "description": "Security admin rule." - }, - "securityUserRule": { - "$ref": "#/definitions/UserRule", - "description": "Security user rule." - } - }, - "description": "General security configuration Rule." } }, "parameters": { @@ -1154,6 +1009,14 @@ "type": "string", "x-ms-parameter-location": "method" }, + "RuleCollectionParameter": { + "name": "ruleCollectionName", + "in": "path", + "description": "The name of the network manager security Configuration rule collection.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, "SecurityConfigurationsRuleParameter": { "name": "ruleName", "in": "path", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json new file mode 100644 index 000000000000..c951a3ff65ac --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json @@ -0,0 +1,830 @@ +{ + "swagger": "2.0", + "info": { + "title": "SecurityUserConfiguration", + "version": "2021-02-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations": { + "get": { + "tags": [ + "SecurityUserConfigurations" + ], + "operationId": "SecurityUserConfigurations_List", + "description": "Lists all the network manager security user configurations in a network manager, in a paginated format.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } + ], + "responses": { + "200": { + "description": "Get successful. The operation returns all security user configurations in the specified network manager, in a paginated format", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfigurationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List security user configurations in a network manager": { + "$ref": "./examples/NetworkManagerSecurityUserConfigurationList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + } + ], + "get": { + "tags": [ + "SecurityUserConfigurations" + ], + "description": "Retrieves a network manager security user configuration.", + "operationId": "SecurityUserConfigurations_Get", + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Get security user configurations": { + "$ref": "./examples/NetworkManagerSecurityUserConfigurationGet.json" + } + } + }, + "put": { + "tags": [ + "SecurityUserConfigurations" + ], + "description": "Creates or updates a network manager security user configuration.", + "operationId": "SecurityUserConfigurations_CreateOrUpdate", + "parameters": [ + { + "name": "securityUserConfiguration", + "in": "body", + "required": true, + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfiguration" + }, + "description": "The security user configuration to create or update" + } + ], + "responses": { + "200": { + "description": "Updated Configuration", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfiguration" + } + }, + "201": { + "description": "Created Configuration", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfiguration" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Create network manager security user configuration": { + "$ref": "./examples/NetworkManagerSecurityUserConfigurationPut.json" + } + } + }, + "delete": { + "tags": [ + "SecurityUserConfigurations" + ], + "description": "Deletes a network manager security user configuration.", + "operationId": "SecurityUserConfigurations_Delete", + "responses": { + "200": { + "description": "OK" + }, + "204": { + "description": "Request successful. Resource does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Delete network manager security user configuration": { + "$ref": "./examples/NetworkManagerSecurityUserConfigurationDelete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections": { + "get": { + "tags": [ + "UserRuleCollections" + ], + "operationId": "UserRuleCollections_List", + "description": "Lists all the user rule collections in a security configuration, in a paginated format.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } + ], + "responses": { + "200": { + "description": "Get successful. The operation returns all ruleCollections in the specified security configuration, in a paginated format", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/RuleCollectionListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List rule collections in a security configuration": { + "$ref": "./examples/NetworkManagerUserRuleCollectionList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + }, + { + "$ref": "#/parameters/RuleCollectionParameter" + } + ], + "get": { + "tags": [ + "RuleCollections" + ], + "description": "Gets a network manager security user configuration rule collection.", + "operationId": "UserRuleCollections_Get", + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/RuleCollection" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Gets security user rule collection": { + "$ref": "./examples/NetworkManagerUserRuleCollectionGet.json" + } + } + }, + "put": { + "tags": [ + "UserRuleCollections" + ], + "description": "Creates or updates a user rule collection.", + "operationId": "UserRuleCollections_CreateOrUpdate", + "parameters": [ + { + "name": "userRuleCollection", + "in": "body", + "required": true, + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/RuleCollection" + }, + "description": "The User Rule Collection to create or update" + } + ], + "responses": { + "200": { + "description": "Updated User Rule Collection", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/RuleCollection" + } + }, + "201": { + "description": "Created User Rule Collection", + "schema": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/RuleCollection" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Create or Update a User Rule Collection": { + "$ref": "./examples/NetworkManagerUserRuleCollectionPut.json" + } + } + }, + "delete": { + "tags": [ + "UserRuleCollections" + ], + "description": "Deletes a user rule collection.", + "operationId": "UserRuleCollections_Delete", + "responses": { + "200": { + "description": "OK" + }, + "204": { + "description": "Request successful. Resource does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Deletes a user rule collection": { + "$ref": "./examples/NetworkManagerUserRuleCollectionDelete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + }, + { + "$ref": "#/parameters/RuleCollectionParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } + ], + "get": { + "tags": [ + "UserRules" + ], + "description": "Lists all user rules in a rule collection.", + "operationId": "UserRules_List", + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "#/definitions/UserRuleListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List security user rules": { + "$ref": "./examples/NetworkManagerUserRulesList.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules/{ruleName}": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + }, + { + "$ref": "#/parameters/RuleCollectionParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationsRuleParameter" + } + ], + "get": { + "tags": [ + "UserRules" + ], + "description": "Gets a user rule.", + "operationId": "UserRules_Get", + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "#/definitions/BaseUserRule" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Gets a user rule": { + "$ref": "./examples/NetworkManagerUserRuleGet.json" + }, + "Gets a default user rule": { + "$ref": "./examples/NetworkManagerDefaultUserRuleGet.json" + } + } + }, + "put": { + "tags": [ + "UserRules" + ], + "description": "Creates or updates a user rule.", + "operationId": "UserRules_CreateOrUpdate", + "parameters": [ + { + "name": "userRule", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/BaseUserRule" + }, + "description": "The user rule to create or update" + } + ], + "responses": { + "200": { + "description": "Updated rule", + "schema": { + "$ref": "#/definitions/BaseUserRule" + } + }, + "201": { + "description": "Created rule", + "schema": { + "$ref": "#/definitions/BaseUserRule" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Create a user rule": { + "$ref": "./examples/NetworkManagerUserRulePut.json" + }, + "Create a default user rule": { + "$ref": "./examples/NetworkManagerDefaultUserRulePut.json" + } + } + }, + "delete": { + "tags": [ + "UserRules" + ], + "description": "Deletes a user rule.", + "operationId": "UserRules_Delete", + "responses": { + "200": { + "description": "Delete Succeed." + }, + "204": { + "description": "Request successful. Resource does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Delete a user rule": { + "$ref": "./examples/NetworkManagerUserRuleDelete.json" + } + } + } + } + }, + "definitions": { + "BaseUserRule": { + "properties": { + "kind": { + "type": "string", + "description": "Whether the rule is custom or default.", + "enum": [ + "Custom", + "Default" + ], + "x-ms-enum": { + "name": "UserRuleKind", + "modelAsString": true + } + }, + "systemData": { + "readOnly": true, + "description": "The system metadata related to this resource.", + "$ref": "./network.json#/definitions/SystemData" + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/ProxyResource" + } + ], + "required": [ + "kind" + ], + "discriminator": "kind", + "description": "Network base rule." + }, + "UserRuleListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/BaseUserRule" + }, + "description": "A list of user rules" + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of results." + } + }, + "description": "security user rule list result." + }, + "UserRule": { + "properties": { + "properties": { + "$ref": "#/definitions/UserRulePropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security user rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/BaseUserRule" + } + ], + "description": "Network security user rule.", + "x-ms-discriminator-value": "Custom" + }, + "UserRulePropertiesFormat": { + "type": "object", + "properties": { + "displayName": { + "type": "string", + "description": "A friendly name for the rule." + }, + "description": { + "type": "string", + "description": "A description for this rule." + }, + "protocol": { + "type": "string", + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/RuleProtocol", + "description": "Network protocol this rule applies to." + }, + "sources": { + "type": "array", + "items": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AddressPrefixItem" + }, + "description": "The CIDR or source IP ranges." + }, + "destinations": { + "type": "array", + "items": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AddressPrefixItem" + }, + "description": "The destination address prefixes. CIDR or destination IP ranges." + }, + "sourcePortRanges": { + "type": "array", + "items": { + "type": "string", + "description": "The source port." + }, + "description": "The source port ranges." + }, + "destinationPortRanges": { + "type": "array", + "items": { + "type": "string", + "description": "The destination port." + }, + "description": "The destination port ranges." + }, + "direction": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfigurationRuleDirection", + "description": "Indicates if the traffic matched against the rule in inbound or outbound." + }, + "provisioningState": { + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the security configuration user rule resource." + } + }, + "required": [ + "protocol", + "direction" + ], + "description": "Security rule resource." + }, + "DefaultUserRule": { + "properties": { + "properties": { + "$ref": "#/definitions/DefaultUserRulePropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security default user rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/BaseUserRule" + } + ], + "description": "Network security default user rule.", + "x-ms-discriminator-value": "Default" + }, + "DefaultUserRulePropertiesFormat": { + "type": "object", + "properties": { + "displayName": { + "type": "string", + "readOnly": true, + "description": "A friendly name for the rule." + }, + "description": { + "type": "string", + "readOnly": true, + "description": "A description for this rule. Restricted to 140 chars." + }, + "flag": { + "type": "string", + "description": "Default rule flag." + }, + "protocol": { + "type": "string", + "readOnly": true, + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/RuleProtocol", + "description": "Network protocol this rule applies to." + }, + "sources": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AddressPrefixItem" + }, + "description": "The CIDR or source IP ranges." + }, + "destinations": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AddressPrefixItem" + }, + "description": "The destination address prefixes. CIDR or destination IP ranges." + }, + "sourcePortRanges": { + "type": "array", + "readOnly": true, + "items": { + "type": "string", + "description": "The source port." + }, + "description": "The source port ranges." + }, + "destinationPortRanges": { + "type": "array", + "readOnly": true, + "items": { + "type": "string", + "description": "The destination port." + }, + "description": "The destination port ranges." + }, + "direction": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfigurationRuleDirection", + "readOnly": true, + "description": "Indicates if the traffic matched against the rule in inbound or outbound." + }, + "provisioningState": { + "readOnly": true, + "$ref": "./network.json#/definitions/ProvisioningState", + "description": "The provisioning state of the security configuration user rule resource." + } + }, + "description": "Security default user rule resource." + } + }, + "parameters": { + "SecurityConfigurationParameter": { + "name": "configurationName", + "in": "path", + "description": "The name of the network manager security Configuration.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "RuleCollectionParameter": { + "name": "ruleCollectionName", + "in": "path", + "description": "The name of the network manager security Configuration rule collection.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "SecurityConfigurationsRuleParameter": { + "name": "ruleName", + "in": "path", + "description": "The name of the rule.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "NetworkManagerNameParameter": { + "name": "networkManagerName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the network manager.", + "x-ms-parameter-location": "method" + }, + "ListTopParameter": { + "name": "$top", + "description": "An optional query parameter which specifies the maximum number of records to be returned by the server.", + "in": "query", + "required": false, + "type": "integer", + "format": "int32", + "minimum": 1, + "maximum": 20, + "x-ms-parameter-location": "method" + }, + "ListSkipTokenParameter": { + "name": "$skipToken", + "description": "SkipToken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skipToken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index 7c4d5fdc3694..bc22b5831175 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -95,63 +95,63 @@ These settings apply only when `--tag=2021-02-preview` is specified on the comma ```yaml $(tag) == 'package-2021-02-preview' input-file: - - Microsoft.Network/stable/2020-08-01/applicationGateway.json - - Microsoft.Network/stable/2020-08-01/applicationSecurityGroup.json - - Microsoft.Network/stable/2020-08-01/availableDelegations.json - - Microsoft.Network/stable/2020-08-01/availableServiceAliases.json - - Microsoft.Network/stable/2020-08-01/azureFirewall.json - - Microsoft.Network/stable/2020-08-01/azureFirewallFqdnTag.json - - Microsoft.Network/stable/2020-08-01/azureWebCategory.json - - Microsoft.Network/stable/2020-08-01/bastionHost.json - - Microsoft.Network/stable/2020-08-01/checkDnsAvailability.json - - Microsoft.Network/stable/2020-08-01/customIpPrefix.json - - Microsoft.Network/stable/2020-08-01/ddosCustomPolicy.json - - Microsoft.Network/stable/2020-08-01/ddosProtectionPlan.json - - Microsoft.Network/stable/2020-08-01/dscpConfiguration.json - - Microsoft.Network/stable/2020-08-01/endpointService.json - - Microsoft.Network/stable/2020-08-01/expressRouteCircuit.json - - Microsoft.Network/stable/2020-08-01/expressRouteCrossConnection.json - - Microsoft.Network/stable/2020-08-01/expressRoutePort.json - - Microsoft.Network/stable/2020-08-01/firewallPolicy.json - - Microsoft.Network/stable/2020-08-01/ipAllocation.json - - Microsoft.Network/stable/2020-08-01/ipGroups.json - - Microsoft.Network/stable/2020-08-01/loadBalancer.json - - Microsoft.Network/stable/2020-08-01/natGateway.json + - Microsoft.Network/stable/2020-11-01/applicationGateway.json + - Microsoft.Network/stable/2020-11-01/applicationSecurityGroup.json + - Microsoft.Network/stable/2020-11-01/availableDelegations.json + - Microsoft.Network/stable/2020-11-01/availableServiceAliases.json + - Microsoft.Network/stable/2020-11-01/azureFirewall.json + - Microsoft.Network/stable/2020-11-01/azureFirewallFqdnTag.json + - Microsoft.Network/stable/2020-11-01/azureWebCategory.json + - Microsoft.Network/stable/2020-11-01/bastionHost.json + - Microsoft.Network/stable/2020-11-01/checkDnsAvailability.json + - Microsoft.Network/stable/2020-11-01/cloudServiceNetworkInterface.json + - Microsoft.Network/stable/2020-11-01/cloudServicePublicIpAddress.json + - Microsoft.Network/stable/2020-11-01/customIpPrefix.json + - Microsoft.Network/stable/2020-11-01/ddosCustomPolicy.json + - Microsoft.Network/stable/2020-11-01/ddosProtectionPlan.json + - Microsoft.Network/stable/2020-11-01/dscpConfiguration.json + - Microsoft.Network/stable/2020-11-01/endpointService.json + - Microsoft.Network/stable/2020-11-01/expressRouteCircuit.json + - Microsoft.Network/stable/2020-11-01/expressRouteCrossConnection.json + - Microsoft.Network/stable/2020-11-01/expressRoutePort.json + - Microsoft.Network/stable/2020-11-01/firewallPolicy.json + - Microsoft.Network/stable/2020-11-01/ipAllocation.json + - Microsoft.Network/stable/2020-11-01/ipGroups.json + - Microsoft.Network/stable/2020-11-01/loadBalancer.json + - Microsoft.Network/stable/2020-11-01/natGateway.json - Microsoft.Network/preview/2021-02-01-preview/network.json - - Microsoft.Network/stable/2020-08-01/networkInterface.json + - Microsoft.Network/stable/2020-11-01/networkInterface.json - Microsoft.Network/preview/2021-02-01-preview/networkManager.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json - - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityConfiguration.json - - Microsoft.Network/stable/2020-08-01/networkProfile.json - - Microsoft.Network/stable/2020-08-01/networkSecurityGroup.json - - Microsoft.Network/stable/2020-08-01/networkVirtualAppliance.json - - Microsoft.Network/stable/2020-08-01/networkWatcher.json - - Microsoft.Network/stable/2020-08-01/operation.json - - Microsoft.Network/stable/2020-08-01/privateEndpoint.json - - Microsoft.Network/stable/2020-08-01/privateLinkService.json - - Microsoft.Network/stable/2020-08-01/publicIpAddress.json - - Microsoft.Network/stable/2020-08-01/publicIpPrefix.json - - Microsoft.Network/stable/2020-08-01/routeFilter.json - - Microsoft.Network/stable/2020-08-01/routeTable.json - - Microsoft.Network/stable/2020-08-01/securityPartnerProvider.json - - Microsoft.Network/stable/2020-08-01/serviceCommunity.json - - Microsoft.Network/stable/2020-08-01/serviceEndpointPolicy.json - - Microsoft.Network/stable/2020-08-01/serviceTags.json - - Microsoft.Network/stable/2020-08-01/usage.json - - Microsoft.Network/stable/2020-08-01/virtualNetwork.json - - Microsoft.Network/stable/2020-08-01/virtualNetworkGateway.json - - Microsoft.Network/stable/2020-08-01/virtualNetworkTap.json - - Microsoft.Network/stable/2020-08-01/virtualRouter.json - - Microsoft.Network/stable/2020-08-01/virtualWan.json - - Microsoft.Network/stable/2020-08-01/vmssNetworkInterface.json - - Microsoft.Network/stable/2020-08-01/vmssPublicIpAddress.json - - Microsoft.Network/stable/2020-08-01/webapplicationfirewall.json - - Microsoft.Network/stable/2020-08-01/cloudServiceNetworkInterface.json - - Microsoft.Network/stable/2020-08-01/cloudServicePublicIpAddress.json - + - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json + - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json + - Microsoft.Network/stable/2020-11-01/networkProfile.json + - Microsoft.Network/stable/2020-11-01/networkSecurityGroup.json + - Microsoft.Network/stable/2020-11-01/networkVirtualAppliance.json + - Microsoft.Network/stable/2020-11-01/networkWatcher.json + - Microsoft.Network/stable/2020-11-01/operation.json + - Microsoft.Network/stable/2020-11-01/privateEndpoint.json + - Microsoft.Network/stable/2020-11-01/privateLinkService.json + - Microsoft.Network/stable/2020-11-01/publicIpAddress.json + - Microsoft.Network/stable/2020-11-01/publicIpPrefix.json + - Microsoft.Network/stable/2020-11-01/routeFilter.json + - Microsoft.Network/stable/2020-11-01/routeTable.json + - Microsoft.Network/stable/2020-11-01/securityPartnerProvider.json + - Microsoft.Network/stable/2020-11-01/serviceCommunity.json + - Microsoft.Network/stable/2020-11-01/serviceEndpointPolicy.json + - Microsoft.Network/stable/2020-11-01/serviceTags.json + - Microsoft.Network/stable/2020-11-01/usage.json + - Microsoft.Network/stable/2020-11-01/virtualNetwork.json + - Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json + - Microsoft.Network/stable/2020-11-01/virtualNetworkTap.json + - Microsoft.Network/stable/2020-11-01/virtualRouter.json + - Microsoft.Network/stable/2020-11-01/virtualWan.json + - Microsoft.Network/stable/2020-11-01/vmssNetworkInterface.json + - Microsoft.Network/stable/2020-11-01/vmssPublicIpAddress.json + - Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json ``` ### Tag: package-2020-08 @@ -1663,7 +1663,10 @@ directive: from: networkManagerConnectivityConfiguration.json reason: name, id and type properties are inherited from the upper level - suppress: RequiredPropertiesMissingInResourceModel - from: networkManagerSecurityConfiguration.json + from: networkManagerSecurityUserConfiguration.json + reason: name, id and type properties are inherited from the upper level + - suppress: RequiredPropertiesMissingInResourceModel + from: networkManagerSecurityAdminConfiguration.json reason: name, id and type properties are inherited from the upper level - suppress: RequiredPropertiesMissingInResourceModel from: networkManager.json