Firewall Manager Feature Swagger Updates for Public Preview (#7266)

Azure · Sep 25, 2019 · 6cdc8c3 · 6cdc8c3
1 parent 64bcd0e
commit 6cdc8c3
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 8 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -129,6 +129,7 @@ autoscalesettings
 autoscaling
 Avro
 avrodeflate
+AZFW
 azns
 azpkg
 azureaccounts

diff --git a/...ification/network/resource-manager/Microsoft.Network/stable/2019-08-01/azureFirewall.json b/...ification/network/resource-manager/Microsoft.Network/stable/2019-08-01/azureFirewall.json
@@ -444,6 +444,10 @@
           "readOnly": true,
           "description": "IP addresses associated with AzureFirewall.",
           "$ref": "#/definitions/HubIPAddresses"
+        },
+        "sku": {
+          "description": "The Azure Firewall Resource SKU.",
+          "$ref": "#/definitions/AzureFirewallSku"
         }
       },
       "description": "Properties of the Azure Firewall."
@@ -880,6 +884,34 @@
         "name": "AzureFirewallApplicationRuleProtocolType",
         "modelAsString": true
       }
+    },
+    "AzureFirewallSku": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of an Azure Firewall SKU.",
+          "enum": [
+            "AZFW_VNet",
+            "AZFW_Hub"  
+          ],
+          "x-ms-enum": {
+            "name": "AzureFirewallSkuName",
+            "modelAsString": true
+          }
+        },
+        "tier": {
+          "type": "string",
+          "description": "Tier of an Azure Firewall.",
+          "enum": [
+            "Standard"
+          ],
+          "x-ms-enum": {
+            "name": "AzureFirewallSkuTier",
+            "modelAsString": true
+          }
+        }
+      },
+      "description": "SKU of an Azure Firewall."
     }
   }
 }
diff --git a/...twork/resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallGet.json b/...twork/resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallGet.json
@@ -19,6 +19,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_VNet",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "ipConfigurations": [
             {

diff --git a/...ource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallGetWithZones.json b/...ource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallGetWithZones.json
@@ -23,6 +23,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_VNet",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "ipConfigurations": [
             {

diff --git a/...twork/resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPut.json b/...twork/resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPut.json
@@ -11,6 +11,10 @@
       "location": "West US",
       "zones": [],
       "properties": {
+        "sku": {
+          "name": "AZFW_VNet",
+          "tier": "Standard"
+        },
         "threatIntelMode": "Alert",
         "ipConfigurations": [
           {
@@ -134,6 +138,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_VNet",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "ipConfigurations": [
             {
@@ -260,6 +268,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_VNet",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "ipConfigurations": [
             {

diff --git a/.../resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPutInHub.json b/.../resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPutInHub.json
@@ -11,6 +11,10 @@
       "location": "West US",
       "zones": [],
       "properties": {
+        "sku": {
+          "name": "AZFW_Hub",
+          "tier": "Standard"
+        },
         "threatIntelMode": "Alert",
         "virtualHub": {
           "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
@@ -35,6 +39,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_Hub",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "virtualHub": {
             "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
@@ -66,6 +74,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_Hub",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "virtualHub": {
             "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"

diff --git a/...ource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPutWithZones.json b/...ource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPutWithZones.json
@@ -16,6 +16,10 @@
       ],
       "properties": {
         "threatIntelMode": "Alert",
+        "sku": {
+          "name": "AZFW_VNet",
+          "tier": "Standard"
+        },
         "ipConfigurations": [
           {
             "name": "azureFirewallIpConfiguration",
@@ -142,6 +146,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_VNet",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "ipConfigurations": [
             {
@@ -272,6 +280,10 @@
         },
         "properties": {
           "provisioningState": "Succeeded",
+          "sku": {
+            "name": "AZFW_VNet",
+            "tier": "Standard"
+          },
           "threatIntelMode": "Alert",
           "ipConfigurations": [
             {

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2019-08-01/firewallPolicy.json b/...fication/network/resource-manager/Microsoft.Network/stable/2019-08-01/firewallPolicy.json
@@ -896,8 +896,7 @@
       "type": "string",
       "description": "The action type of a rule.",
       "enum": [
-        "DNAT",
-        "SNAT"
+        "DNAT"
       ],
       "x-ms-enum": {
         "name": "FirewallPolicyNatRuleActionType",
@@ -918,8 +917,7 @@
       "description": "The action type of a rule.",
       "enum": [
         "Allow",
-        "Deny",
-        "Alert "
+        "Deny"
       ],
       "x-ms-enum": {
         "name": "FirewallPolicyFilterRuleActionType",

diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/virtualWan.json
@@ -2927,10 +2927,6 @@
           },
           "description": "List of VpnSites in the VirtualWAN."
         },
-        "securityProviderName": {
-          "type": "string",
-          "description": "The Security Provider name."
-        },
         "allowBranchToBranchTraffic": {
           "type": "boolean",
           "description": "True if branch to branch traffic is allowed."
@@ -3175,6 +3171,10 @@
           "$ref": "./network.json#/definitions/SubResource",
           "description": "The expressRouteGateway associated with this VirtualHub."
         },
+        "azureFirewall": {
+          "$ref": "./network.json#/definitions/SubResource",
+          "description": "The azureFirewall associated with this VirtualHub."
+        },
         "virtualNetworkConnections": {
           "type": "array",
           "description": "List of all vnet connections with this VirtualHub.",
@@ -3193,6 +3193,10 @@
         "provisioningState": {
           "$ref": "./network.json#/definitions/ProvisioningState",
           "description": "The provisioning state of the virtual hub resource."
+        },
+        "securityProviderName": {
+          "type": "string",
+          "description": "The Security Provider name."
         }
       },
       "description": "Parameters for VirtualHub."
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,6 +129,7 @@ autoscalesettings @@
     autoscaling
     Avro
     avrodeflate
+    AZFW
     azns
     azpkg
     azureaccounts
@@ Expand Down @@