use standard containers, target new testserver, collectionFormat on formData (#42)

* removed references to non-standard containers

* regen with schema checks

* switch back ref

* nump

* collection format on formData

* regen

.gulp/regeneration.iced

@@ -15,8 +15,8 @@ regenExpected = (opts,done) ->
     args = [
       "--standalone-modeler",
       "--clear-output-folder",
-      "--output-artifact=code-model-v1.yaml",
-      "--output-artifact=code-model-v1-yaml.yaml",
+      "--output-artifact=code-model-v1.norm.yaml",
+      "--output-artifact=code-model-v1-yaml.norm.yaml",
       "--output-folder=#{opts.outputDir}/#{key}"
     ]
 

package.json

@@ -29,8 +29,8 @@
   },
   "homepage": "https://github.com/Azure/autorest.modeler/blob/master/README.md",
   "devDependencies": {
-    "@microsoft.azure/autorest.testserver": "2.3.1",
-    "autorest": "^2.0.4201",
+    "@microsoft.azure/autorest.testserver": "2.3.14",
+    "autorest": "^2.0.4215",
     "coffee-script": "^1.11.1",
     "dotnet-sdk-2.0.0": "^1.4.4",
     "gulp": "^3.9.1",

src/Model/RequestBody.cs

@@ -43,20 +43,23 @@ namespace AutoRest.Modeler.Model
                             Name = prop.Key,
                             IsRequired = schema.Required?.Contains(prop.Key) ?? false,
                             Schema = prop.Value,
-                            Extensions = schema.Extensions
+                            Extensions = schema.Extensions,
+                            Style = prop.Value?.Style
                         });
                 }
                 else // => in: body
                 {
+                    var schema = Content?.Values.FirstOrDefault()?.Schema;
                     var p = new SwaggerParameter
                     {
                         Description = Description,
                         In = ParameterLocation.Body,
                         Name = Extensions.GetValue<string>("x-ms-requestBody-name") ?? "body",
                         IsRequired = Required,
-                        Schema = Content?.Values.FirstOrDefault()?.Schema,
+                        Schema = schema,
                         Reference = Reference,
-                        Extensions = Extensions
+                        Extensions = Extensions,
+                        Style = schema?.Style
                     };
                     asParamCache = new [] { p };
                 }

src/Model/Schema.cs

@@ -37,6 +37,8 @@ namespace AutoRest.Modeler.Model
 
         public object Example { get; set; }
 
+        public ParameterStyle? Style { get; set; } // for backwards compat. with 2.0 - properties can have "style" to encode things like form data collection format 
+
         /// <summary>
         /// The value of this property MUST be another schema which will provide 
         /// a base schema which the current schema will inherit from.  The

test/Expected/azure-parameter-grouping/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0
@@ -160,8 +160,7 @@ operations:
               fixed: false
               raw: Path parameter
             extensions:
-              x-ms-parameter-grouping:
-                value: true
+              x-ms-parameter-grouping: {}
             isConstant: false
             isRequired: true
             location: path

test/Expected/azure-parameter-grouping/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'
@@ -172,8 +172,7 @@ operations:
               fixed: false
               raw: Path parameter
             extensions:
-              x-ms-parameter-grouping:
-                value: true
+              x-ms-parameter-grouping: {}
             isConstant: false
             isRequired: true
             location: path

test/Expected/azure-report/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0
@@ -78,6 +78,32 @@ operations:
         name:
           fixed: false
           raw: getReport
+        parameters:
+          - collectionFormat: none
+            defaultValue:
+              fixed: false
+            deprecated: false
+            documentation:
+              fixed: false
+              raw: >-
+                If specified, qualifies the generated report further (e.g. '2.7'
+                vs '3.5' in for Python). The only effect is, that generators
+                that run all tests several times, can distinguish the generated
+                reports.
+            isConstant: false
+            isRequired: false
+            location: query
+            modelType:
+              $type: PrimaryType
+              deprecated: false
+              knownPrimaryType: string
+              name:
+                fixed: false
+                raw: String
+            name:
+              fixed: false
+              raw: qualifier
+            serializedName: qualifier
         requestContentType: application/json; charset=utf-8
         responseContentTypes:
           - application/json

test/Expected/azure-report/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'
@@ -83,20 +83,48 @@ operations:
         name:
           fixed: false
           raw: getReport
