Fix errors in ddosCustomPolicy.json (#5013)

* Add ddosCustomPolicy.json to readme.md and fix spec errors (#5008) * Update ddosCustomPolicy.json in 2018-12-01
Azure · Jan 18, 2019 · 9d588c8 · 9d588c8
1 parent 7be29f9
commit 9d588c8
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 74 deletions.
diff --git a/...cation/network/resource-manager/Microsoft.Network/stable/2018-11-01/ddosCustomPolicy.json b/...cation/network/resource-manager/Microsoft.Network/stable/2018-11-01/ddosCustomPolicy.json
@@ -33,8 +33,8 @@
       }
     }
   },
-  "paths": {    
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}": {      
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}": {
       "delete": {
         "tags": [
           "ddosCustomPolicies"
@@ -130,7 +130,9 @@
           }
         },
         "x-ms-examples": {
-          "Get DDoS custom policy": { "$ref": "./examples/DdosCustomPolicyGet.json" }
+          "Get DDoS custom policy": {
+            "$ref": "./examples/DdosCustomPolicyGet.json"
+          }
         }
       },
       "put": {
@@ -198,7 +200,9 @@
         }
       },
       "patch": {
-        "tags": ["ddosCustomPolicies"],
+        "tags": [
+          "ddosCustomPolicies"
+        ],
         "operationId": "DdosCustomPolicies_UpdateTags",
         "description": "Update a DDoS custom policy tags",
         "parameters": [
@@ -258,30 +262,7 @@
   "definitions": {
     "DdosCustomPolicy": {
       "description": "A DDoS custom policy in a resource group.",
-      "x-ms-azure-resource": true,
       "properties": {
-        "id": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Resource ID."
-        },
-        "name": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Resource name."
-        },
-        "type": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Resource type."
-        },        
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "Resource tags."
-        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/DdosCustomPolicyPropertiesFormat",
@@ -293,11 +274,11 @@
           "description": "A unique read-only string that changes whenever the resource is updated."
         }
       },
-      "allOf":[  
-        {  
-           "$ref":"./network.json#/definitions/Resource"
+      "allOf": [
+        {
+          "$ref": "./network.json#/definitions/Resource"
         }
-     ]
+      ]
     },
     "DdosCustomPolicyPropertiesFormat": {
       "properties": {
@@ -315,15 +296,15 @@
           "readOnly": true,
           "type": "array",
           "items": {
-            "$ref": "./network.json#/definitions/SubResource" 
+            "$ref": "./network.json#/definitions/SubResource"
           },
           "description": "The list of public IPs associated with the DDoS custom policy resource. This list is read-only."
         },
         "protocolCustomSettings": {
           "readOnly": false,
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ProtocolCustomSettingsFormat"            
+            "$ref": "#/definitions/ProtocolCustomSettingsFormat"
           },
           "description": "The protocol-specific DDoS policy customization parameters."
         }
@@ -341,7 +322,7 @@
             "Syn"
           ],
           "x-ms-enum": {
-            "name": "The protocol for which the DDoS protection policy is being customized.",
+            "name": "DdosCustomPolicyProtocol",
             "modelAsString": true
           },
           "description": "The protocol for which the DDoS protection policy is being customized."
@@ -362,11 +343,11 @@
           "enum": [
             "Relaxed",
             "Low",
-            "Default",                        
+            "Default",
             "High"
           ],
           "x-ms-enum": {
-            "name": "The customized DDoS protection trigger rate sensitivity degrees. High: Trigger rate set with most sensitivity w.r.t. normal traffic. Default: Trigger rate set with moderate sensitivity w.r.t. normal traffic. Low: Trigger rate set with less sensitivity w.r.t. normal traffic. Relaxed: Trigger rate set with least sensitivity w.r.t. normal traffic.",
+            "name": "DdosCustomPolicyTriggerSensitivityOverride",
             "modelAsString": true
           },
           "description": "The customized DDoS protection trigger rate sensitivity degrees. High: Trigger rate set with most sensitivity w.r.t. normal traffic. Default: Trigger rate set with moderate sensitivity w.r.t. normal traffic. Low: Trigger rate set with less sensitivity w.r.t. normal traffic. Relaxed: Trigger rate set with least sensitivity w.r.t. normal traffic."
