Add insights swagger spec test, add vm extensions to swagger and schema

src/generator/AutoRest.AzureResourceSchema.Tests/AzureResourceSchemaAcceptanceTests.cs

@@ -52,6 +52,12 @@ public static void CognitiveServices_2016_02_01_preview()
             RunSwaggerTest("CognitiveServices", "2016-02-01-preview", "cognitiveservices.json");
         }
 
+        [Fact]
+        public static void CommitmentPlans_2016_05_01_preview()
+        {
+            RunSwaggerTest("CommitmentPlans", "2016-05-01-preview", "commitmentplans.json");
+        }
+
         [Fact]
         public static void Compute_2015_06_15()
         {
@@ -64,6 +70,12 @@ public static void Compute_2016_03_30()
             RunSwaggerTest("Compute", "2016-03-30", "compute.json");
         }
 
+        [Fact]
+        public static void Compute_2016_03_30b()
+        {
+            RunSwaggerTest("Compute", "2016-03-30b", "compute.json");
+        }
+
         [Fact]
         public static void ContainerService_2016_03_30()
         {
@@ -100,6 +112,12 @@ public static void Dns_2016_04_01()
             RunSwaggerTest("DNS", "2016-04-01", "dns.json");
         }
 
+        [Fact]
+        public static void Insights_2016_03_01()
+        {
+            RunSwaggerTest("Insights", "2016-03-01", "insightsManagementClient.json");
+        }
+
         [Fact]
         public static void Logic_2015_02_01_preview()
         {

src/generator/AutoRest.AzureResourceSchema.Tests/Expected/CognitiveServices/2016-02-01-preview/Microsoft.CognitiveServices.json

@@ -69,14 +69,6 @@
           "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters."
         },
         "properties": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Must exist in the request. Must not be null."
         }
       },

src/generator/AutoRest.AzureResourceSchema.Tests/Expected/CommitmentPlans/2016-05-01-preview/Microsoft.MachineLearning.json

@@ -0,0 +1,91 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2016-05-01-preview/Microsoft.MachineLearning.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.MachineLearning",
+  "description": "Microsoft MachineLearning Resource Types",
+  "resourceDefinitions": {
+    "commitmentPlans": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.MachineLearning/commitmentPlans"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-05-01-preview"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "User-defined tags for the resource."
+        },
+        "etag": {
+          "type": "string",
+          "description": "An entity tag used to enforce optimistic concurrency."
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ResourceSku"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The commitment plan SKU."
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "location"
+      ],
+      "description": "Microsoft.MachineLearning/commitmentPlans"
+    }
+  },
+  "definitions": {
+    "ResourceSku": {
+      "type": "object",
+      "properties": {
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The scale-out capacity of the resource. 1 is 1x, 2 is 2x, etc. This impacts the quantities and cost of any commitment plan resource."
+        },
+        "name": {
+          "type": "string",
+          "description": "The SKU name. Along with tier, uniquely identifies the SKU."
+        },
+        "tier": {
+          "type": "string",
+          "description": "The SKU tier. Along with name, uniquely identifies the SKU."
+        }
+      },
+      "description": "The SKU of a resource."
+    }
+  }
+}

src/generator/AutoRest.AzureResourceSchema.Tests/Expected/Compute/2015-06-15/Microsoft.Compute.json

@@ -1263,25 +1263,9 @@
           "description": "Gets or sets whether the extension handler should be automatically upgraded across minor versions."
         },
         "settings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Gets or sets Json formatted public settings for the extension."
         },
         "protectedSettings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Gets or sets Json formatted protected settings for the extension."
         },
         "provisioningState": {
@@ -1505,25 +1489,9 @@
           "description": "Gets or sets whether the extension handler should be automatically upgraded across minor versions."
         },
         "settings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Gets or sets Json formatted public settings for the extension."
         },
         "protectedSettings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Gets or sets Json formatted protected settings for the extension."
         }
       },

src/generator/AutoRest.AzureResourceSchema.Tests/Expected/Compute/2016-03-30/Microsoft.Compute.json

@@ -1261,25 +1261,9 @@
           "description": "whether the extension handler should be automatically upgraded across minor versions."
         },
         "settings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Json formatted public settings for the extension."
         },
         "protectedSettings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Json formatted protected settings for the extension."
         },
         "instanceView": {
@@ -1495,25 +1479,9 @@
           "description": "whether the extension handler should be automatically upgraded across minor versions."
         },
         "settings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Json formatted public settings for the extension."
         },
         "protectedSettings": {
-          "oneOf": [
-            {
-              "type": "object"
-            },
-            {
-              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
-            }
-          ],
           "description": "Json formatted protected settings for the extension."
         }
       },