Merge pull request Azure#3 from deathly809/azs.update.admin

Azs.update.admin
viananth · Mar 14, 2018 · ca19566 · ca19566
2 parents 17d1ca4 + d071f01
commit ca19566
Show file tree

Hide file tree

Showing 14 changed files with 965 additions and 83 deletions.
diff --git a/specification/azsadmin/resource-manager/update/Microsoft.Update.Admin/2016-05-01/Update.json b/specification/azsadmin/resource-manager/update/Microsoft.Update.Admin/2016-05-01/Update.json
@@ -134,14 +134,6 @@
             "required": true,
             "type": "string"
         },
-        "ResourceGroupParameter": {
-            "description": "The resource group the resource is located under.",
-            "name": "resourceGroup",
-            "in": "path",
-            "type": "string",
-            "required": true,
-            "x-ms-parameter-location": "method"
-        },
         "ApiVersionParameter": {
             "name": "api-version",
             "in": "query",
@@ -164,7 +156,7 @@
             "type": "oauth2",
             "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
             "flow": "implicit",
-            "description": "Authorization uses an Azure Active Directory OAuth2 flow.",
+            "description": "Azure Active Directory OAuth2 Flow",
             "scopes": {
                 "user_impersonation": "impersonate your user account"
             }

diff --git a/...n/azsadmin/resource-manager/update/Microsoft.Update.Admin/2016-05-01/UpdateLocations.json b/...n/azsadmin/resource-manager/update/Microsoft.Update.Admin/2016-05-01/UpdateLocations.json
@@ -16,7 +16,7 @@
     "application/json"
   ],
   "paths": {
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.Update.Admin/updateLocations/": {
+    "/subscriptions/{subscriptionId}/resourcegroups/System.{location}/providers/Microsoft.Update.Admin/updateLocations/": {
       "get": {
         "x-ms-examples": {
           "Get the list of update locations.": {
@@ -33,7 +33,7 @@
             "$ref": "Update.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "Update.json#/parameters/ResourceGroupParameter"
+            "$ref": "Update.json#/parameters/LocationParameter"
           },
           {
             "$ref": "Update.json#/parameters/ApiVersionParameter"
@@ -52,7 +52,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}": {
+    "/subscriptions/{subscriptionId}/resourcegroups/System.{location}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}": {
       "get": {
         "x-ms-examples": {
           "Get an update location based on name.": {
@@ -69,7 +69,7 @@
             "$ref": "Update.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "Update.json#/parameters/ResourceGroupParameter"
+            "$ref": "Update.json#/parameters/LocationParameter"
           },
           {
             "$ref": "#/parameters/UpdateLocationParameter"
@@ -111,11 +111,11 @@
       "type": "object",
       "properties": {
         "currentVersion": {
-          "description": "Current version of your Azure Stack deployment.",
+          "description": "Current version of your AzureStack deployment.",
           "type": "string"
         },
         "currentOemVersion": {
-          "description": "Current OEM version of your Azure Stack deployment.",
+          "description": "Current OEM version of your AzureStack deployment.",
           "type": "string"
         },
         "lastUpdated": {
@@ -130,7 +130,7 @@
       }
     },
     "RegionUpdateState": {
-      "description": "State of the region in regard to the update.",
+      "description": "State of the region in regard to update.",
       "type": "string",
       "enum": [
         "Unknown",
@@ -177,7 +177,7 @@
       "type": "oauth2",
       "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
       "flow": "implicit",
-      "description": "Authorization uses an Azure Active Directory OAuth2 flow.",
+      "description": "Azure Active Directory OAuth2 Flow",
       "scopes": {
         "user_impersonation": "impersonate your user account"
       }

diff --git a/...cation/azsadmin/resource-manager/update/Microsoft.Update.Admin/2016-05-01/UpdateRuns.json b/...cation/azsadmin/resource-manager/update/Microsoft.Update.Admin/2016-05-01/UpdateRuns.json
@@ -16,7 +16,7 @@
     "application/json"
   ],
   "paths": {
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}/updates/{update}/updateRuns": {
+    "/subscriptions/{subscriptionId}/resourcegroups/System.{location}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}/updates{update}/updateRuns": {
       "get": {
         "x-ms-examples": {
           "Get the list of update run.": {
@@ -33,7 +33,7 @@
             "$ref": "Update.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "Update.json#/parameters/ResourceGroupParameter"
+            "$ref": "Update.json#/parameters/LocationParameter"
           },
           {
             "$ref": "UpdateLocations.json#/parameters/UpdateLocationParameter"
@@ -58,7 +58,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}/updates/{update}/updateRuns/{runId}": {
+    "/subscriptions/{subscriptionId}/resourcegroups/System.{location}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}/updates/{update}/updateRuns/{runId}": {
       "get": {
         "x-ms-examples": {
           "Get an update run.": {
@@ -75,7 +75,7 @@
             "$ref": "Update.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "Update.json#/parameters/ResourceGroupParameter"
+            "$ref": "Update.json#/parameters/LocationParameter"
           },
           {
             "$ref": "UpdateLocations.json#/parameters/UpdateLocationParameter"
@@ -100,7 +100,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}/updates/{update}/updateRuns/{runId}/rerun": {
+    "/subscriptions/{subscriptionId}/resourcegroups/System.{location}/providers/Microsoft.Update.Admin/updateLocations/{updateLocation}/updates/{update}/updateRuns/{runId}/rerun": {
       "post": {
         "x-ms-examples": {
           "Rerun an update.": {
@@ -117,7 +117,7 @@
             "$ref": "Update.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "Update.json#/parameters/ResourceGroupParameter"
+            "$ref": "Update.json#/parameters/LocationParameter"
           },
           {
             "$ref": "UpdateLocations.json#/parameters/UpdateLocationParameter"
@@ -133,11 +133,10 @@
           }
         ],
         "responses": {
-          "202": {
-            "description": "Accepted"
+          "200": {
+            "description": "OK"
           }
-        },
-        "x-ms-long-running-operation": true
+        }
       }
     }
   },
@@ -163,22 +162,21 @@
       "type": "object",
       "properties": {
         "progress": {
-          "description": "Current progress of update.",
+          "description": "Current progress of the update run.",
           "$ref": "#/definitions/Step"
         },
         "timeStarted": {
           "description": "Update start time.",
-          "format": "int32",
-          "type": "integer"
+          "type": "string",
+          "format": "date-time"
         },
         "duration": {
           "description": "Duration of the update.",
-          "format": "int32",
-          "type": "integer"
+          "type": "string"
         },
         "state": {
           "description": "State of the update run.",
-          "type": "string"
+          "$ref": "#/definitions/UpdateRunState"
         }
       }
     },
@@ -187,7 +185,7 @@
       "type": "object",
       "properties": {
         "value": {
-          "description": "List of update runs on this page.",
+          "description": "List of update runs.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/UpdateRun"
@@ -200,7 +198,7 @@
       }
     },
     "Step": {
-      "description": "Pageable list of update runs.",
+      "description": "Inforamtion about each step of the update process.",
       "type": "object",
       "properties": {
         "name": {
@@ -212,20 +210,20 @@
           "type": "string"
         },
         "errorMessage": {
-          "description": "Error message if any.",
+          "description": "Error message, if any.",
           "type": "string"
         },
         "status": {
           "description": "State of the step.",
           "type": "string"
         },
         "startTimeUtc": {
-          "description": "Time at which this step started running.",
+          "description": "Time at which this step started executing",
           "type": "string",
           "format": "date-time"
         },
         "endTimeUtc": {
-          "description": "Time at which this step stopped executing.",
+          "description": "Time at which this step stopped executing",
           "type": "string",
           "format": "date-time"
         },
@@ -268,7 +266,7 @@
       "type": "oauth2",
       "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
       "flow": "implicit",
-      "description": "Authorization uses an Azure Active Directory OAuth2 flow.",
+      "description": "Azure Active Directory OAuth2 Flow",
       "scopes": {
         "user_impersonation": "impersonate your user account"
       }