Azure · MikhailTryakhov · Sep 28, 2018
diff --git a/...soft.Network/stable/2018-07-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json b/...soft.Network/stable/2018-07-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json
@@ -1,6 +1,6 @@
 {
   "parameters" : {
-    "api-version": "2018-06-01",
+    "api-version": "2018-07-01",
     "subscriptionId" : "subid",
     "resourceGroupName" : "rg1",
     "networkWatcherName" : "nw1",

diff --git a/...tion/network/resource-manager/Microsoft.Network/stable/2018-08-01/applicationGateway.json b/...tion/network/resource-manager/Microsoft.Network/stable/2018-08-01/applicationGateway.json
@@ -1217,7 +1217,14 @@
         "provisioningState": {
           "type": "string",
           "description": "Provisioning state of the HTTP listener resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
-        }
+        },
+        "customErrorConfiguration": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayCustomError"
+          },
+          "description": "Custom error configurations of the HTTP listener."
+         }
       },
       "description": "Properties of HTTP listener of an application gateway."
     },
@@ -1683,7 +1690,14 @@
         "provisioningState": {
           "type": "string",
           "description": "Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'."
-        }
+        },
+        "customErrorConfiguration": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayCustomError"
+          },
+          "description": "Custom error configurations of the application gateway resource."
+         }
       },
       "description": "Properties of the application gateway."
     },
@@ -1827,6 +1841,31 @@
           "minimum": 8,
           "exclusiveMinimum": false,
           "description": "Maxium request body size for WAF."
+        },
+        "maxRequestBodySizeInKb": {
+          "type": "integer",
+          "format": "int32",
+          "maximum": 128,
+          "exclusiveMaximum": false,
+          "minimum": 8,
+          "exclusiveMinimum": false,
+          "description": "Maxium request body size in Kb for WAF."
+        },
+        "fileUploadLimitInMb": {
+          "type": "integer",
+          "format": "int32",
+          "maximum": 500,
+          "exclusiveMaximum": false,
+          "minimum": 0,
+          "exclusiveMinimum": false,
+          "description": "Maxium file upload size in Mb for WAF."
+        },
+        "exclusions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayFirewallExclusion"
+          },
+          "description": "The exclusion list."
         }
       },
       "required": [
@@ -1895,6 +1934,28 @@
       ],
       "description": "Allows to disable rules within a rule group or an entire rule group."
     },
