diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json index ec75e8a6f0ca..cb824822a92b 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json @@ -1147,6 +1147,11 @@ "x-ms-client-flatten": true, "x-ms-client-name": "BlobServiceProperties", "description": "The properties of a storage account’s Blob service." + }, + "sku": { + "$ref": "./common.json#/definitions/Sku", + "readOnly": true, + "description": "Sku name and tier." } }, "allOf": [ diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/common.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/common.json index d36df1e92797..143c8082b56c 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/common.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/common.json @@ -86,6 +86,51 @@ } }, "description": "The service properties for soft delete." + }, + "Sku": { + "properties": { + "name": { + "$ref": "#/definitions/SkuName" + }, + "tier": { + "$ref": "#/definitions/Tier" + } + }, + "required": [ + "name" + ], + "description": "The SKU of the storage account." + }, + "SkuName": { + "type": "string", + "description": "The SKU name. Required for account creation; optional for update. Note that in older versions, SKU name was called accountType.", + "enum": [ + "Standard_LRS", + "Standard_GRS", + "Standard_RAGRS", + "Standard_ZRS", + "Premium_LRS", + "Premium_ZRS", + "Standard_GZRS", + "Standard_RAGZRS" + ], + "x-ms-enum": { + "name": "SkuName", + "modelAsString": true + } + }, + "Tier": { + "readOnly": true, + "type": "string", + "description": "The SKU tier. This is based on the SKU name.", + "enum": [ + "Standard", + "Premium" + ], + "x-ms-enum": { + "name": "SkuTier", + "modelAsString": false + } } } } diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesGet.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesGet.json index f823f3c9ce2f..26f8a731e7b4 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesGet.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesGet.json @@ -84,6 +84,10 @@ "changeFeed": { "enabled": true } + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" } } } diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesList.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesList.json index e1e805d22e6e..275aa71d4990 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesList.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesList.json @@ -85,6 +85,10 @@ "changeFeed": { "enabled": true } + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" } } ] diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesPut.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesPut.json index edb6669ab5db..d6bcf2ed6988 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesPut.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesPut.json @@ -158,6 +158,10 @@ "changeFeed": { "enabled": true } + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" } } } diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesGet.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesGet.json index fd1cf9135663..0ab631868c4a 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesGet.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesGet.json @@ -75,6 +75,10 @@ } ] } + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" } } } diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesList.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesList.json index 4bc733bf0ee5..4f9834609d37 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesList.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesList.json @@ -76,6 +76,10 @@ } ] } + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" } } ] diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesPut.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesPut.json index a99a6b58f6cf..d985c4128863 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesPut.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesPut.json @@ -140,6 +140,10 @@ } ] } + }, + "sku": { + "name": "Standard_GRS", + "tier": "Standard" } } } diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/file.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/file.json index bdf58b61f540..03684e8c5818 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/file.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/file.json @@ -441,6 +441,11 @@ "x-ms-client-flatten": true, "x-ms-client-name": "FileServiceProperties", "description": "The properties of File services in storage account." + }, + "sku": { + "$ref": "./common.json#/definitions/Sku", + "readOnly": true, + "description": "Sku name and tier." } }, "allOf": [ diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json index 3b8924b50edd..98d363d77ec9 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json @@ -1176,7 +1176,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/Sku" + "$ref": "#/definitions/SkuInformation" }, "description": "Get the list result of storage SKUs and their properties." } @@ -1211,38 +1211,13 @@ }, "description": "The CheckNameAvailability operation response." }, - "Sku": { + "SkuInformation": { "properties": { "name": { - "type": "string", - "description": "Gets or sets the SKU name. Required for account creation; optional for update. Note that in older versions, SKU name was called accountType.", - "enum": [ - "Standard_LRS", - "Standard_GRS", - "Standard_RAGRS", - "Standard_ZRS", - "Premium_LRS", - "Premium_ZRS", - "Standard_GZRS", - "Standard_RAGZRS" - ], - "x-ms-enum": { - "name": "SkuName", - "modelAsString": true - } + "$ref": "./common.json#/definitions/SkuName" }, "tier": { - "readOnly": true, - "type": "string", - "description": "Gets the SKU tier. This is based on the SKU name.", - "enum": [ - "Standard", - "Premium" - ], - "x-ms-enum": { - "name": "SkuTier", - "modelAsString": false - } + "$ref": "./common.json#/definitions/Tier" }, "resourceType": { "readOnly": true, @@ -1292,7 +1267,7 @@ "required": [ "name" ], - "description": "The SKU of the storage account." + "description": "Storage SKU and its properties" }, "CustomDomain": { "properties": { @@ -1671,7 +1646,7 @@ "StorageAccountCreateParameters": { "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "./common.json#/definitions/Sku", "description": "Required. Gets or sets the SKU name." }, "kind": { @@ -2037,7 +2012,7 @@ "StorageAccount": { "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "./common.json#/definitions/Sku", "readOnly": true, "description": "Gets the SKU." }, @@ -2204,7 +2179,7 @@ "StorageAccountUpdateParameters": { "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "./common.json#/definitions/Sku", "description": "Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS, Premium_LRS or Premium_ZRS, nor can accounts of those SKU names be updated to any other value." }, "tags": {