@@ -410,4 +391,4 @@
       "description": "An error response from the Batch service."
     }
   }
-}
+}
diff --git a/...resource-manager/Microsoft.Network/stable/2018-11-01/examples/DdosCustomPolicyCreate.json b/...resource-manager/Microsoft.Network/stable/2018-11-01/examples/DdosCustomPolicyCreate.json
@@ -5,6 +5,7 @@
     "resourceGroupName": "rg1",
     "ddosCustomPolicyName": "test-ddos-custom-policy",
     "parameters": {
+      "location": "westus",
       "properties": {
         "protocolCustomSettings": [
           {
@@ -20,6 +21,7 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",
@@ -37,6 +39,7 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",

diff --git a/...rk/resource-manager/Microsoft.Network/stable/2018-11-01/examples/DdosCustomPolicyGet.json b/...rk/resource-manager/Microsoft.Network/stable/2018-11-01/examples/DdosCustomPolicyGet.json
@@ -11,6 +11,7 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",

diff --git a/...urce-manager/Microsoft.Network/stable/2018-11-01/examples/DdosCustomPolicyUpdateTags.json b/...urce-manager/Microsoft.Network/stable/2018-11-01/examples/DdosCustomPolicyUpdateTags.json
@@ -17,6 +17,11 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2"
+        },
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",

diff --git a/...cation/network/resource-manager/Microsoft.Network/stable/2018-12-01/ddosCustomPolicy.json b/...cation/network/resource-manager/Microsoft.Network/stable/2018-12-01/ddosCustomPolicy.json
@@ -33,8 +33,8 @@
       }
     }
   },
-  "paths": {    
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}": {      
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}": {
       "delete": {
         "tags": [
           "ddosCustomPolicies"
@@ -130,7 +130,9 @@
           }
         },
         "x-ms-examples": {
-          "Get DDoS custom policy": { "$ref": "./examples/DdosCustomPolicyGet.json" }
+          "Get DDoS custom policy": {
+            "$ref": "./examples/DdosCustomPolicyGet.json"
+          }
         }
       },
       "put": {
@@ -198,7 +200,9 @@
         }
       },
       "patch": {
-        "tags": ["ddosCustomPolicies"],
+        "tags": [
+          "ddosCustomPolicies"
+        ],
         "operationId": "DdosCustomPolicies_UpdateTags",
         "description": "Update a DDoS custom policy tags",
         "parameters": [
@@ -258,30 +262,7 @@
   "definitions": {
     "DdosCustomPolicy": {
       "description": "A DDoS custom policy in a resource group.",
-      "x-ms-azure-resource": true,
       "properties": {
-        "id": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Resource ID."
-        },
-        "name": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Resource name."
-        },
-        "type": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Resource type."
-        },        
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "Resource tags."
-        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/DdosCustomPolicyPropertiesFormat",
@@ -293,11 +274,11 @@
           "description": "A unique read-only string that changes whenever the resource is updated."
         }
       },
-      "allOf":[  
-        {  
-           "$ref":"./network.json#/definitions/Resource"
+      "allOf": [
+        {
+          "$ref": "./network.json#/definitions/Resource"
         }
-     ]
+      ]
     },
     "DdosCustomPolicyPropertiesFormat": {
       "properties": {
@@ -315,15 +296,15 @@
           "readOnly": true,
           "type": "array",
           "items": {
-            "$ref": "./network.json#/definitions/SubResource" 
+            "$ref": "./network.json#/definitions/SubResource"
           },
           "description": "The list of public IPs associated with the DDoS custom policy resource. This list is read-only."
         },
         "protocolCustomSettings": {
           "readOnly": false,
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ProtocolCustomSettingsFormat"            
+            "$ref": "#/definitions/ProtocolCustomSettingsFormat"
           },
           "description": "The protocol-specific DDoS policy customization parameters."
         }
