Skip to content

[SRP] Add account sku to file/blob service response #7694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengzhou-msft merged 4 commits into from
Nov 6, 2019
Merged

[SRP] Add account sku to file/blob service response #7694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3acfb42
[SRP] Add account sku to file/blob service response
zfchen95 Nov 3, 2019
9e07a40
Fix the sku type
zfchen95 Nov 4, 2019
4600daf
Make skuName and tier common attributes
zfchen95 Nov 5, 2019
4d9474e
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
zfchen95 Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
45 changes: 45 additions & 0 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
}
4 changes: 4 additions & 0 deletions ...torage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@
"changeFeed": {
"enabled": true
}
},
"sku": {
"name": "Standard_GRS",
"tier": "Standard"
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...orage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@
"changeFeed": {
"enabled": true
}
},
"sku": {
"name": "Standard_GRS",
"tier": "Standard"
}
}
]
Expand Down
4 changes: 4 additions & 0 deletions ...torage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/BlobServicesPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@
"changeFeed": {
"enabled": true
}
},
"sku": {
"name": "Standard_GRS",
"tier": "Standard"
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...torage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@
}
]
}
},
"sku": {
"name": "Standard_GRS",
"tier": "Standard"
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions ...orage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@
}
]
}
},
"sku": {
"name": "Standard_GRS",
"tier": "Standard"
}
}
]
Expand Down
4 changes: 4 additions & 0 deletions ...torage/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/FileServicesPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@
}
]
}
},
"sku": {
"name": "Standard_GRS",
"tier": "Standard"
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/file.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
41 changes: 8 additions & 33 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -1292,7 +1267,7 @@
"required": [
"name"
],
"description": "The SKU of the storage account."
"description": "Storage SKU and its properties"
},
"CustomDomain": {
"properties": {
Expand Down Expand Up @@ -1671,7 +1646,7 @@
"StorageAccountCreateParameters": {
"properties": {
"sku": {
"$ref": "#/definitions/Sku",
"$ref": "./common.json#/definitions/Sku",
"description": "Required. Gets or sets the SKU name."
},
"kind": {
Expand Down Expand Up @@ -2037,7 +2012,7 @@
"StorageAccount": {
"properties": {
"sku": {
"$ref": "#/definitions/Sku",
"$ref": "./common.json#/definitions/Sku",
"readOnly": true,
"description": "Gets the SKU."
},
Expand Down Expand Up @@ -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": {
Expand Down