+        parameters:
+          - $id: '6'
+            collectionFormat: none
+            defaultValue:
+              fixed: false
+            deprecated: false
+            documentation:
+              fixed: false
+              raw: >-
+                If specified, qualifies the generated report further (e.g. '2.7'
+                vs '3.5' in for Python). The only effect is, that generators
+                that run all tests several times, can distinguish the generated
+                reports.
+            isConstant: false
+            isRequired: false
+            location: query
+            modelType:
+              $id: '7'
+              $type: PrimaryType
+              deprecated: false
+              knownPrimaryType: string
+              name:
+                fixed: false
+                raw: String
+            name:
+              fixed: false
+              raw: qualifier
+            serializedName: qualifier
         requestContentType: application/json; charset=utf-8
         responseContentTypes:
           - application/json
         responses:
           OK:
             body:
-              $id: '6'
+              $id: '8'
               $type: DictionaryType
               deprecated: false
               name:
                 fixed: false
               supportsAdditionalProperties: false
               valueType:
-                $id: '7'
+                $id: '9'
                 $type: PrimaryType
                 deprecated: false
                 knownPrimaryType: int
@@ -106,7 +134,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '6'
+            $ref: '8'
           isNullable: true
         serializedName: getReport
         url: /report/azure

test/Expected/azure-resource-x/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Resource Flattening for AutoRest
 errorTypes:
   - &ref_0

test/Expected/azure-resource-x/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Resource Flattening for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/azure-resource/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Resource Flattening for AutoRest
 errorTypes:
   - &ref_0

test/Expected/azure-resource/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Resource Flattening for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/azure-special-properties/code-model-v1-yaml.norm.yaml

@@ -1,15 +1,12 @@
 ---
 apiVersion: 2015-07-01-preview
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0
     $type: CompositeType
-    containsConstantProperties: false
+    containsConstantProperties: true
     deprecated: false
-    extensions:
-      requiredProperties:
-        - constantId
     name:
       fixed: false
       raw: Error
@@ -40,12 +37,13 @@ errorTypes:
       - collectionFormat: none
         defaultValue:
           fixed: false
+          raw: '1'
         deprecated: false
         documentation:
           fixed: false
-        isConstant: false
+        isConstant: true
         isReadOnly: false
-        isRequired: false
+        isRequired: true
         modelType:
           $type: PrimaryType
           deprecated: false

test/Expected/azure-special-properties/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 2015-07-01-preview
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'
@@ -113,11 +113,8 @@ headerTypes:
 modelTypes:
   - $id: '1'
     $type: CompositeType
-    containsConstantProperties: false
+    containsConstantProperties: true
     deprecated: false
-    extensions:
-      requiredProperties:
-        - constantId
     name:
       fixed: false
       raw: Error
@@ -151,12 +148,13 @@ modelTypes:
         collectionFormat: none
         defaultValue:
           fixed: false
+          raw: '1'
         deprecated: false
         documentation:
           fixed: false
-        isConstant: false
+        isConstant: true
         isReadOnly: false
-        isRequired: false
+        isRequired: true
         modelType:
           $id: '5'
           $type: PrimaryType

test/Expected/body-array/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - &ref_0

test/Expected/body-array/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - $ref: '6'

test/Expected/body-boolean.quirks/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-boolean.quirks/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-boolean/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-boolean/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-byte/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - &ref_0

test/Expected/body-byte/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - $ref: '1'

test/Expected/body-complex/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: '2016-02-29'
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 enumTypes:
   - &ref_1

test/Expected/body-complex/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: '2016-02-29'
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 enumTypes:
   - $ref: '12'

test/Expected/body-date/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-date/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-datetime-rfc1123/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-datetime-rfc1123/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-datetime/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-datetime/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-dictionary/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - &ref_0

test/Expected/body-dictionary/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - $ref: '6'

test/Expected/body-duration/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-duration/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-file/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - &ref_0

test/Expected/body-file/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - $ref: '1'

test/Expected/body-formdata/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - &ref_0

test/Expected/body-formdata/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 errorTypes:
   - $ref: '1'

test/Expected/body-integer/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-integer/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-number.quirks/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0
@@ -162,39 +162,6 @@ operations:
           isNullable: true
         serializedName: number_getInvalidDouble
         url: /number/invaliddouble
