Added response for put and patch operation for hpcworkbench resource …

…provider (#5418) * Added response for put and patch operation and updated consortium definition * Updated examples * Fixed linter validation * Added 202 response in delete * Updated examples * Updated tags and operation API * Fixed validation errors * Fixed validation errors * Added response 200 * Updated examples * Fixed model validation error * Fixed validation error * Modified consortium property networkAcl * Fixed warning * Modifed consortium property
Azure · Dec 1, 2021 · 17a95e4 · 17a95e4
1 parent 0511392
commit 17a95e4
Show file tree

Hide file tree

Showing 35 changed files with 300 additions and 230 deletions.
diff --git a/...ch/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/accessprofiles.json b/...ch/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/accessprofiles.json
@@ -37,7 +37,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{chamberName}/accessProfiles/{name}/sync": {
       "post": {
         "tags": [
-          "AccessProfiles"
+          "accessProfiles_Sync"
         ],
         "operationId": "accessProfiles_Sync",
         "produces": [
@@ -100,9 +100,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{chamberName}/accessProfiles/{accessProfileName}": {
       "put": {
         "tags": [
-          "AccessProfiles_CreateorUpdate"
+          "accessProfiles_CreateOrUpdate"
         ],
-        "operationId": "AccessProfiles_CreateOrUpdate",
+        "operationId": "accessProfiles_CreateOrUpdate",
         "description": "Creates or updates the specified AccessProfile.",
         "consumes": [
           "application/json"
@@ -186,9 +186,9 @@
       },
       "patch": {
         "tags": [
-          "AccessProfiles_Update"
+          "accessProfiles_Update"
         ],
-        "operationId": "AccessProfiles_Update",
+        "operationId": "accessProfiles_Update",
         "description": "Updates the specified accessProfile.",
         "consumes": [
           "application/merge-patch+json",
@@ -247,6 +247,12 @@
               "$ref": "#/definitions/AccessProfile"
             }
           },
+          "201": {
+            "description": "Create successful. The operation returns the resulting Access Profile resource.",
+            "schema": {
+              "$ref": "#/definitions/AccessProfile"
+            }
+          },
           "default": {
             "description": "Default Error Response",
             "schema": {
@@ -263,9 +269,9 @@
       },
       "get": {
         "tags": [
-          "AccessProfiles_Get"
+          "accessProfiles_Get"
         ],
-        "operationId": "AccessProfiles_Get",
+        "operationId": "accessProfiles_Get",
         "description": "Gets information about the specified accessProfile.",
         "produces": [
           "application/json"
@@ -328,9 +334,9 @@
       },
       "delete": {
         "tags": [
-          "AccessProfiles_Delete"
+          "accessProfiles_Delete"
         ],
-        "operationId": "AccessProfiles_Delete",
+        "operationId": "accessProfiles_Delete",
         "description": "Deletes the specified accessProfile.",
         "produces": [
           "application/json"
@@ -380,6 +386,9 @@
           "204": {
             "description": "Request is successful. Resource with the specified name does not exist."
           },
+          "202": {
+            "description": "Accepted"
+          },
           "default": {
             "description": "",
             "schema": {
@@ -398,9 +407,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{chamberName}/accessProfiles": {
       "get": {
         "tags": [
-          "AccessProfiles_List"
+          "accessProfiles_List"
         ],
-        "operationId": "AccessProfiles_List",
+        "operationId": "accessProfiles_List",
         "description": "Lists all AccessProfiles.",
         "produces": [
           "application/json"

diff --git a/...orkbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/chambers.json b/...orkbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/chambers.json
@@ -37,7 +37,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{name}/getUploadUri": {
       "post": {
         "tags": [
-          "Chambers"
+          "chambers_GetUploadUri"
         ],
         "summary": "Gets a URI to upload files to the specified Chamber resource.",
         "operationId": "chambers_GetUploadUri",
@@ -100,7 +100,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{name}/start": {
       "post": {
         "tags": [
-          "Chambers"
+          "chambers_Start"
         ],
         "summary": "Perform Start operation.",
         "operationId": "chambers_Start",
@@ -155,7 +155,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{name}/stop": {
       "post": {
         "tags": [
-          "Chambers"
+          "chambers_Stop"
         ],
         "summary": "Perform Stop operation.",
         "operationId": "chambers_Stop",
@@ -210,7 +210,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{name}/restart": {
       "post": {
         "tags": [
-          "Chambers"
+          "chambers_Restart"
         ],
         "summary": "Perform Restart operation.",
         "operationId": "chambers_Restart",
@@ -262,13 +262,13 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{name}/updateLicense": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{name}/licenseUpdate": {
       "post": {
         "tags": [
-          "Chambers"
+          "chambers_LicenseUpdate"
         ],
-        "summary": "Perform UpdateLicenseServices operation.",
-        "operationId": "chambers_UpdateChamberLicense",
+        "summary": "Perform Update LicenseServices operation.",
+        "operationId": "chambers_LicenseUpdate",
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
@@ -324,17 +324,17 @@
         },
         "x-ms-examples": {
           "Update chamber license": {
-            "$ref": "./examples/ChambersUpdateChamberLicense.json"
+            "$ref": "./examples/ChambersLicenseUpdate.json"
           }
         }
       }
     },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers/{chamberName}": {
       "put": {
         "tags": [
-          "Chambers_CreateorUpdate"
+          "chambers_CreateOrUpdate"
         ],
-        "operationId": "Chambers_CreateOrUpdate",
+        "operationId": "chambers_CreateOrUpdate",
         "description": "Creates or updates the specified Chamber.",
         "parameters": [
           {
@@ -406,9 +406,9 @@
       },
       "patch": {
         "tags": [
-          "Chambers_Update"
+          "chambers_Update"
         ],
-        "operationId": "Chambers_Update",
+        "operationId": "chambers_Update",
         "description": "Updates the specified Chamber.",
         "consumes": [
           "application/merge-patch+json",
@@ -458,6 +458,12 @@
               "$ref": "#/definitions/Chamber"
             }
           },
+          "201": {
+            "description": "Create successful. The operation returns the resulting Chamber resource.",
+            "schema": {
+              "$ref": "#/definitions/Chamber"
+            }
+          },
           "default": {
             "description": "Default Error Response",
             "schema": {
@@ -474,9 +480,9 @@
       },
       "get": {
         "tags": [
-          "Chambers_Get"
+          "chambers_Get"
         ],
-        "operationId": "Chambers_Get",
+        "operationId": "chambers_Get",
         "description": "Gets information about the specified Chamber.",
         "parameters": [
           {
@@ -530,9 +536,9 @@
       },
       "delete": {
         "tags": [
-          "Chambers_Delete"
+          "chambers_Delete"
         ],
-        "operationId": "Chambers_Delete",
+        "operationId": "chambers_Delete",
         "description": "Deletes the specified Chamber.",
         "parameters": [
           {
@@ -573,6 +579,9 @@
           "204": {
             "description": "Request is successful. Resource with the specified name does not exist."
           },
+          "202": {
+            "description": "Accepted"
+          },
           "default": {
             "description": "",
             "schema": {
@@ -591,9 +600,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/chambers": {
       "get": {
         "tags": [
-          "Chambers_List"
+          "chambers_List"
         ],
-        "operationId": "Chambers_List",
+        "operationId": "chambers_List",
         "description": "Lists all Chambers.",
         "produces": [
           "application/json"

diff --git a/...kbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/consortium.json b/...kbench/resource-manager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/consortium.json
@@ -37,7 +37,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/consortiums/{name}/start": {
       "post": {
         "tags": [
-          "Consortiums"
+          "consortiums_Start"
         ],
         "summary": "Perform Start operation.",
         "operationId": "consortiums_Start",
@@ -92,7 +92,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/consortiums/{name}/stop": {
       "post": {
         "tags": [
-          "Consortiums"
+          "consortiums_Stop"
         ],
         "summary": "Perform Stop operation.",
         "operationId": "consortiums_Stop",
@@ -147,7 +147,7 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/consortiums/{name}/restart": {
       "post": {
         "tags": [
-          "Consortiums"
+          "consortiums_Restart"
         ],
         "summary": "Perform Restart operation.",
         "operationId": "consortiums_Restart",
@@ -202,9 +202,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/consortiums/{consortiumName}": {
       "put": {
         "tags": [
-          "Consortiums"
+          "consortiums_CreateOrUpdate"
         ],
-        "operationId": "Consortiums_CreateOrUpdate",
+        "operationId": "consortiums_CreateOrUpdate",
         "description": "Creates or updates the specified consortium.",
         "parameters": [
           {
@@ -276,9 +276,9 @@
       },
       "patch": {
         "tags": [
-          "Consortiums"
+          "consortiums_Update"
         ],
-        "operationId": "Consortiums_Update",
+        "operationId": "consortiums_Update",
         "description": "Updates the specified consortium.",
         "parameters": [
           {
@@ -346,9 +346,9 @@
       },
       "get": {
         "tags": [
-          "Consortiums"
+          "consortiums_Get"
         ],
-        "operationId": "Consortiums_Get",
+        "operationId": "consortiums_Get",
         "description": "Gets information about the specified consortium.",
         "parameters": [
           {
@@ -402,9 +402,9 @@
       },
       "delete": {
         "tags": [
-          "Consortiums"
+          "consortiums_Delete"
         ],
-        "operationId": "Consortiums_Delete",
+        "operationId": "consortiums_Delete",
         "description": "Deletes the specified consortium.",
         "parameters": [
           {
@@ -445,6 +445,9 @@
           "204": {
             "description": "Request is successful. Resource with the specified name does not exist."
           },
+          "202": {
+            "description": "Accepted"
+          },
           "default": {
             "description": "",
             "schema": {
@@ -463,9 +466,9 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/consortiums": {
       "get": {
         "tags": [
-          "Consortiums"
+          "consortiums_List"
         ],
-        "operationId": "Consortiums_List",
+        "operationId": "consortiums_List",
         "description": "Lists all consortiums.",
         "parameters": [
           {
@@ -517,10 +520,10 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.HpcWorkbench/instances/{instanceName}/consortiums/{name}/licenseAdd": {
       "post": {
         "tags": [
-          "Consortiums"
+          "consortiums_LicenseAdd"
         ],
         "description": "Add license to an HPC Workbench consortium.",
-        "operationId": "Consortiums_LicenseAdd",
+        "operationId": "consortiums_LicenseAdd",
         "consumes": [
           "application/json"
         ],
@@ -622,6 +625,10 @@
         "replyUrlOtds": {
           "description": "The reply URL of OTDS for Azure AD app.",
           "type": "string"
+        },
+        "licenseKeyUri": {
+          "description": "The license key uri.",
+          "type": "string"
         }
       },
       "description": "Etx properties."

diff --git a/...rosoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesCreateOrUpdate.json b/...rosoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesCreateOrUpdate.json
@@ -6,12 +6,11 @@
     "instanceName": "test-instance",
     "chamberName": "test-chamber",
     "accessProfileName": "test-accessprofile",
-    "accessprofile": {
+    "body": {
+      "location": "Central US",
       "properties": {
-        "location": "Central US",
-        "properties": {
-          "consortiumId": "/subscriptions/d9f252e3-8046-4707-bfbd-e5b9e6011e07/resourceGroups/resourceGroup/providers/Microsoft.HpcWorkbench/instances/test-instance/consortiums/test-consortium"
-        }
+        "consortiumId": "/subscriptions/d9f252e3-8046-4707-bfbd-e5b9e6011e07/resourceGroups/resourceGroup/providers/Microsoft.HpcWorkbench/instances/test-instance/consortiums/test-consortium",
+        "provisioningState": "Succeeded"
       }
     }
   },

diff --git a/...ager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesDelete.json b/...ager/Microsoft.HpcWorkbench/preview/2021-03-01-preview/examples/AccessProfilesDelete.json
@@ -11,6 +11,7 @@
     "200": {
       "body": {}
     },
-    "204": {}
+    "204": {},
+    "202": {}
   }
 }