From b49caabeacecce6ddc7e357dd7d758bd9fd82dbc Mon Sep 17 00:00:00 2001 From: gimotwanMSFT <36463144+gimotwanMSFT@users.noreply.github.com> Date: Tue, 21 Apr 2020 19:47:06 -0700 Subject: [PATCH] Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup (#9045) * Rename firewall policy sub resources s/RuleGroup/RuleCollectionGroup s/Rule/RuleCollection s/RuleCondition/Rule This was based on customer feedback - the feature is currently in preview. * rename files * Update examples with new names for the subresource and children * Fix model validation error * Update examples --- .../examples/FirewallPolicyGet.json | 4 +- .../FirewallPolicyListByResourceGroup.json | 4 +- .../FirewallPolicyListBySubscription.json | 4 +- .../examples/FirewallPolicyPut.json | 12 +- ...ewallPolicyRuleCollectionGroupDelete.json} | 2 +- ...FirewallPolicyRuleCollectionGroupGet.json} | 18 +- ...irewallPolicyRuleCollectionGroupList.json} | 18 +- ...FirewallPolicyRuleCollectionGroupPut.json} | 42 +-- ...cyRuleCollectionGroupWithIpGroupsGet.json} | 14 +- ...yRuleCollectionGroupWithIpGroupsList.json} | 18 +- ...cyRuleCollectionGroupWithIpGroupsPut.json} | 42 +-- .../stable/2020-04-01/firewallPolicy.json | 280 +++++++++--------- 12 files changed, 229 insertions(+), 229 deletions(-) rename specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/{FirewallPolicyRuleGroupDelete.json => FirewallPolicyRuleCollectionGroupDelete.json} (80%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/{FirewallPolicyRuleGroupGet.json => FirewallPolicyRuleCollectionGroupGet.json} (68%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/{FirewallPolicyRuleGroupList.json => FirewallPolicyRuleCollectionGroupList.json} (70%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/{FirewallPolicyRuleGroupPut.json => FirewallPolicyRuleCollectionGroupPut.json} (70%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/{FirewallPolicyRuleGroupWithIpGroupsGet.json => FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json} (79%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/{FirewallPolicyRuleGroupWithIpGroupsList.json => FirewallPolicyRuleCollectionGroupWithIpGroupsList.json} (72%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/{FirewallPolicyRuleGroupWithIpGroupsPut.json => FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json} (74%) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.json index dfc7460b17e1..e2698ffc55b0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.json @@ -19,9 +19,9 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "ruleGroups": [ + "ruleCollectionGroups": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" } ], "firewalls": [] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListByResourceGroup.json index 2e88afffbc7e..b32ddff27384 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListByResourceGroup.json @@ -20,9 +20,9 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "ruleGroups": [ + "ruleCollectionGroups": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" } ], "firewalls": [] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListBySubscription.json index 029a12c66d91..60fa317dacd1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListBySubscription.json @@ -19,9 +19,9 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "ruleGroups": [ + "ruleCollectionGroups": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" } ], "firewalls": [] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyPut.json index 9216f005e67a..516e4f0c3860 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyPut.json @@ -28,12 +28,12 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "ruleGroups": [ + "ruleCollectionGroups": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup1" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" }, { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2" } ], "firewalls": [] @@ -53,12 +53,12 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "ruleGroups": [ + "ruleCollectionGroups": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" }, { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2" } ], "firewalls": [] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupDelete.json similarity index 80% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupDelete.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupDelete.json index bb6ea2861c79..f7c817358ced 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupDelete.json @@ -1,6 +1,6 @@ { "parameters": { - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleCollectionGroup1", "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", "api-version": "2020-04-01", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupGet.json similarity index 68% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupGet.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupGet.json index 20ff78afa014..641fcb0d40e6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupGet.json @@ -1,6 +1,6 @@ { "parameters": { - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleCollectionGroup1", "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", "api-version": "2020-04-01", @@ -9,24 +9,24 @@ "responses": { "200": { "body": { - "name": "ruleGroup1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1", + "name": "ruleCollectionGroup1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "priority": 200, "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-rule1", "sourceAddresses": [ "10.1.25.0/24" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupList.json similarity index 70% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupList.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupList.json index 77387a16a419..297c0caec9b7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupList.json @@ -10,25 +10,25 @@ "body": { "value": [ { - "name": "ruleGroup1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1", + "name": "ruleCollectionGroup1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "name": "Example-Filter-Rule", - "ruleType": "FirewallPolicyFilterRule", + "name": "Example-Filter-Rule-Collection", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", "priority": 120, "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "name": "network-condition-1", - "ruleConditionType": "NetworkRuleCondition", - "description": "Network rule condition", + "name": "network-rule-1", + "ruleType": "NetworkRule", + "description": "Network rule", "destinationAddresses": [ "*" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupPut.json similarity index 70% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupPut.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupPut.json index 80255afbeb05..4727483aec80 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupPut.json @@ -4,21 +4,21 @@ "subscriptionId": "subid", "resourceGroupName": "rg1", "firewallPolicyName": "firewallPolicy", - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleCollectionGroup1", "parameters": { "properties": { "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-rule1", "sourceAddresses": [ "10.1.25.0/24" ], @@ -41,23 +41,23 @@ "responses": { "200": { "body": { - "name": "ruleGroup1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1", + "name": "ruleCollectionGroup1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-rule1", "sourceAddresses": [ "10.1.25.0/24" ], @@ -85,17 +85,17 @@ "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-rule1", "sourceAddresses": [ "10.1.25.0/24" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json similarity index 79% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsGet.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json index 804922700943..bf1af7d5fa48 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json @@ -1,6 +1,6 @@ { "parameters": { - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleGroup1", "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", "api-version": "2020-04-01", @@ -15,18 +15,18 @@ "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "priority": 200, "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-rule1", "ipProtocols": [ "TCP" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json similarity index 72% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsList.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json index 37ab5e2c100f..a01864a7b8a7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json @@ -10,25 +10,25 @@ "body": { "value": [ { - "name": "ruleGroup1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1", + "name": "ruleCollectionGroup1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"", "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "name": "Example-Filter-Rule", - "ruleType": "FirewallPolicyFilterRule", + "name": "Example-Filter-Rule-Collection", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", "priority": 120, "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "name": "network-condition-1", - "ruleConditionType": "NetworkRuleCondition", - "description": "Network rule condition", + "name": "network-rule-1", + "ruleType": "NetworkRule", + "description": "Network rule", "sourceIpGroups": [ "/subscriptions/subid/providers/Microsoft.Network/resourceGroup/rg1/ipGroups/ipGroups1" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json similarity index 74% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsPut.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json index 0b0bc9744e71..147aa03eddb3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleGroupWithIpGroupsPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json @@ -4,21 +4,21 @@ "subscriptionId": "subid", "resourceGroupName": "rg1", "firewallPolicyName": "firewallPolicy", - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleCollectionGroup1", "parameters": { "properties": { "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-1", "ipProtocols": [ "TCP" ], @@ -41,23 +41,23 @@ "responses": { "200": { "body": { - "name": "ruleGroup1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1", + "name": "ruleCollectionGroup1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1", "etag": "w/\\00000000-0000-0000-0000-000000000000\\", "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-1", "ipProtocols": [ "TCP" ], @@ -85,17 +85,17 @@ "properties": { "provisioningState": "Succeeded", "priority": 110, - "rules": [ + "ruleCollections": [ { - "ruleType": "FirewallPolicyFilterRule", - "name": "Example-Filter-Rule", + "ruleCollectionType": "FirewallPolicyFilterRuleCollection", + "name": "Example-Filter-Rule-Collection", "action": { "type": "Deny" }, - "ruleConditions": [ + "rules": [ { - "ruleConditionType": "NetworkRuleCondition", - "name": "network-condition1", + "ruleType": "NetworkRule", + "name": "network-1", "ipProtocols": [ "TCP" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json index 6faff10f69c4..2d58fc8e2b3b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json @@ -298,13 +298,13 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups/{ruleGroupName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleCollectionGroups/{ruleCollectionGroupName}": { "delete": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_Delete", - "description": "Deletes the specified FirewallPolicyRuleGroup.", + "operationId": "FirewallPolicyRuleCollectionGroups_Delete", + "description": "Deletes the specified FirewallPolicyRuleCollectionGroup.", "parameters": [ { "name": "resourceGroupName", @@ -321,11 +321,11 @@ "description": "The name of the Firewall Policy." }, { - "name": "ruleGroupName", + "name": "ruleCollectionGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the FirewallPolicyRuleGroup." + "description": "The name of the FirewallPolicyRuleCollectionGroup." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -352,8 +352,8 @@ } }, "x-ms-examples": { - "Delete FirewallPolicyRuleGroup": { - "$ref": "./examples/FirewallPolicyRuleGroupDelete.json" + "Delete FirewallPolicyRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupDelete.json" } }, "x-ms-long-running-operation": true, @@ -363,10 +363,10 @@ }, "get": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_Get", - "description": "Gets the specified FirewallPolicyRuleGroup.", + "operationId": "FirewallPolicyRuleCollectionGroups_Get", + "description": "Gets the specified FirewallPolicyRuleCollectionGroup.", "parameters": [ { "name": "resourceGroupName", @@ -383,11 +383,11 @@ "description": "The name of the Firewall Policy." }, { - "name": "ruleGroupName", + "name": "ruleCollectionGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the FirewallPolicyRuleGroup." + "description": "The name of the FirewallPolicyRuleCollectionGroup." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -398,9 +398,9 @@ ], "responses": { "200": { - "description": "Request successful. The operation returns a FirewallPolicyRuleGroup resource.", + "description": "Request successful. The operation returns a FirewallPolicyRuleCollectionGroup resource.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" } }, "default": { @@ -411,20 +411,20 @@ } }, "x-ms-examples": { - "Get FirewallPolicyRuleGroup": { - "$ref": "./examples/FirewallPolicyRuleGroupGet.json" + "Get FirewallPolicyRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupGet.json" }, - "Get FirewallPolicyRuleGroup With IpGroups": { - "$ref": "./examples/FirewallPolicyRuleGroupWithIpGroupsGet.json" + "Get FirewallPolicyRuleCollectionGroup With IpGroups": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json" } } }, "put": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_CreateOrUpdate", - "description": "Creates or updates the specified FirewallPolicyRuleGroup.", + "operationId": "FirewallPolicyRuleCollectionGroups_CreateOrUpdate", + "description": "Creates or updates the specified FirewallPolicyRuleCollectionGroup.", "parameters": [ { "name": "resourceGroupName", @@ -441,20 +441,20 @@ "description": "The name of the Firewall Policy." }, { - "name": "ruleGroupName", + "name": "ruleCollectionGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the FirewallPolicyRuleGroup." + "description": "The name of the FirewallPolicyRuleCollectionGroup." }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" }, - "description": "Parameters supplied to the create or update FirewallPolicyRuleGroup operation." + "description": "Parameters supplied to the create or update FirewallPolicyRuleCollectionGroup operation." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -465,15 +465,15 @@ ], "responses": { "201": { - "description": "Request received successfully. The operation returns the resulting FirewallPolicyRuleGroup resource.", + "description": "Request received successfully. The operation returns the resulting FirewallPolicyRuleCollectionGroup resource.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" } }, "200": { - "description": "Request successful. The operation returns the resulting FirewallPolicyRuleGroup resource.", + "description": "Request successful. The operation returns the resulting FirewallPolicyRuleCollectionGroup resource.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" } }, "default": { @@ -484,11 +484,11 @@ } }, "x-ms-examples": { - "Create FirewallPolicyRuleGroup": { - "$ref": "./examples/FirewallPolicyRuleGroupPut.json" + "Create FirewallPolicyRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupPut.json" }, - "Create FirewallPolicyRuleGroup With IpGroups": { - "$ref": "./examples/FirewallPolicyRuleGroupWithIpGroupsPut.json" + "Create FirewallPolicyRuleCollectionGroup With IpGroups": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json" } }, "x-ms-long-running-operation": true, @@ -497,13 +497,13 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleCollectionGroups": { "get": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_List", - "description": "Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.", + "operationId": "FirewallPolicyRuleCollectionGroups_List", + "description": "Lists all FirewallPolicyRuleCollectionGroups in a FirewallPolicy resource.", "parameters": [ { "name": "resourceGroupName", @@ -528,9 +528,9 @@ ], "responses": { "200": { - "description": "Success. The operation returns a list of FirewallPolicyRuleGroup resources.", + "description": "Success. The operation returns a list of FirewallPolicyRuleCollectionGroup resources.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroupListResult" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroupListResult" } }, "default": { @@ -541,11 +541,11 @@ } }, "x-ms-examples": { - "List all FirewallPolicyRuleGroups for a given FirewallPolicy": { - "$ref": "./examples/FirewallPolicyRuleGroupList.json" + "List all FirewallPolicyRuleCollectionGroups for a given FirewallPolicy": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupList.json" }, - "List all FirewallPolicyRuleGroups with IpGroups for a given FirewallPolicy": { - "$ref": "./examples/FirewallPolicyRuleGroupWithIpGroupsList.json" + "List all FirewallPolicyRuleCollectionGroups with IpGroups for a given FirewallPolicy": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json" } }, "x-ms-pageable": { @@ -577,10 +577,10 @@ }, "FirewallPolicyPropertiesFormat": { "properties": { - "ruleGroups": { + "ruleCollectionGroups": { "type": "array", "readOnly": true, - "description": "List of references to FirewallPolicyRuleGroups.", + "description": "List of references to FirewallPolicyRuleCollectionGroups.", "items": { "$ref": "./network.json#/definitions/SubResource" } @@ -622,12 +622,12 @@ }, "description": "Firewall Policy definition." }, - "FirewallPolicyRuleGroup": { + "FirewallPolicyRuleCollectionGroup": { "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/FirewallPolicyRuleGroupProperties", - "description": "The properties of the firewall policy rule group." + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroupProperties", + "description": "The properties of the firewall policy rule collection group." }, "name": { "type": "string", @@ -649,9 +649,9 @@ "$ref": "./network.json#/definitions/SubResource" } ], - "description": "Rule Group resource." + "description": "Rule Collection Group resource." }, - "FirewallPolicyRuleGroupProperties": { + "FirewallPolicyRuleCollectionGroupProperties": { "properties": { "priority": { "type": "integer", @@ -660,45 +660,45 @@ "exclusiveMaximum": false, "minimum": 100, "exclusiveMinimum": false, - "description": "Priority of the Firewall Policy Rule Group resource." + "description": "Priority of the Firewall Policy Rule Collection Group resource." }, - "rules": { + "ruleCollections": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRule" + "$ref": "#/definitions/FirewallPolicyRuleCollection" }, - "description": "Group of Firewall Policy rules." + "description": "Group of Firewall Policy rule collections." }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the firewall policy rule group resource." + "description": "The provisioning state of the firewall policy rule collection group resource." } }, - "description": "Properties of the rule group." + "description": "Properties of the rule collection group." }, - "FirewallPolicyRule": { - "description": "Properties of the rule.", - "discriminator": "ruleType", + "FirewallPolicyRuleCollection": { + "description": "Properties of the rule collection.", + "discriminator": "ruleCollectionType", "required": [ - "ruleType" + "ruleCollectionType" ], "properties": { - "ruleType": { + "ruleCollectionType": { "type": "string", - "description": "The type of the rule.", + "description": "The type of the rule collection.", "enum": [ - "FirewallPolicyNatRule", - "FirewallPolicyFilterRule" + "FirewallPolicyNatRuleCollection", + "FirewallPolicyFilterRuleCollection" ], "x-ms-enum": { - "name": "FirewallPolicyRuleType", + "name": "FirewallPolicyRuleCollectionType", "modelAsString": true } }, "name": { "type": "string", - "description": "The name of the rule." + "description": "The name of the rule collection." }, "priority": { "type": "integer", @@ -707,94 +707,94 @@ "exclusiveMaximum": false, "minimum": 100, "exclusiveMinimum": false, - "description": "Priority of the Firewall Policy Rule resource." + "description": "Priority of the Firewall Policy Rule Collection resource." } } }, - "FirewallPolicyNatRule": { + "FirewallPolicyNatRuleCollection": { "properties": { "action": { - "$ref": "#/definitions/FirewallPolicyNatRuleAction", - "description": "The action type of a Nat rule." + "$ref": "#/definitions/FirewallPolicyNatRuleCollectionAction", + "description": "The action type of a Nat rule collection." }, "translatedAddress": { "type": "string", - "description": "The translated address for this NAT rule." + "description": "The translated address for this NAT rule collection." }, "translatedPort": { "type": "string", - "description": "The translated port for this NAT rule." + "description": "The translated port for this NAT rule collection." }, - "ruleCondition": { - "$ref": "#/definitions/FirewallPolicyRuleCondition", - "description": "The match conditions for incoming traffic." + "rule": { + "$ref": "#/definitions/FirewallPolicyRule", + "description": "The match rule for incoming traffic." } }, "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRule" + "$ref": "#/definitions/FirewallPolicyRuleCollection" } ], - "x-ms-discriminator-value": "FirewallPolicyNatRule", - "description": "Firewall Policy NAT Rule." + "x-ms-discriminator-value": "FirewallPolicyNatRuleCollection", + "description": "Firewall Policy NAT Rule Collection." }, - "FirewallPolicyFilterRule": { + "FirewallPolicyFilterRuleCollection": { "properties": { "action": { - "$ref": "#/definitions/FirewallPolicyFilterRuleAction", - "description": "The action type of a Filter rule." + "$ref": "#/definitions/FirewallPolicyFilterRuleCollectionAction", + "description": "The action type of a Filter rule collection." }, - "ruleConditions": { + "rules": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" }, - "description": "Collection of rule conditions used by a rule." + "description": "List of rules included in a rule collection." } }, "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRule" + "$ref": "#/definitions/FirewallPolicyRuleCollection" } ], - "x-ms-discriminator-value": "FirewallPolicyFilterRule", - "description": "Firewall Policy Filter Rule." + "x-ms-discriminator-value": "FirewallPolicyFilterRuleCollection", + "description": "Firewall Policy Filter Rule Collection." }, - "FirewallPolicyRuleCondition": { + "FirewallPolicyRule": { "description": "Properties of a rule.", - "discriminator": "ruleConditionType", + "discriminator": "ruleType", "required": [ - "ruleConditionType" + "ruleType" ], "properties": { "name": { "type": "string", - "description": "Name of the rule condition." + "description": "Name of the rule." }, "description": { "type": "string", - "description": "Description of the rule condition." + "description": "Description of the rule." }, - "ruleConditionType": { + "ruleType": { "type": "string", - "description": "Rule Condition Type.", + "description": "Rule Type.", "enum": [ - "ApplicationRuleCondition", - "NetworkRuleCondition", - "NatRuleCondition" + "ApplicationRule", + "NetworkRule", + "NatRule" ], "x-ms-enum": { - "name": "FirewallPolicyRuleConditionType", + "name": "FirewallPolicyRuleType", "modelAsString": true } } } }, - "ApplicationRuleCondition": { - "x-ms-discriminator-value": "ApplicationRuleCondition", + "ApplicationRule": { + "x-ms-discriminator-value": "ApplicationRule", "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" } ], "properties": { @@ -815,20 +815,20 @@ "protocols": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleConditionApplicationProtocol" + "$ref": "#/definitions/FirewallPolicyRuleApplicationProtocol" }, "description": "Array of Application Protocols." }, "targetFqdns": { "type": "array", - "description": "List of FQDNs for this rule condition.", + "description": "List of FQDNs for this rule.", "items": { "type": "string" } }, "fqdnTags": { "type": "array", - "description": "List of FQDN Tags for this rule condition.", + "description": "List of FQDN Tags for this rule.", "items": { "type": "string" } @@ -841,23 +841,23 @@ } } }, - "description": "Rule condition of type application." + "description": "Rule of type application." }, - "NatRuleCondition": { - "description": "Rule condition of type nat.", - "x-ms-discriminator-value": "NatRuleCondition", + "NatRule": { + "description": "Rule of type nat.", + "x-ms-discriminator-value": "NatRule", "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" } ], "properties": { "ipProtocols": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleConditionNetworkProtocol" + "$ref": "#/definitions/FirewallPolicyRuleNetworkProtocol" }, - "description": "Array of FirewallPolicyRuleConditionNetworkProtocols." + "description": "Array of FirewallPolicyRuleNetworkProtocols." }, "sourceAddresses": { "type": "array", @@ -889,21 +889,21 @@ } } }, - "NetworkRuleCondition": { - "description": "Rule condition of type network.", - "x-ms-discriminator-value": "NetworkRuleCondition", + "NetworkRule": { + "description": "Rule of type network.", + "x-ms-discriminator-value": "NetworkRule", "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" } ], "properties": { "ipProtocols": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleConditionNetworkProtocol" + "$ref": "#/definitions/FirewallPolicyRuleNetworkProtocol" }, - "description": "Array of FirewallPolicyRuleConditionNetworkProtocols." + "description": "Array of FirewallPolicyRuleNetworkProtocols." }, "sourceAddresses": { "type": "array", @@ -942,11 +942,11 @@ } } }, - "FirewallPolicyRuleConditionApplicationProtocol": { + "FirewallPolicyRuleApplicationProtocol": { "properties": { "protocolType": { "description": "Protocol type.", - "$ref": "#/definitions/FirewallPolicyRuleConditionApplicationProtocolType" + "$ref": "#/definitions/FirewallPolicyRuleApplicationProtocolType" }, "port": { "type": "integer", @@ -960,39 +960,39 @@ }, "description": "Properties of the application rule protocol." }, - "FirewallPolicyRuleConditionApplicationProtocolType": { + "FirewallPolicyRuleApplicationProtocolType": { "type": "string", - "description": "The application protocol type of a Rule condition.", + "description": "The application protocol type of a Rule.", "enum": [ "Http", "Https" ], "x-ms-enum": { - "name": "FirewallPolicyRuleConditionApplicationProtocolType", + "name": "FirewallPolicyRuleApplicationProtocolType", "modelAsString": true } }, - "FirewallPolicyNatRuleActionType": { + "FirewallPolicyNatRuleCollectionActionType": { "type": "string", "description": "The action type of a rule.", "enum": [ "DNAT" ], "x-ms-enum": { - "name": "FirewallPolicyNatRuleActionType", + "name": "FirewallPolicyNatRuleCollectionActionType", "modelAsString": true } }, - "FirewallPolicyNatRuleAction": { + "FirewallPolicyNatRuleCollectionAction": { "properties": { "type": { "description": "The type of action.", - "$ref": "#/definitions/FirewallPolicyNatRuleActionType" + "$ref": "#/definitions/FirewallPolicyNatRuleCollectionActionType" } }, - "description": "Properties of the FirewallPolicyNatRuleAction." + "description": "Properties of the FirewallPolicyNatRuleCollectionAction." }, - "FirewallPolicyFilterRuleActionType": { + "FirewallPolicyFilterRuleCollectionActionType": { "type": "string", "description": "The action type of a rule.", "enum": [ @@ -1000,22 +1000,22 @@ "Deny" ], "x-ms-enum": { - "name": "FirewallPolicyFilterRuleActionType", + "name": "FirewallPolicyFilterRuleCollectionActionType", "modelAsString": true } }, - "FirewallPolicyFilterRuleAction": { + "FirewallPolicyFilterRuleCollectionAction": { "properties": { "type": { "description": "The type of action.", - "$ref": "#/definitions/FirewallPolicyFilterRuleActionType" + "$ref": "#/definitions/FirewallPolicyFilterRuleCollectionActionType" } }, - "description": "Properties of the FirewallPolicyFilterRuleAction." + "description": "Properties of the FirewallPolicyFilterRuleCollectionAction." }, - "FirewallPolicyRuleConditionNetworkProtocol": { + "FirewallPolicyRuleNetworkProtocol": { "type": "string", - "description": "The Network protocol of a Rule condition.", + "description": "The Network protocol of a Rule.", "enum": [ "TCP", "UDP", @@ -1023,7 +1023,7 @@ "ICMP" ], "x-ms-enum": { - "name": "FirewallPolicyRuleConditionNetworkProtocol", + "name": "FirewallPolicyRuleNetworkProtocol", "modelAsString": true } }, @@ -1043,21 +1043,21 @@ }, "description": "Response for ListFirewallPolicies API service call." }, - "FirewallPolicyRuleGroupListResult": { + "FirewallPolicyRuleCollectionGroupListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" }, - "description": "List of FirewallPolicyRuleGroups in a FirewallPolicy." + "description": "List of FirewallPolicyRuleCollectionGroups in a FirewallPolicy." }, "nextLink": { "type": "string", "description": "URL to get the next set of results." } }, - "description": "Response for ListFirewallPolicyRuleGroups API service call." + "description": "Response for ListFirewallPolicyRuleCollectionGroups API service call." }, "FirewallPolicyIntrusionSystemMode": { "type": "string",