-      - defaultResponse:
-          body: *ref_0
-          isNullable: true
-        deprecated: false
-        description: Get invalid decimal Number value
-        group:
-          fixed: false
-          raw: number
-        hidden: false
-        httpMethod: get
-        isAbsoluteUrl: false
-        name:
-          fixed: false
-          raw: getInvalidDecimal
-        requestContentType: application/json; charset=utf-8
-        responseContentTypes:
-          - application/json
-        responses:
-          OK:
-            body: &ref_4
-              $type: PrimaryType
-              deprecated: false
-              format: decimal
-              knownPrimaryType: decimal
-              name:
-                fixed: false
-                raw: Decimal
-            isNullable: true
-        returnType:
-          body: *ref_4
-          isNullable: true
-        serializedName: number_getInvalidDecimal
-        url: /number/invaliddecimal
       - defaultResponse:
           body: *ref_0
           isNullable: true
@@ -264,7 +231,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_5
+            body: &ref_4
               $type: PrimaryType
               deprecated: false
               format: float
@@ -274,7 +241,7 @@ operations:
                 raw: Double
             isNullable: true
         returnType:
-          body: *ref_5
+          body: *ref_4
           isNullable: true
         serializedName: number_getBigFloat
         url: /number/big/float/3.402823e+20
@@ -347,7 +314,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_6
+            body: &ref_5
               $type: PrimaryType
               deprecated: false
               format: double
@@ -357,7 +324,7 @@ operations:
                 raw: Double
             isNullable: true
         returnType:
-          body: *ref_6
+          body: *ref_5
           isNullable: true
         serializedName: number_getBigDouble
         url: /number/big/double/2.5976931e+101
@@ -430,7 +397,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_7
+            body: &ref_6
               $type: PrimaryType
               deprecated: false
               format: double
@@ -440,7 +407,7 @@ operations:
                 raw: Double
             isNullable: true
         returnType:
-          body: *ref_7
+          body: *ref_6
           isNullable: true
         serializedName: number_getBigDoublePositiveDecimal
         url: /number/big/double/99999999.99
@@ -513,7 +480,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_8
+            body: &ref_7
               $type: PrimaryType
               deprecated: false
               format: double
@@ -523,7 +490,7 @@ operations:
                 raw: Double
             isNullable: true
         returnType:
-          body: *ref_8
+          body: *ref_7
           isNullable: true
         serializedName: number_getBigDoubleNegativeDecimal
         url: /number/big/double/-99999999.99
@@ -596,7 +563,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_9
+            body: &ref_8
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -606,7 +573,7 @@ operations:
                 raw: Decimal
             isNullable: true
         returnType:
-          body: *ref_9
+          body: *ref_8
           isNullable: true
         serializedName: number_getBigDecimal
         url: /number/big/decimal/2.5976931e+101
@@ -679,7 +646,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_10
+            body: &ref_9
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -689,7 +656,7 @@ operations:
                 raw: Decimal
             isNullable: true
         returnType:
-          body: *ref_10
+          body: *ref_9
           isNullable: true
         serializedName: number_getBigDecimalPositiveDecimal
         url: /number/big/decimal/99999999.99
@@ -762,7 +729,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_11
+            body: &ref_10
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -772,7 +739,7 @@ operations:
                 raw: Decimal
             isNullable: true
         returnType:
-          body: *ref_11
+          body: *ref_10
           isNullable: true
         serializedName: number_getBigDecimalNegativeDecimal
         url: /number/big/decimal/-99999999.99
@@ -845,7 +812,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_12
+            body: &ref_11
               $type: PrimaryType
               deprecated: false
               format: double
@@ -855,7 +822,7 @@ operations:
                 raw: Double
             isNullable: true
         returnType:
-          body: *ref_12
+          body: *ref_11
           isNullable: true
         serializedName: number_getSmallFloat
         url: /number/small/float/3.402823e-20
@@ -928,7 +895,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_13
+            body: &ref_12
               $type: PrimaryType
               deprecated: false
               format: double
@@ -938,7 +905,7 @@ operations:
                 raw: Double
             isNullable: true
         returnType:
-          body: *ref_13
+          body: *ref_12
           isNullable: true
         serializedName: number_getSmallDouble
         url: /number/small/double/2.5976931e-101
@@ -1011,7 +978,7 @@ operations:
           - application/json
         responses:
           OK:
-            body: &ref_14
+            body: &ref_13
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -1021,7 +988,7 @@ operations:
                 raw: Decimal
             isNullable: true
         returnType:
-          body: *ref_14
+          body: *ref_13
           isNullable: true
         serializedName: number_getSmallDecimal
         url: /number/small/decimal/2.5976931e-101

