Skip to content

Commit

Permalink
Merge branch 'network-july-release' of https://github.com/Azure/azure…
Browse files Browse the repository at this point in the history
…-rest-api-specs into network-july-release
  • Loading branch information
Hari Prasad Perabattula committed Oct 8, 2020
2 parents 45d6381 + 8075566 commit bf18c36
Show file tree
Hide file tree
Showing 18 changed files with 296 additions and 68 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"authorizationKey": "authorizationKey",
"routingWeight": 2,
"enableInternetSecurity": false,
"expressRouteGatewayBypass": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"authorizationKey": "authorizationKey",
"routingWeight": 1,
"enableInternetSecurity": false,
"expressRouteGatewayBypass": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"authorizationKey": "authorizationKey",
"routingWeight": 1,
"enableInternetSecurity": false,
"expressRouteGatewayBypass": false,
"routingConfiguration": {
"associatedRouteTable": {
"id": "/subscriptions/subid/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualHubs/hub1/hubRouteTables/hubRouteTable1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
"enableProxy": true,
"requireProxyForNetworkRules": false
},
"sku": {
"tier": "Premium"
},
"intrusionDetection": {
"mode": "Alert",
"configuration": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,38 +33,8 @@
"enableProxy": true,
"requireProxyForNetworkRules": false
},
"intrusionDetection": {
"mode": "Alert",
"configuration": {
"signatureOverrides": [
{
"id": "2525004",
"mode": "Deny"
}
],
"bypassTrafficSettings": [
{
"name": "bypassRule1",
"description": "Rule 1",
"protocol": "TCP",
"sourceAddresses": [
"1.2.3.4"
],
"destinationAddresses": [
"5.6.7.8"
],
"destinationPorts": [
"*"
]
}
]
}
},
"transportSecurity": {
"certificateAuthority": {
"name": "clientcert",
"keyVaultSecretId": "https://kv/secret"
}
"sku": {
"tier": "Standard"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,38 +32,8 @@
"enableProxy": true,
"requireProxyForNetworkRules": false
},
"intrusionDetection": {
"mode": "Alert",
"configuration": {
"signatureOverrides": [
{
"id": "2525004",
"mode": "Deny"
}
],
"bypassTrafficSettings": [
{
"name": "bypassRule1",
"description": "Rule 1",
"protocol": "TCP",
"sourceAddresses": [
"1.2.3.4"
],
"destinationAddresses": [
"5.6.7.8"
],
"destinationPorts": [
"*"
]
}
]
}
},
"transportSecurity": {
"certificateAuthority": {
"name": "clientcert",
"keyVaultSecretId": "https://kv/secret"
}
"sku": {
"tier": "Standard"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"ruleCollectionGroupName": "ruleCollectionGroup1",
"firewallPolicyName": "firewallPolicy",
"resourceGroupName": "rg1",
"api-version": "2020-07-01",
"subscriptionId": "subid"
},
"responses": {
"200": {
"body": {
"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": 100,
"ruleCollections": [
{
"ruleCollectionType": "FirewallPolicyNatRuleCollection",
"action": {
"type": "DNAT"
},
"rules": [
{
"ruleType": "NatRule",
"name": "NatRule1",
"translatedFqdn": "internalhttpserver",
"translatedPort": "8080",
"ipProtocols": [
"TCP",
"UDP"
],
"sourceAddresses": [
"2.2.2.2"
],
"sourceIpGroups": [],
"destinationAddresses": [
"152.23.32.23"
],
"destinationPorts": [
"8080"
]
}
],
"name": "NatRC",
"priority": 100
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"parameters": {
"api-version": "2020-07-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"firewallPolicyName": "firewallPolicy",
"ruleCollectionGroupName": "ruleCollectionGroup1",
"parameters": {
"properties": {
"priority": 100,
"ruleCollections": [
{
"ruleCollectionType": "FirewallPolicyNatRuleCollection",
"priority": 100,
"name": "Example-Nat-Rule-Collection",
"action": {
"type": "DNAT"
},
"rules": [
{
"ruleType": "NatRule",
"name": "nat-rule1",
"translatedFqdn": "internalhttp.server.net",
"translatedPort": "8080",
"ipProtocols": [
"TCP",
"UDP"
],
"sourceAddresses": [
"2.2.2.2"
],
"sourceIpGroups": [],
"destinationAddresses": [
"152.23.32.23"
],
"destinationPorts": [
"8080"
]
}
]
}
]
}
}
},
"responses": {
"200": {
"body": {
"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": 100,
"ruleCollections": [
{
"ruleCollectionType": "FirewallPolicyNatRuleCollection",
"name": "Example-Nat-Rule-Collection",
"priority": 100,
"action": {
"type": "DNAT"
},
"rules": [
{
"ruleType": "NatRule",
"name": "nat-rule1",
"translatedFqdn": "internalhttp.server.net",
"translatedPort": "8080",
"ipProtocols": [
"TCP",
"UDP"
],
"sourceAddresses": [
"2.2.2.2"
],
"sourceIpGroups": [],
"destinationAddresses": [
"152.23.32.23"
],
"destinationPorts": [
"8080"
]
}
]
}
]
}
}
},
"201": {
"body": {
"name": "firewallPolicy",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"ruleCollections": [
{
"ruleCollectionType": "FirewallPolicyNatRuleCollection",
"name": "Example-Nat-Rule-Collection",
"priority": 100,
"action": {
"type": "DNAT"
},
"rules": [
{
"ruleType": "NatRule",
"name": "nat-rule1",
"translatedFqdn": "internalhttp.server.net",
"translatedPort": "8080",
"ipProtocols": [
"TCP",
"UDP"
],
"sourceAddresses": [
"2.2.2.2"
],
"sourceIpGroups": [],
"destinationAddresses": [
"152.23.32.23"
],
"destinationPorts": [
"8080"
]
}
]
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"enableProxy": true,
"requireProxyForNetworkRules": false
},
"sku": {
"tier": "Premium"
},
"intrusionDetection": {
"mode": "Alert",
"configuration": {
Expand Down Expand Up @@ -100,6 +103,9 @@
"enableProxy": true,
"requireProxyForNetworkRules": false
},
"sku": {
"tier": "Premium"
},
"intrusionDetection": {
"mode": "Alert",
"configuration": {
Expand Down Expand Up @@ -173,6 +179,9 @@
"enableProxy": true,
"requireProxyForNetworkRules": false
},
"sku": {
"tier": "Premium"
},
"intrusionDetection": {
"mode": "Alert",
"configuration": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
"ruleCollectionGroupName": "ruleCollectionGroup1",
"parameters": {
"properties": {
"priority": 110,
"priority": 100,
"ruleCollections": [
{
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"priority": 100,
"action": {
"type": "Deny"
},
Expand Down Expand Up @@ -46,11 +47,12 @@
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"priority": 100,
"ruleCollections": [
{
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"priority": 100,
"action": {
"type": "Deny"
},
Expand Down Expand Up @@ -84,11 +86,12 @@
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"priority": 100,
"ruleCollections": [
{
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"priority": 100,
"action": {
"type": "Deny"
},
Expand Down
Loading

0 comments on commit bf18c36

Please sign in to comment.