@@ -341,7 +322,7 @@
             "Syn"
           ],
           "x-ms-enum": {
-            "name": "The protocol for which the DDoS protection policy is being customized.",
+            "name": "DdosCustomPolicyProtocol",
             "modelAsString": true
           },
           "description": "The protocol for which the DDoS protection policy is being customized."
@@ -362,11 +343,11 @@
           "enum": [
             "Relaxed",
             "Low",
-            "Default",                        
+            "Default",
             "High"
           ],
           "x-ms-enum": {
-            "name": "The customized DDoS protection trigger rate sensitivity degrees. High: Trigger rate set with most sensitivity w.r.t. normal traffic. Default: Trigger rate set with moderate sensitivity w.r.t. normal traffic. Low: Trigger rate set with less sensitivity w.r.t. normal traffic. Relaxed: Trigger rate set with least sensitivity w.r.t. normal traffic.",
+            "name": "DdosCustomPolicyTriggerSensitivityOverride",
             "modelAsString": true
           },
           "description": "The customized DDoS protection trigger rate sensitivity degrees. High: Trigger rate set with most sensitivity w.r.t. normal traffic. Default: Trigger rate set with moderate sensitivity w.r.t. normal traffic. Low: Trigger rate set with less sensitivity w.r.t. normal traffic. Relaxed: Trigger rate set with least sensitivity w.r.t. normal traffic."
@@ -410,4 +391,4 @@
       "description": "An error response from the Batch service."
     }
   }
-}
+}
diff --git a/...resource-manager/Microsoft.Network/stable/2018-12-01/examples/DdosCustomPolicyCreate.json b/...resource-manager/Microsoft.Network/stable/2018-12-01/examples/DdosCustomPolicyCreate.json
@@ -5,6 +5,7 @@
     "resourceGroupName": "rg1",
     "ddosCustomPolicyName": "test-ddos-custom-policy",
     "parameters": {
+      "location": "westus",
       "properties": {
         "protocolCustomSettings": [
           {
@@ -20,6 +21,7 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",
@@ -37,6 +39,7 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",

diff --git a/...rk/resource-manager/Microsoft.Network/stable/2018-12-01/examples/DdosCustomPolicyGet.json b/...rk/resource-manager/Microsoft.Network/stable/2018-12-01/examples/DdosCustomPolicyGet.json
@@ -11,6 +11,7 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",

diff --git a/...urce-manager/Microsoft.Network/stable/2018-12-01/examples/DdosCustomPolicyUpdateTags.json b/...urce-manager/Microsoft.Network/stable/2018-12-01/examples/DdosCustomPolicyUpdateTags.json
@@ -17,6 +17,11 @@
         "name": "test-ddos-custom-policy",
         "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/ddosCustomPolicies/test-ddos-custom-policy",
         "type": "Microsoft.Network/ddosCustomPolicies",
+        "location": "westus",
+        "tags": {
+          "tag1": "value1",
+          "tag2": "value2"
+        },
         "properties": {
           "provisioningState": "Succeeded",
           "resourceGuid": "00000000-0000-0000-0000-000000000000",

diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md
@@ -85,6 +85,7 @@ input-file:
   - Microsoft.Network/stable/2018-11-01/azureFirewall.json
   - Microsoft.Network/stable/2018-11-01/azureFirewallFqdnTag.json
   - Microsoft.Network/stable/2018-11-01/checkDnsAvailability.json
+  - Microsoft.Network/stable/2018-11-01/ddosCustomPolicy.json
   - Microsoft.Network/stable/2018-11-01/ddosProtectionPlan.json
   - Microsoft.Network/stable/2018-11-01/endpointService.json
   - Microsoft.Network/stable/2018-11-01/expressRouteCircuit.json
@@ -767,6 +768,9 @@ directive:
   - suppress: RequiredPropertiesMissingInResourceModel
     from: checkDnsAvailability.json
     reason: name, id and type properties are inherited from the upper level
+  - suppress: RequiredPropertiesMissingInResourceModel
+    from: ddosCustomPolicy.json
+    reason: name, id and type properties are inherited from the upper level
   - suppress: RequiredPropertiesMissingInResourceModel
     from: ddosProtectionPlan.json
     reason: name, id and type properties are inherited from the upper level