test/Expected/body-number.quirks/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'
@@ -175,42 +175,6 @@ operations:
           isNullable: true
         serializedName: number_getInvalidDouble
         url: /number/invaliddouble
-      - defaultResponse:
-          body:
-            $ref: '1'
-          isNullable: true
-        deprecated: false
-        description: Get invalid decimal Number value
-        group:
-          fixed: false
-          raw: number
-        hidden: false
-        httpMethod: get
-        isAbsoluteUrl: false
-        name:
-          fixed: false
-          raw: getInvalidDecimal
-        requestContentType: application/json; charset=utf-8
-        responseContentTypes:
-          - application/json
-        responses:
-          OK:
-            body:
-              $id: '9'
-              $type: PrimaryType
-              deprecated: false
-              format: decimal
-              knownPrimaryType: decimal
-              name:
-                fixed: false
-                raw: Decimal
-            isNullable: true
-        returnType:
-          body:
-            $ref: '9'
-          isNullable: true
-        serializedName: number_getInvalidDecimal
-        url: /number/invaliddecimal
       - defaultResponse:
           body:
             $ref: '1'
@@ -229,7 +193,7 @@ operations:
           fixed: false
           raw: putBigFloat
         parameters:
-          - $id: '10'
+          - $id: '9'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -242,7 +206,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '11'
+              $id: '10'
               $type: PrimaryType
               deprecated: false
               format: float
@@ -285,7 +249,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '12'
+              $id: '11'
               $type: PrimaryType
               deprecated: false
               format: float
@@ -296,7 +260,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '12'
+            $ref: '11'
           isNullable: true
         serializedName: number_getBigFloat
         url: /number/big/float/3.402823e+20
@@ -318,7 +282,7 @@ operations:
           fixed: false
           raw: putBigDouble
         parameters:
-          - $id: '13'
+          - $id: '12'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -331,7 +295,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '14'
+              $id: '13'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -374,7 +338,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '15'
+              $id: '14'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -385,7 +349,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '15'
+            $ref: '14'
           isNullable: true
         serializedName: number_getBigDouble
         url: /number/big/double/2.5976931e+101
@@ -407,7 +371,7 @@ operations:
           fixed: false
           raw: putBigDoublePositiveDecimal
         parameters:
-          - $id: '16'
+          - $id: '15'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -420,7 +384,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '17'
+              $id: '16'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -463,7 +427,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '18'
+              $id: '17'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -474,7 +438,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '18'
+            $ref: '17'
           isNullable: true
         serializedName: number_getBigDoublePositiveDecimal
         url: /number/big/double/99999999.99
@@ -496,7 +460,7 @@ operations:
           fixed: false
           raw: putBigDoubleNegativeDecimal
         parameters:
-          - $id: '19'
+          - $id: '18'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -509,7 +473,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '20'
+              $id: '19'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -552,7 +516,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '21'
+              $id: '20'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -563,7 +527,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '21'
+            $ref: '20'
           isNullable: true
         serializedName: number_getBigDoubleNegativeDecimal
         url: /number/big/double/-99999999.99
@@ -585,7 +549,7 @@ operations:
           fixed: false
           raw: putBigDecimal
         parameters:
-          - $id: '22'
+          - $id: '21'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -598,7 +562,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '23'
+              $id: '22'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -641,7 +605,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '24'
+              $id: '23'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -652,7 +616,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '24'
+            $ref: '23'
           isNullable: true
         serializedName: number_getBigDecimal
         url: /number/big/decimal/2.5976931e+101
@@ -674,7 +638,7 @@ operations:
           fixed: false
           raw: putBigDecimalPositiveDecimal
         parameters:
-          - $id: '25'
+          - $id: '24'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -687,7 +651,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '26'
+              $id: '25'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -730,7 +694,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '27'
+              $id: '26'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -741,7 +705,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '27'
+            $ref: '26'
           isNullable: true
         serializedName: number_getBigDecimalPositiveDecimal
         url: /number/big/decimal/99999999.99
@@ -763,7 +727,7 @@ operations:
           fixed: false
           raw: putBigDecimalNegativeDecimal
         parameters:
-          - $id: '28'
+          - $id: '27'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -776,7 +740,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '29'
+              $id: '28'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -819,7 +783,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '30'
+              $id: '29'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -830,7 +794,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '30'
+            $ref: '29'
           isNullable: true
         serializedName: number_getBigDecimalNegativeDecimal
         url: /number/big/decimal/-99999999.99
