[Fix Broken S360 Issues][HDInsight]Fix S360 issues batch1

specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/cluster.json

@@ -858,6 +858,7 @@
         },
         "diskSizeGB": {
           "type": "integer",
+          "format": "int32",
           "description": "ReadOnly. The DiskSize in GB. Do not set this value.",
           "readOnly": true
         }
@@ -956,6 +957,10 @@
             "$ref": "./scriptActions.json#/definitions/ScriptAction"
           },
           "description": "The list of script actions on the role."
+        },
+        "encryptDataDisks": {
+          "type": "boolean",
+          "description": "Indicates whether encrypt the data disks."
         }
       },
       "description": "Describes a role on the cluster."
@@ -1017,6 +1022,19 @@
       },
       "description": "The storage profile."
     },
+    "ExcludedServicesConfig": {
+      "properties": {
+        "excludedServicesConfigId": {
+          "type": "string",
+          "description": "The config id of excluded services."
+        },
+        "excludedServicesList": {
+          "type": "string",
+          "description": "The list of excluded services."
+        }
+      },
+      "description": "The configuration that services will be excluded when creating cluster."
+    },
     "NetworkProperties": {
       "description": "The network properties.",
       "properties": {
@@ -1221,6 +1239,10 @@
           "type": "string",
           "description": "The version of the cluster."
         },
+        "clusterHdpVersion": {
+          "type": "string",
+          "description": "The hdp version of the cluster."
+        },
         "osType": {
           "type": "string",
           "description": "The type of operating system.",
@@ -1314,10 +1336,18 @@
           "$ref": "#/definitions/EncryptionInTransitProperties",
           "description": "The encryption-in-transit properties."
         },
+        "storageProfile": {
+          "$ref": "#/definitions/StorageProfile",
+          "description": "The storage profile."
+        },
         "minSupportedTlsVersion": {
           "type": "string",
           "description": "The minimal supported tls version."
         },
+        "excludedServicesConfig": {
+          "$ref": "#/definitions/ExcludedServicesConfig",
+          "description": "The excluded services config."
+        },
         "networkProperties": {
           "$ref": "#/definitions/NetworkProperties",
           "description": "The network properties."
@@ -1547,6 +1577,10 @@
                 "readOnly": true,
                 "type": "string",
                 "description": "The client id of user assigned identity."
+              },
+              "tenantId": {
+                "type": "string",
+                "description": "The tenant id of user assigned identity."
               }
             }
           },

specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/locations.json

@@ -373,7 +373,8 @@
         },
         "currentValue": {
           "description": "The current usage.",
-          "type": "integer"
+          "type": "integer",
+          "format": "int32"
         },
         "limit": {
           "description": "The maximum allowed usage.",
@@ -410,13 +411,28 @@
             "type": "string"
           }
         },
+        "vmSizesWithEncryptionAtHost": {
+          "description": "The vm sizes which enable encryption at host.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
         "vmSizeFilters": {
           "description": "The virtual machine filtering mode. Effectively this can enabling or disabling the virtual machine sizes in a particular set.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/VmSizeCompatibilityFilterV2"
           }
         },
+        "vmSizeProperties": {
+          "description": "The vm size properties.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VmSizeProperty"
+          },
+          "readOnly": true
+        },
         "billingResources": {
           "description": "The billing and managed disk billing resources for a region.",
           "type": "array",
@@ -426,6 +442,57 @@
         }
       }
     },
+    "VmSizeProperty": {
+      "type": "object",
+      "description": "The vm size property",
+      "properties": {
+        "name": {
+          "description": "The vm size name.",
+          "type": "string"
+        },
+        "cores": {
+          "description": "The number of cores that the vm size has.",
+          "type": "integer",
+          "format": "int32"
+        },
+        "dataDiskStorageTier": {
+          "description": "The data disk storage tier of the vm size.",
+          "type": "string"
+        },
+        "label": {
+          "description": "The label of the vm size.",
+          "type": "string"
+        },
+        "maxDataDiskCount": {
+          "description": "The max data disk count of the vm size.",
+          "type": "integer",
+          "format": "int64"
+        },
+        "memoryInMb": {
+          "description": "The memory whose unit is MB of the vm size.",
+          "type": "integer",
+          "format": "int64"
+        },
+        "supportedByVirtualMachines": {
+          "description": "This indicates this vm size is supported by virtual machines or not",
+          "type": "boolean"
+        },
+        "supportedByWebWorkerRoles": {
+          "description": "The indicates this vm size is supported by web worker roles or not",
+          "type": "boolean"
+        },
+        "virtualMachineResourceDiskSizeInMb": {
+          "description": "The virtual machine resource disk size whose unit is MB of the vm size.",
+          "type": "integer",
+          "format": "int64"
+        },
+        "webWorkerResourceDiskSizeInMb": {
+          "description": "The web worker resource disk size whose unit is MB of the vm size.",
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "VmSizeCompatibilityFilterV2": {
       "type": "object",
       "description": "This class represent a single filter object that defines a multidimensional set. The dimensions of this set are Regions, ClusterFlavors, NodeTypes and ClusterVersions. The constraint should be defined based on the following: FilterMode (Exclude vs Include), VMSizes (the vm sizes in affect of exclusion/inclusion) and the ordering of the Filters. Later filters override previous settings if conflicted.",
@@ -435,7 +502,9 @@
           "type": "string",
           "enum": [
             "Exclude",
-            "Include"
+            "Include",
+            "Recommend",
+            "Default"
           ],
           "x-ms-enum": {
             "name": "FilterMode",