Remove hostnameprefix from properties and make checknameavailability … (

#1054) * Remove hostnameprefix from properties and make checknameavailability regional * Remove 201 response declaration from the swagger spec
Azure · Jan 15, 2020 · a85c88f · a85c88f
1 parent 98ec3bd
commit a85c88f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 51 deletions.
diff --git a/...ger/Microsoft.SpoolService/preview/2019-10-10-preview/examples/checkNameAvailability.json b/...ger/Microsoft.SpoolService/preview/2019-10-10-preview/examples/checkNameAvailability.json
@@ -1,6 +1,7 @@
 {
   "parameters": {
     "subscriptionId": "12345",
+    "location": "westus2",
     "api-version": "2019-10-10-preview",
     "nameAvailabilityParameters": {
       "type": "Microsoft.SpoolService/spools",

diff --git a/...ce-manager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/createOrUpdate.json b/...ce-manager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/createOrUpdate.json
@@ -7,8 +7,7 @@
     "parameters": {
       "location": "West US",
       "properties": {
-        "hostNamePrefix": "MySpoolService"
-      }      
+      }
     }
   },
   "responses": {
@@ -22,27 +21,8 @@
         "type": "Microsoft.SpoolService/spools",
         "location": "West US",
         "properties": {
-          "provisioningState": "Updating",
-          "hostName": "MySpoolService.service.spool.net",
-          "hostNamePrefix": "MySpoolService",
-          "version": "0.2.0",
-          "optionalFeatures": []
-        }
-      }
-    },
-    "201": {
-      "headers": {
-        "Azure-AsyncOperation": "http://management.azure.com/subscriptions/12345/providers/Microsoft.SpoolService/operations/67890"
-      },
-      "body": {
-        "id": "/subscriptions/12345/resourceGroups/MyResourceGroup/providers/Microsoft.SpoolService/spools/MySpoolResource",
-        "name": "MySpoolResource",
-        "type": "Microsoft.SpoolService/spools",
-        "location": "West US",
-        "properties": {
-          "provisioningState": "Creating",
-          "hostName": "MySpoolService.service.spool.net",
-          "hostNamePrefix": "MySpoolService",
+          "provisioningState": "Succeeded",
+          "hostName": "myspoolservice.service.spool.net",
           "version": "0.2.0",
           "optionalFeatures": []
         }

diff --git a/...pool/resource-manager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/get.json b/...pool/resource-manager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/get.json
@@ -14,8 +14,7 @@
         "location": "West US",
         "properties": {
           "provisioningState": "Running",
-          "hostNamePrefix": "MySpoolService",
-          "hostName": "MySpoolService.service.spool.net",
+          "hostName": "myspoolservice.service.spool.net",
           "version": "0.2.0",
           "optionalFeatures": []
         }

diff --git a/...nager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/listByResourceGroup.json b/...nager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/listByResourceGroup.json
@@ -11,8 +11,7 @@
           {
             "properties": {
               "provisioningState": "Running",
-              "hostName": "MySpoolService.service.spool.net",
-              "hostNamePrefix": "MySpoolService",
+              "hostName": "myspoolservice.service.spool.net",
               "version": "0.2.0",
               "optionalFeatures": []
             }

diff --git a/...anager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/listBySubscription.json b/...anager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/listBySubscription.json
@@ -10,8 +10,7 @@
           {
             "properties": {
               "provisioningState": "Running",
-              "hostName": "MySpoolService.service.spool.net",
-              "hostNamePrefix": "MySpoolService",
+              "hostName": "myspoolservice.service.spool.net",
               "version": "0.2.0",
               "optionalFeatures": []
             }

diff --git a/...l/resource-manager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/update.json b/...l/resource-manager/Microsoft.SpoolService/preview/2019-10-10-preview/examples/update.json
@@ -7,8 +7,7 @@
     "parameters": {
       "location": "West US",
       "properties": {
-        "hostNamePrefix": "MySpoolService"
-      }      
+      }
     }
   },
   "responses": {
@@ -20,8 +19,7 @@
         "location": "West US",
         "properties": {
           "provisioningState": "Running",
-          "hostName": "MySpoolService.service.spool.net",
-          "hostNamePrefix": "MySpoolService",
+          "hostName": "myspoolservice.service.spool.net",
           "version": "0.2.0",
           "optionalFeatures": []
         }

diff --git a/...ation/spool/resource-manager/Microsoft.SpoolService/preview/2019-10-10-preview/spool.json b/...ation/spool/resource-manager/Microsoft.SpoolService/preview/2019-10-10-preview/spool.json
@@ -49,7 +49,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/providers/Microsoft.SpoolService/checkNameAvailability": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.SpoolService/locations/{location}/checkNameAvailability": {
       "post": {
         "description": "Checks that the Spool name is valid and is not already in use.",
         "operationId": "Spool_CheckNameAvailability",
@@ -69,6 +69,13 @@
           },
           {
             "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "location",
+            "in": "path",
+            "description": "Region in which the name must be available.",
+            "required": true,
+            "type": "string"
           }
         ],
         "consumes": [ "application/json" ],
@@ -301,12 +308,6 @@
               "$ref": "#/definitions/SpoolResource"
             }
           },
-          "201": {
-            "description": "Created. The response describes the new service and contains an Azure-AsyncOperation header to query the operation result.",
-            "schema": {
-              "$ref": "#/definitions/SpoolResource"
-            }
-          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -778,12 +779,8 @@
             "modelAsString": true
           }
         },
-        "hostNamePrefix": {
-          "description": "Prefix for the hostName of the Spool service. \r\nThe hostname will be of format: &lt;hostNamePrefix&gt;.spool.azure.net.",
-          "type": "string"
-        },
         "hostName": {
-          "description": "FQDN of the Spool service instance. Format: xxx.service.Spool.net",
+          "description": "FQDN of the Spool service instance. Format: xxx.westus2.service.Spool.net",
           "type": "string",
           "readOnly": true
         },
@@ -807,10 +804,7 @@
             }
           }
         }
-      },
-      "required": [
-        "hostNamePrefix"
-      ]
+      }
     },
     "SpoolKeys": {
       "description": "A class representing the access keys of Spool service.",
@@ -888,5 +882,4 @@
       "x-ms-parameter-location": "method"
     }
   }
-
-}
+}