@@ -852,7 +816,7 @@ operations:
           fixed: false
           raw: putSmallFloat
         parameters:
-          - $id: '31'
+          - $id: '30'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -865,7 +829,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '32'
+              $id: '31'
               $type: PrimaryType
               deprecated: false
               format: float
@@ -908,7 +872,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '33'
+              $id: '32'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -919,7 +883,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '33'
+            $ref: '32'
           isNullable: true
         serializedName: number_getSmallFloat
         url: /number/small/float/3.402823e-20
@@ -941,7 +905,7 @@ operations:
           fixed: false
           raw: putSmallDouble
         parameters:
-          - $id: '34'
+          - $id: '33'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -954,7 +918,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '35'
+              $id: '34'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -997,7 +961,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '36'
+              $id: '35'
               $type: PrimaryType
               deprecated: false
               format: double
@@ -1008,7 +972,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '36'
+            $ref: '35'
           isNullable: true
         serializedName: number_getSmallDouble
         url: /number/small/double/2.5976931e-101
@@ -1030,7 +994,7 @@ operations:
           fixed: false
           raw: putSmallDecimal
         parameters:
-          - $id: '37'
+          - $id: '36'
             collectionFormat: none
             defaultValue:
               fixed: false
@@ -1043,7 +1007,7 @@ operations:
             isRequired: true
             location: body
             modelType:
-              $id: '38'
+              $id: '37'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -1086,7 +1050,7 @@ operations:
         responses:
           OK:
             body:
-              $id: '39'
+              $id: '38'
               $type: PrimaryType
               deprecated: false
               format: decimal
@@ -1097,7 +1061,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '39'
+            $ref: '38'
           isNullable: true
         serializedName: number_getSmallDecimal
         url: /number/small/decimal/2.5976931e-101

test/Expected/body-number/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/body-number/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/body-string.quirks/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 enumTypes:
   - &ref_9

test/Expected/body-string.quirks/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 enumTypes:
   - $id: '11'

test/Expected/body-string/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 enumTypes:
   - &ref_9

test/Expected/body-string/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest Swagger BAT
 enumTypes:
   - $id: '11'

test/Expected/complex-model/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 2014-04-01-preview
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Some cool documentation.
 errorTypes:
   - &ref_1

test/Expected/complex-model/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 2014-04-01-preview
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Some cool documentation.
 errorTypes:
   - $ref: '26'

test/Expected/extensible-enums-swagger/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: '2016-07-07'
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: PetStore
 enumTypes:
   - &ref_0
@@ -37,7 +37,7 @@ enumTypes:
     $type: EnumType
     deprecated: false
     modelAsExtensible: true
-    modelAsString: false
+    modelAsString: true
     name:
       fixed: false
       raw: IntEnum
@@ -131,6 +131,7 @@ modelTypes:
         extensions:
           x-ms-enum:
             modelAsExtensible: true
+            modelAsString: true
             name: IntEnum
             values:
               - allowedValues:

test/Expected/extensible-enums-swagger/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: '2016-07-07'
-baseUrl: 'https://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: PetStore
 enumTypes:
   - $ref: '5'
@@ -103,6 +103,7 @@ modelTypes:
         extensions:
           x-ms-enum:
             modelAsExtensible: true
+            modelAsString: true
             name: IntEnum
             values:
               - allowedValues:
@@ -132,7 +133,7 @@ modelTypes:
           $type: EnumType
           deprecated: false
           modelAsExtensible: true
-          modelAsString: false
+          modelAsString: true
           name:
             fixed: false
             raw: IntEnum

test/Expected/head-exceptions/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 modelsName: Models
 name: AutoRestHeadExceptionTestService

test/Expected/head-exceptions/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 modelsName: Models
 name: AutoRestHeadExceptionTestService

test/Expected/head/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 modelsName: Models
 name: AutoRestHeadTestService

test/Expected/head/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 modelsName: Models
 name: AutoRestHeadTestService

test/Expected/header/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 enumTypes:
   - &ref_0

test/Expected/header/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 enumTypes:
   - $ref: '47'

test/Expected/httpInfrastructure.quirks/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0
@@ -62,8 +62,7 @@ errorTypes:
     containsConstantProperties: false
     deprecated: false
     extensions:
-      x-ms-client-name:
-        name: MyException
+      x-ms-client-name: MyException
     name:
       fixed: false
       raw: A