+    "ApplicationGatewayFirewallExclusion": {
+      "properties": {
+        "matchVariable": {
+          "type": "string",
+          "description": "The variable to be excluded."
+        },
+        "selectorMatchOperator": {
+          "type": "string",
+          "description": "When matchVariable is a collection, operate on the selector to specify which elements in the collection this exclusion applies to."
+        },
+        "selector": {
+          "type": "string",
+          "description": "When matchVariable is a collection, operator used to specify which elements in the collection this exclusion applies to."
+        }
+      },
+      "required": [
+        "matchVariable",
+        "selectorMatchOperator",
+        "selector"
+      ],
+      "description": "Allow to exclude some variable satisfy the condition for the WAF check"
+    },
     "ApplicationGatewayAvailableWafRuleSetsResult": {
       "properties": {
         "value": {
@@ -2084,6 +2145,27 @@
         }
       },
       "description": "Properties of ApplicationGatewaySslPredefinedPolicy"
+    },
+	"ApplicationGatewayCustomError": {
+      "properties": {
+        "statusCode": {
+          "type": "string",
+          "description": "Status code of the application gateway customer error.",
+          "enum": [
+            "403",
+            "502"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayCustomErrorStatusCode",
+            "modelAsString": true
+          }
+        },
+        "customErrorPageUrl": {
+          "type": "string",
+          "description": "Error page URL of the application gateway customer error."
+        }
+      },
+      "description": "Customer error of an application gateway."
     },
     "PolicyNameEnum": {
       "type": "string",

diff --git a/...ification/network/resource-manager/Microsoft.Network/stable/2018-08-01/azureFirewall.json b/...ification/network/resource-manager/Microsoft.Network/stable/2018-08-01/azureFirewall.json
@@ -741,7 +741,8 @@
          "enum":[  
             "TCP",
             "UDP",
-            "Any"
+            "Any",
+            "ICMP"
          ],
          "x-ms-enum":{  
             "name":"AzureFirewallNetworkRuleProtocol",

diff --git a/...soft.Network/stable/2018-08-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json b/...soft.Network/stable/2018-08-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json
@@ -1,12 +1,12 @@
 {
   "parameters" : {
-    "api-version": "2018-06-01",
+    "api-version": "2018-08-01",
     "subscriptionId" : "subid",
     "resourceGroupName" : "rg1",
     "networkWatcherName" : "nw1",
     "parameters" : {
       "targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1",
-      "queries": [
+      "profiles": [
 	    {
 		  "direction" : "Inbound",
 		  "protocol" : "TCP",
@@ -22,7 +22,7 @@
       "body" : {
 		"results": [
 		  {
-	        "trafficQuery": {
+	        "profile": {
               "direction": "Inbound",
               "protocol": "TCP",
               "source": "10.1.0.4",
@@ -34,6 +34,7 @@
               "evaluatedNetworkSecurityGroups": [
                 {
                   "networkSecurityGroupId": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1",
+				  "appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AppSubnet",
                   "matchedRule": {
                     "ruleName": "UserRule_fe_rule",
                     "action": "Allow"
@@ -83,6 +84,7 @@
                 },
                 {
 				  "networkSecurityGroupId": "/subscriptions/61cc8a98-a8be-4bfe-a04e-0b461f93fe35/resourceGroups/NwRgCentralUSEUAP_copy/providers/Microsoft.Network/networkSecurityGroups/AppNSG",
+				  "appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/networkInterfaces/nic",
                   "matchedRule": {
                     "ruleName": "UserRule_fe_rule",
                     "action": "Allow"
@@ -108,7 +110,7 @@
       "body" : {
 		"results": [
 		  {
-	        "trafficQuery": {
+	        "profile": {
               "direction": "Inbound",
               "protocol": "TCP",
               "source": "10.1.0.4",
@@ -120,6 +122,7 @@
               "evaluatedNetworkSecurityGroups": [
                 {
                   "networkSecurityGroupId": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1",
+				  "appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AppSubnet",
                   "matchedRule": {
                     "ruleName": "UserRule_fe_rule",
                     "action": "Allow"
@@ -169,6 +172,7 @@
                 },
                 {
 				  "networkSecurityGroupId": "/subscriptions/61cc8a98-a8be-4bfe-a04e-0b461f93fe35/resourceGroups/NwRgCentralUSEUAP_copy/providers/Microsoft.Network/networkSecurityGroups/AppNSG",
+				  "appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/networkInterfaces/nic",
                   "matchedRule": {
                     "ruleName": "UserRule_fe_rule",
                     "action": "Allow"

diff --git a/...manager/Microsoft.Network/stable/2018-08-01/examples/ServiceEndpointPolicyUpdateTags.json b/...manager/Microsoft.Network/stable/2018-08-01/examples/ServiceEndpointPolicyUpdateTags.json
@@ -0,0 +1,47 @@
+{
+  "parameters" : {
+    "api-version": "2018-08-01",
+    "subscriptionId" : "subid",
+    "resourceGroupName": "rg1",
+    "serviceEndpointPolicyName": "testServiceEndpointPolicy",
+    "parameters": {
+      "tags": {
+        "tag1": "value1",
+        "tag2": "value2"
+      }
+    }
+  },
+  "responses" : {
+    "200" : {
+      "body" : {
+        "name" : "testServiceEndpointPolicy",
+        "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/serviceEndpointPolicies/testServiceEndpointPolicy",
+        "type": "Microsoft.Network/serviceEndpointPolicies",
+        "location" : "westus",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2"
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "resourceGuid": "00000000-0000-0000-0000-000000000000",
+          "serviceEndpointPolicyDefinitions": [
+            {
+              "name": "StorageServiceEndpointPolicyDefinition",
+              "properties": {
+                "description": "Storage Service EndpointPolicy Definition",
+                "service": "Microsoft.Storage",
+                "serviceResources": [
+                  "/subscriptions/subid1",
+                  "/subscriptions/subid1/resourceGroups/storageRg",
+                  "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
+                ]
+              }
+            }
+          ],
+          "subnets": []
+        }
+      }
+    }
+  }
+}
diff --git a/...r/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGatewayConnectionCreate.json b/...r/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGatewayConnectionCreate.json
@@ -1,6 +1,6 @@
 {
     "parameters": {
-        "api-version": "2018-07-01",
+        "api-version": "2018-08-01",
         "subscriptionId": "subid",
         "resourceGroupName": "rg1",
         "virtualNetworkGatewayConnectionName" : "connS2S",

diff --git a/...ager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGatewayConnectionGet.json b/...ager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGatewayConnectionGet.json
@@ -1,6 +1,6 @@
 {
     "parameters": {
-        "api-version": "2018-07-01",
+        "api-version": "2018-08-01",
         "subscriptionId": "subid",
         "resourceGroupName": "rg1",
         "virtualNetworkGatewayConnectionName" : "connS2S"

diff --git a/...er/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGatewayConnectionsList.json b/...er/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkGatewayConnectionsList.json
@@ -1,6 +1,6 @@
 {
     "parameters": {
-        "api-version": "2018-07-01",
+        "api-version": "2018-08-01",
         "subscriptionId": "subid",
         "resourceGroupName": "rg1"
     },

diff --git a/...er/Microsoft.Network/stable/2018-08-01/examples/VirtualWanSupportedSecurityProviders.json b/...er/Microsoft.Network/stable/2018-08-01/examples/VirtualWanSupportedSecurityProviders.json
@@ -2,7 +2,7 @@
   "parameters": {
     "subscriptionId": "subid",
     "resourceGroupName": "rg1",
-    "api-version": "2018-07-01",
+    "api-version": "2018-08-01",
     "virtualWANName": "wan1"
   },
   "responses": {
@@ -24,4 +24,4 @@
       }
     }
   }
-}
+}
diff --git a/...twork/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VpnConnectionGet.json b/...twork/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VpnConnectionGet.json
@@ -3,7 +3,7 @@
     "gatewayName": "gateway1",
     "connectionName": "vpnConnection1",
     "resourceGroupName": "rg1",
-    "api-version": "2018-07-01",
+    "api-version": "2018-08-01",
     "subscriptionId": "subid"
   },
   "responses": {

diff --git a/...work/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VpnConnectionList.json b/...work/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VpnConnectionList.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "gatewayName": "gateway1",
-    "api-version": "2018-07-01",
+    "api-version": "2018-08-01",
     "resourceGroupName": "rg1",
     "subscriptionId": "subid"
   },

diff --git a/...twork/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VpnConnectionPut.json b/...twork/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VpnConnectionPut.json
@@ -3,7 +3,7 @@
     "connectionName": "vpnConnection1",
     "gatewayName": "gateway1",
     "resourceGroupName": "rg1",
-    "api-version": "2018-07-01",
+    "api-version": "2018-08-01",
     "subscriptionId": "subid",
     "VpnConnectionParameters": {
       "properties": {

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json b/...fication/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json
@@ -3432,23 +3432,36 @@
       "description": "Parameters to get network configuration diagnostic.",
       "required": [
         "targetResourceId",
-        "queries"
+        "profiles"
       ],
       "properties": {
         "targetResourceId": {
           "type": "string",
           "description": "The ID of the target resource to perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway."
         },
-        "queries": {
+        "verbosityLevel": {
+          "type": "string",          
+          "enum": [
+            "Normal",
+            "Minimum",
+            "Full"
+          ],
+          "x-ms-enum": {
+            "name": "VerbosityLevel",
+            "modelAsString": true
+          },
+          "description": "Verbosity level. Accepted values are 'Normal', 'Minimum', 'Full'."
+        },
+        "profiles": {
           "type": "array",
-          "description": "List of traffic queries.",
+          "description": "List of network configuration diagnostic profiles.",
           "items": {
-            "$ref": "#/definitions/TrafficQuery"
+            "$ref": "#/definitions/NetworkConfigurationDiagnosticProfile"
           }
         }
       }
     },
-    "TrafficQuery": {
+    "NetworkConfigurationDiagnosticProfile": {
       "description": "Parameters to compare with network configuration.",
       "required": [
         "direction",
@@ -3504,8 +3517,8 @@
     "NetworkConfigurationDiagnosticResult": {
       "description": "Network configuration diagnostic result corresponded to provided traffic query.",
       "properties": {
-        "trafficQuery": {
-          "$ref": "#/definitions/TrafficQuery"
+        "profile": {
+          "$ref": "#/definitions/NetworkConfigurationDiagnosticProfile"
         },
         "networkSecurityGroupResult": {
           "$ref": "#/definitions/NetworkSecurityGroupResult"
@@ -3544,6 +3557,10 @@
           "type": "string",
           "description": "Network security group ID."
         },
+        "appliedTo": {
+          "type": "string",
+          "description": "Resource ID of nic or subnet to which network security group is applied."
+        },
         "matchedRule": {
           "$ref": "#/definitions/MatchedRule"
         },

diff --git a/...n/network/resource-manager/Microsoft.Network/stable/2018-08-01/serviceEndpointPolicy.json b/...n/network/resource-manager/Microsoft.Network/stable/2018-08-01/serviceEndpointPolicy.json
@@ -229,6 +229,7 @@
           }
         },
         "x-ms-examples": {
+          "Update service endpoint policy tags": { "$ref": "./examples/ServiceEndpointPolicyUpdateTags.json" }
         },
         "x-ms-long-running-operation": true
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -741,7 +741,8 @@ @@
              "enum":[
                 "TCP",
                 "UDP",
-                "Any"
+                "Any",
+                "ICMP"
              ],
              "x-ms-enum":{
                 "name":"AzureFirewallNetworkRuleProtocol",
@@ Expand Down @@