From c242706c97c356ed6aa657f6140c4621b093f67f Mon Sep 17 00:00:00 2001 From: iefgnoix Date: Tue, 19 Jun 2018 11:15:28 -0700 Subject: [PATCH] Modify Gallery Swagger According To Feedback (#3175) * Added the swagger file for the new service Gallery. * Fixed minor issues. Added an example. * Added the example for creating a gallery. * Gallery Python conf * Make the tag name plural. * Fixed description for 202 response. * Changed the operationId to conform to naming convention. * Fixed some typos. * Add default error response. Make provisioningInfo a enum type. * Fixed comments according to CR. * Updated the readme.md * Updated the example. * do some experiments. * Cleaned up unused files. * added empty example file. * Added example for GetGallery api. * Added example for DeleteGallery api. Passed the local validation. * Added example for PutGalleryImage api. Passed the local validation. * Added example for GetGalleryImage api. Passed the local validation. * Added example for DeleteGalleryImage api. Passed the local validation. * Added example for PutGalleryImageVersion api. Passed the local validation. * Added example for GetGalleryImageVersion api. Passed the local validation. * Added example for DeleteGalleryImageVersion api. Passed the local validation. * Added example for ListGalleriesInAResourceGroup api. Passed the local validation. * Added example for ListGalleriesInASubscription api. Passed the local validation. * Added example for ListGalleryImagesInGallery api. Passed the local validation. * Added example for ListGalleryImageVersionsInGalleryImage api. Passed the local validation. * Fixed typos in the example provided. * Fixed typos in the example provided. * Added the supression for gallery, gallery image, and gallery image version. * Correct the suppression. * modified the swagger. * removed the python tag in readme * Fixed some minor issues. * Added the description to gallery unique name. * Fixed the readme.md * Improved gallery image version description. * Uses CloudError to reference ApiError as Hyonho suggested. * Revert the change of the default tag in Readme.md --- .../CreateOrUpdateASimpleGallery.json | 13 ++ .../CreateOrUpdateASimpleGalleryImage.json | 16 ++ ...ateOrUpdateASimpleGalleryImageVersion.json | 25 ++- .../2018-06-01/examples/DeleteAGallery.json | 0 .../examples/DeleteAGalleryImage.json | 0 .../examples/DeleteAGalleryImageVersion.json | 0 .../2018-06-01/examples/GetAGallery.json | 0 .../2018-06-01/examples/GetAGalleryImage.json | 0 .../examples/GetAGalleryImageVersion.json | 7 +- ...leryImageVersionWithReplicationStatus.json | 7 +- .../ListGalleriesInAResourceGroup.json | 0 .../ListGalleriesInASubscription.json | 0 ...stGalleryImageVersionsInAGalleryImage.json | 7 +- .../examples/ListGalleryImagesInAGallery.json | 0 .../2018-06-01/gallery.json | 180 ++++++++---------- .../compute/resource-manager/readme.md | 10 +- 16 files changed, 148 insertions(+), 117 deletions(-) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/CreateOrUpdateASimpleGallery.json (74%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/CreateOrUpdateASimpleGalleryImage.json (76%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/CreateOrUpdateASimpleGalleryImageVersion.json (69%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/DeleteAGallery.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/DeleteAGalleryImage.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/DeleteAGalleryImageVersion.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/GetAGallery.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/GetAGalleryImage.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/GetAGalleryImageVersion.json (90%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/GetAGalleryImageVersionWithReplicationStatus.json (93%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/ListGalleriesInAResourceGroup.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/ListGalleriesInASubscription.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/ListGalleryImageVersionsInAGalleryImage.json (90%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/examples/ListGalleryImagesInAGallery.json (100%) rename specification/compute/resource-manager/Microsoft.Compute/{preview => stable}/2018-06-01/gallery.json (94%) diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGallery.json similarity index 74% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGallery.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGallery.json index 8eec105ed4a6..7198d052844e 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGallery.json @@ -37,6 +37,19 @@ "location": "West US", "name": "myGalleryName" } + }, + "202": { + "body": { + "properties": { + "description": "This is the gallery description.", + "identifier": { + "uniqueName": "{subscription-id}-MYGALLERYNAME" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "myGalleryName" + } } } } \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGalleryImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGalleryImage.json similarity index 76% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGalleryImage.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGalleryImage.json index 379b26797ae6..9c33b999dcef 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGalleryImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGalleryImage.json @@ -50,6 +50,22 @@ "location": "West US", "name": "myGalleryImageName" } + }, + "202": { + "body": { + "properties": { + "osType": "Windows", + "osState": "Generalized", + "identifier": { + "publisher": "myPublisherName", + "offer": "myOfferName", + "sku": "mySkuName" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "myGalleryImageName" + } } } } \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGalleryImageVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGalleryImageVersion.json similarity index 69% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGalleryImageVersion.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGalleryImageVersion.json index b97fe8290c6e..9988f4935959 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/CreateOrUpdateASimpleGalleryImageVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/CreateOrUpdateASimpleGalleryImageVersion.json @@ -31,7 +31,8 @@ "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}" } }, - "publishedDate": "2018-01-01" + "scaleTier": "S30", + "publishedDate": "2018-01-01T00:00:00Z" }, "provisioningState": "Updating" }, @@ -49,13 +50,33 @@ "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}" } }, - "publishedDate": "2018-01-01" + "scaleTier": "S30", + "publishedDate": "2018-01-01T00:00:00Z" }, "provisioningState": "Creating" }, "location": "West US", "name": "1.0.0" } + }, + "202": { + "body": { + "properties": { + "publishingProfile": { + "regions": ["West US", "East US"], + "source": { + "managedImage": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}" + } + }, + "scaleTier": "S30", + "publishedDate": "2018-01-01T00:00:00Z" + }, + "provisioningState": "Updating" + }, + "location": "West US", + "name": "1.0.0" + } } } } \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/DeleteAGallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/DeleteAGallery.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/DeleteAGallery.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/DeleteAGallery.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/DeleteAGalleryImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/DeleteAGalleryImage.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/DeleteAGalleryImage.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/DeleteAGalleryImage.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/DeleteAGalleryImageVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/DeleteAGalleryImageVersion.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/DeleteAGalleryImageVersion.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/DeleteAGalleryImageVersion.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGallery.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGallery.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGallery.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImage.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImage.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImage.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImageVersion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImageVersion.json similarity index 90% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImageVersion.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImageVersion.json index 6d19d13a9b08..0fc671a0152d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImageVersion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImageVersion.json @@ -31,17 +31,18 @@ "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}" } }, - "publishedDate": "2018-01-01" + "scaleTier": "S30", + "publishedDate": "2018-01-01T00:00:00Z" }, "storageProfile": { "osDiskImage": { - "sizedInGB": 10, + "sizeInGB": 10, "hostCaching": "ReadOnly" }, "dataDiskImages": [ { "lun": 1, - "sizedInGB": 10, + "sizeInGB": 10, "hostCaching": "None" } ] diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImageVersionWithReplicationStatus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImageVersionWithReplicationStatus.json similarity index 93% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImageVersionWithReplicationStatus.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImageVersionWithReplicationStatus.json index d5ae12d3bd82..672759b68213 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/GetAGalleryImageVersionWithReplicationStatus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/GetAGalleryImageVersionWithReplicationStatus.json @@ -32,17 +32,18 @@ "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}" } }, - "publishedDate": "2018-01-01" + "scaleTier": "S30", + "publishedDate": "2018-01-01T00:00:00Z" }, "storageProfile": { "osDiskImage": { - "sizedInGB": 10, + "sizeInGB": 10, "hostCaching": "ReadOnly" }, "dataDiskImages": [ { "lun": 1, - "sizedInGB": 10, + "sizeInGB": 10, "hostCaching": "None" } ] diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleriesInAResourceGroup.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleriesInAResourceGroup.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleriesInAResourceGroup.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleriesInAResourceGroup.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleriesInASubscription.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleriesInASubscription.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleriesInASubscription.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleriesInASubscription.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleryImageVersionsInAGalleryImage.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleryImageVersionsInAGalleryImage.json similarity index 90% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleryImageVersionsInAGalleryImage.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleryImageVersionsInAGalleryImage.json index 2649bddab2cb..918cdf6b69db 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleryImageVersionsInAGalleryImage.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleryImageVersionsInAGalleryImage.json @@ -19,17 +19,18 @@ "id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}" } }, - "publishedDate": "2018-01-01" + "scaleTier": "S30", + "publishedDate": "2018-01-01T00:00:00Z" }, "storageProfile": { "osDiskImage": { - "sizedInGB": 10, + "sizeInGB": 10, "hostCaching": "ReadOnly" }, "dataDiskImages": [ { "lun": 1, - "sizedInGB": 10, + "sizeInGB": 10, "hostCaching": "None" } ] diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleryImagesInAGallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleryImagesInAGallery.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/examples/ListGalleryImagesInAGallery.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/examples/ListGalleryImagesInAGallery.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/gallery.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/gallery.json similarity index 94% rename from specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/gallery.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/gallery.json index eb05993b881f..faf30fa3f808 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/preview/2018-06-01/gallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/gallery.json @@ -1,8 +1,8 @@ { "swagger": "2.0", "info": { - "title": "GalleryClient", - "description": "The Gallery Client.", + "title": "SharedImageGalleryServiceClient", + "description": "Shared Image Gallery Service Client.", "version": "2018-06-01" }, "host": "management.azure.com", @@ -81,6 +81,12 @@ "$ref": "#/definitions/Gallery" } }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/Gallery" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -165,10 +171,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -245,6 +248,12 @@ "$ref": "#/definitions/GalleryImage" } }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/GalleryImage" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -343,10 +352,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -402,7 +408,7 @@ "in": "path", "required": true, "type": "string", - "description": "The name of the gallery image version." + "description": "The name of the gallery image version. Needs to follow semantic version name pattern: The allowed characters are digit and period. Digits must be within the range of a 32-bit integer. Format: .." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -430,6 +436,12 @@ "$ref": "#/definitions/GalleryImageVersion" } }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/GalleryImageVersion" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -489,7 +501,7 @@ ], "x-ms-enum": { "name": "ReplicationStatusTypes", - "modelAsString": false + "modelAsString": true } }, { @@ -559,10 +571,7 @@ ], "responses": { "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/OperationStatusResponse" - } + "description": "OK" }, "202": { "description": "Accepted" @@ -632,7 +641,7 @@ "tags": [ "Galleries" ], - "operationId": "Galleries_ListBySubscription", + "operationId": "Galleries_List", "description": "List galleries under a subscription.", "parameters": [ { @@ -671,7 +680,7 @@ "tags": [ "GalleryImages" ], - "operationId": "GalleryImages_ListGalleryImagesByGallery", + "operationId": "GalleryImages_ListByGallery", "description": "List gallery images under a gallery.", "parameters": [ { @@ -720,7 +729,7 @@ "tags": [ "GalleryImageVersions" ], - "operationId": "GalleryImageVersions_ListGalleryImageVersionsByGalleryImage", + "operationId": "GalleryImageVersions_ListByGalleryImage", "description": "List gallery image versions under a gallery image.", "parameters": [ { @@ -820,7 +829,8 @@ "type": "string", "description": "The unique name of the gallery" } - } + }, + "description": "Describes the gallery unique name." }, "GalleryImage": { "properties":{ @@ -880,7 +890,7 @@ }, "endOfLifeDate": { "type": "string", - "format": "date", + "format": "date-time", "description": "The end of life of this gallery image." }, "identifier": { @@ -1018,9 +1028,11 @@ ] }, "storageProfile": { + "readOnly": true, "$ref": "#/definitions/GalleryImageVersionStorageProfile" }, "replicationStatus": { + "readOnly": true, "$ref": "#/definitions/ReplicationStatus" } }, @@ -1060,6 +1072,18 @@ }, "GalleryImageVersionPublishingProfile": { "properties": { + "scaleTier": { + "type": "string", + "description": "The scale tier of the gallery image version. Valid values are 'S30' and 'S100'", + "enum": [ + "S30", + "S100" + ], + "x-ms-enum": { + "name": "ScaleTier", + "modelAsString": true + } + }, "excludeFromLatest": { "type": "boolean", "description": "The flag means that if it is set to true, people deploying VMs with 'latest' as version will not use this version." @@ -1067,12 +1091,12 @@ "publishedDate": { "readOnly": true, "type": "string", - "format": "date", + "format": "date-time", "description": "The time when the gallery image version is published." }, "endOfLifeDate": { "type": "string", - "format": "date", + "format": "date-time", "description": "The end of life date of the gallery image version." } }, @@ -1086,9 +1110,11 @@ "GalleryImageVersionStorageProfile": { "properties": { "osDiskImage": { + "readOnly": true, "$ref": "#/definitions/GalleryOSDiskImage" }, "dataDiskImages": { + "readOnly": true, "type": "array", "items": { "$ref": "#/definitions/GalleryDataDiskImage" @@ -1109,6 +1135,7 @@ "GalleryDataDiskImage": { "properties": { "lun": { + "readOnly": true, "type": "integer", "format": "int32", "description": "Specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM." @@ -1123,12 +1150,14 @@ }, "GalleryDiskImage": { "properties": { - "sizedInGB": { + "sizeInGB": { + "readOnly": true, "type": "integer", "format": "int32", "description": "It indicates the size of the VHD to create." }, "hostCaching":{ + "readOnly": true, "type": "string", "description": "The host caching of the disk. Valid values are 'None', 'ReadOnly', and 'ReadWrite'", "enum": [ @@ -1147,6 +1176,7 @@ "ReplicationStatus": { "properties": { "aggregatedState": { + "readOnly": true, "type": "string", "description": "This is the aggregated replication status based on the regional replication status.", "enum": [ @@ -1157,10 +1187,11 @@ ], "x-ms-enum": { "name": "AggregatedReplicationState", - "modelAsString": false + "modelAsString": true } }, "summary": { + "readOnly": true, "type": "array", "items": { "$ref": "#/definitions/RegionalReplicationStatus" @@ -1173,10 +1204,12 @@ "RegionalReplicationStatus": { "properties": { "region": { + "readOnly": true, "type": "string", "description": "The region where the gallery image version is published to." }, "state": { + "readOnly": true, "type": "string", "description": "This is the regional replication state.", "enum": [ @@ -1187,14 +1220,16 @@ ], "x-ms-enum": { "name": "ReplicationState", - "modelAsString": false + "modelAsString": true } }, "details": { + "readOnly": true, "type": "string", "description": "The details of the replication status." }, "progress": { + "readOnly": true, "type": "integer", "format": "int32", "description": "It indicates progress of the replication job." @@ -1263,38 +1298,24 @@ "x-ms-external": true, "properties": { "error": { - "$ref": "#/definitions/CloudErrorBody" + "$ref": "#/definitions/ApiError" } }, "description": "An error response from the Gallery service." }, - "CloudErrorBody": { - "x-ms-external": true, + "ApiError": { "properties": { - "code": { - "type": "string", - "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." - }, - "message": { - "type": "string", - "description": "A message describing the error, intended to be suitable for display in a user interface." - }, - "target": { - "type": "string", - "description": "The target of the particular error. For example, the name of the property in error." - }, "details": { "type": "array", "items": { - "$ref": "#/definitions/CloudErrorBody" + "$ref": "#/definitions/ApiErrorBase" }, - "description": "A list of additional details about the error." - } - }, - "description": "An error response from the Batch service." - }, - "ApiErrorBase": { - "properties": { + "description": "The Api error details" + }, + "innererror": { + "$ref": "#/definitions/InnerError", + "description": "The Api inner error" + }, "code": { "type": "string", "description": "The error code." @@ -1308,34 +1329,10 @@ "description": "The error message." } }, - "description": "Api error base." - }, - "InnerError": { - "properties": { - "exceptiontype": { - "type": "string", - "description": "The exception type." - }, - "errordetail": { - "type": "string", - "description": "The internal error message or exception dump." - } - }, - "description": "Inner error details." + "description": "Api error." }, - "ApiError": { + "ApiErrorBase": { "properties": { - "details": { - "type": "array", - "items": { - "$ref": "#/definitions/ApiErrorBase" - }, - "description": "The Api error details" - }, - "innererror": { - "$ref": "#/definitions/InnerError", - "description": "The Api inner error" - }, "code": { "type": "string", "description": "The error code." @@ -1349,39 +1346,20 @@ "description": "The error message." } }, - "description": "Api error." + "description": "Api error base." }, - "OperationStatusResponse": { + "InnerError": { "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Operation ID" - }, - "status": { - "readOnly": true, - "type": "string", - "description": "Operation status" - }, - "startTime": { - "readOnly": true, + "exceptiontype": { "type": "string", - "format": "date-time", - "description": "Start time of the operation" + "description": "The exception type." }, - "endTime": { - "readOnly": true, + "errordetail": { "type": "string", - "format": "date-time", - "description": "End time of the operation" - }, - "error": { - "readOnly": true, - "$ref": "#/definitions/ApiError", - "description": "Api error" + "description": "The internal error message or exception dump." } }, - "description": "Operation status response" + "description": "Inner error details." }, "Resource": { "description": "The Resource model definition.", diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 3617b34b3e1d..86be440aef55 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -163,17 +163,17 @@ directive: ``` -### Tag: package-gallery-2018-06 +### Tag: package-2018-06-01 -These settings apply only when `--tag=package-gallery-2018-06` is specified on the command line. +These settings apply only when `--tag=package-2018-06-01` is specified on the command line. -``` yaml $(tag) == 'package-gallery-2018-06' +``` yaml $(tag) == 'package-2018-06-01' input-file: -- Microsoft.Compute/preview/2018-06-01/gallery.json - Microsoft.Compute/stable/2018-04-01/compute.json - Microsoft.Compute/stable/2018-04-01/runCommands.json - Microsoft.Compute/stable/2017-09-01/skus.json - Microsoft.Compute/stable/2018-04-01/disk.json +- Microsoft.Compute/stable/2018-06-01/gallery.json - Microsoft.ContainerService/stable/2017-01-31/containerService.json ``` @@ -183,7 +183,7 @@ These settings apply only when `--tag=package-gallery-only-2018-06` is specified ``` yaml $(tag) == 'package-gallery-only-2018-06' input-file: -- Microsoft.Compute/preview/2018-06-01/gallery.json +- Microsoft.Compute/stable/2018-06-01/gallery.json ``` ### Tag: package-2018-04-01