test/Expected/httpInfrastructure.quirks/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'
@@ -775,8 +775,7 @@ modelTypes:
     containsConstantProperties: false
     deprecated: false
     extensions:
-      x-ms-client-name:
-        name: MyException
+      x-ms-client-name: MyException
     name:
       fixed: false
       raw: A

test/Expected/httpInfrastructure/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0
@@ -62,8 +62,7 @@ errorTypes:
     containsConstantProperties: false
     deprecated: false
     extensions:
-      x-ms-client-name:
-        name: MyException
+      x-ms-client-name: MyException
     name:
       fixed: false
       raw: A

test/Expected/httpInfrastructure/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'
@@ -775,8 +775,7 @@ modelTypes:
     containsConstantProperties: false
     deprecated: false
     extensions:
-      x-ms-client-name:
-        name: MyException
+      x-ms-client-name: MyException
     name:
       fixed: false
       raw: A

test/Expected/lro/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Long-running Operation for AutoRest
 errorTypes:
   - &ref_0

test/Expected/lro/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Long-running Operation for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/model-flattening/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Resource Flattening for AutoRest
 errorTypes:
   - &ref_0

test/Expected/model-flattening/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Resource Flattening for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/paging/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Long-running Operation for AutoRest
 modelTypes:
   - &ref_0

test/Expected/paging/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Long-running Operation for AutoRest
 modelTypes:
   - $id: '1'

test/Expected/parameter-flattening/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 codeGenExtensions:
   ft: '2'
 documentation: Resource Flattening for AutoRest

test/Expected/parameter-flattening/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 codeGenExtensions:
   ft: '2'
 documentation: Resource Flattening for AutoRest

test/Expected/report/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0
@@ -78,6 +78,32 @@ operations:
         name:
           fixed: false
           raw: getReport
+        parameters:
+          - collectionFormat: none
+            defaultValue:
+              fixed: false
+            deprecated: false
+            documentation:
+              fixed: false
+              raw: >-
+                If specified, qualifies the generated report further (e.g. '2.7'
+                vs '3.5' in for Python). The only effect is, that generators
+                that run all tests several times, can distinguish the generated
+                reports.
+            isConstant: false
+            isRequired: false
+            location: query
+            modelType:
+              $type: PrimaryType
+              deprecated: false
+              knownPrimaryType: string
+              name:
+                fixed: false
+                raw: String
+            name:
+              fixed: false
+              raw: qualifier
+            serializedName: qualifier
         requestContentType: application/json; charset=utf-8
         responseContentTypes:
           - application/json

test/Expected/report/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'
@@ -83,20 +83,48 @@ operations:
         name:
           fixed: false
           raw: getReport
+        parameters:
+          - $id: '6'
+            collectionFormat: none
+            defaultValue:
+              fixed: false
+            deprecated: false
+            documentation:
+              fixed: false
+              raw: >-
+                If specified, qualifies the generated report further (e.g. '2.7'
+                vs '3.5' in for Python). The only effect is, that generators
+                that run all tests several times, can distinguish the generated
+                reports.
+            isConstant: false
+            isRequired: false
+            location: query
+            modelType:
+              $id: '7'
+              $type: PrimaryType
+              deprecated: false
+              knownPrimaryType: string
+              name:
+                fixed: false
+                raw: String
+            name:
+              fixed: false
+              raw: qualifier
+            serializedName: qualifier
         requestContentType: application/json; charset=utf-8
         responseContentTypes:
           - application/json
         responses:
           OK:
             body:
-              $id: '6'
+              $id: '8'
               $type: DictionaryType
               deprecated: false
               name:
                 fixed: false
               supportsAdditionalProperties: false
               valueType:
-                $id: '7'
+                $id: '9'
                 $type: PrimaryType
                 deprecated: false
                 knownPrimaryType: int
@@ -106,7 +134,7 @@ operations:
             isNullable: true
         returnType:
           body:
-            $ref: '6'
+            $ref: '8'
           isNullable: true
         serializedName: getReport
         url: /report

test/Expected/required-optional/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/required-optional/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'

test/Expected/url-multi-collectionFormat/code-model-v1-yaml.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - &ref_0

test/Expected/url-multi-collectionFormat/code-model-v1.norm.yaml

@@ -1,6 +1,6 @@
 ---
 apiVersion: 1.0.0
-baseUrl: 'http://localhost'
+baseUrl: 'http://localhost:3000'
 documentation: Test Infrastructure for AutoRest
 errorTypes:
   - $ref: '1'