Skip to content
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

Jump to bottom

Swagger spec for disk.json + compute.json 2018-06 #3854

Merged
merged 14 commits into from
Sep 12, 2018
Merged

Swagger spec for disk.json + compute.json 2018-06 #3854

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4abedb1
removing resourceUpdate, adding contents to disk and snapshot
May 30, 2018
f0ae2d4
Merge https://github.com/Azure/azure-rest-api-specs
Sep 10, 2018
e30677b
adding swagger spec for disk.json 2018-06-01
Sep 10, 2018
95e04f2
Disks 2018-06-01 for Python
lmazuel Sep 10, 2018
9f5a173
update disk
Sep 10, 2018
3e7cda6
Merge https://github.com/carissasun/azure-rest-api-specs
Sep 10, 2018
f128ff0
Update readme.md
lmazuel Sep 10, 2018
58a29bf
adding compute.json changes
Sep 10, 2018
f5f7060
Merge https://github.com/carissasun/azure-rest-api-specs
Sep 10, 2018
c5cdad5
deleting duplicates
Sep 11, 2018
9dcfd8c
Fix indent
lmazuel Sep 12, 2018
3afcb2d
adding suppress
Sep 12, 2018
12bfdca
Merge https://github.com/carissasun/azure-rest-api-specs
Sep 12, 2018
5b03853
Update suppression rules
lmazuel Sep 12, 2018
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
28 changes: 25 additions & 3 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5164,11 +5164,12 @@
},
"StorageAccountType": {
"type": "string",
"description": "Specifies the storage account type for the managed disk. Possible values are: Standard_LRS, Premium_LRS, and StandardSSD_LRS.",
"description": "Specifies the storage account type for the managed disk. UltraSSD_LRS can only be used for data disks.",
"enum": [
"Standard_LRS",
"Premium_LRS",
"StandardSSD_LRS"
"StandardSSD_LRS",
"UltraSSD_LRS"
],
"x-ms-enum": {
"name": "StorageAccountTypes",
Expand All @@ -5179,7 +5180,7 @@
"properties": {
"storageAccountType": {
"$ref": "#/definitions/StorageAccountType",
"description": "Specifies the storage account type for the managed disk. Possible values are: Standard_LRS, Premium_LRS, and StandardSSD_LRS."
"description": "Specifies the storage account type for the managed disk. UltraSSD_LRS can only be used for data disks."
carissasun marked this conversation as resolved.
Show resolved Hide resolved
}
},
"allOf": [
Expand Down Expand Up @@ -5313,6 +5314,15 @@
},
"description": "Specifies the storage settings for the virtual machine disks."
},
"AdditionalCapabilities": {
"properties": {
"ultraSSDEnabled": {
"type": "boolean",
"description": "Enables or disables a capability to have 1 or more managed data disks with UltraSSD_LRS storage account on the VM or VMSS. Managed disks with storage account type UltraSSD_LRS can be added to a virtual machine or virtual machine scale set only if this property is enabled."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please fix the indent?

}
},
"description": "Enables or disables a capability on the virtual machine or virtual machine scale set"
},
"AdditionalUnattendContent": {
"properties": {
"passName": {
Expand Down Expand Up @@ -5830,6 +5840,10 @@
"$ref": "#/definitions/StorageProfile",
"description": "Specifies the storage settings for the virtual machine disks."
},
"additionalCapabilities": {
"$ref": "#/definitions/AdditionalCapabilities",
"description": "Specifies additional capabilities enabled or disabled on the virtual machine. For instance: whether the virtual machine has the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
},
"osProfile": {
"$ref": "#/definitions/OSProfile",
"description": "Specifies the operating system settings for the virtual machine."
Expand Down Expand Up @@ -7022,6 +7036,10 @@
"$ref": "#/definitions/VirtualMachineScaleSetStorageProfile",
"description": "Specifies the storage settings for the virtual machine disks."
},
"additionalCapabilities": {
"$ref": "#/definitions/AdditionalCapabilities",
"description": "Specifies additional capabilities enabled or disabled on the virtual machine in the scale set. For instance: whether the virtual machine has the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
},
"networkProfile": {
"$ref": "#/definitions/VirtualMachineScaleSetNetworkProfile",
"description": "Specifies properties of the network interfaces of the virtual machines in the scale set."
Expand Down Expand Up @@ -7588,6 +7606,10 @@
"$ref": "#/definitions/StorageProfile",
"description": "Specifies the storage settings for the virtual machine disks."
},
"additionalCapabilities": {
"$ref": "#/definitions/AdditionalCapabilities",
"description": "Specifies additional capabilities enabled or disabled on the virtual machine in the scale set. For instance: whether the virtual machine has the capability to support attaching managed data disks with UltraSSD_LRS storage account type."
},
"osProfile": {
"$ref": "#/definitions/OSProfile",
"description": "Specifies the operating system settings for the virtual machine."
Expand Down
Loading