-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Swagger spec for disk.json + compute.json 2018-06 #3854
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.
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
Merged
Changes from 9 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
f0ae2d4
Merge https://github.com/Azure/azure-rest-api-specs
e30677b
adding swagger spec for disk.json 2018-06-01
95e04f2
Disks 2018-06-01 for Python
lmazuel 9f5a173
update disk
3e7cda6
Merge https://github.com/carissasun/azure-rest-api-specs
f128ff0
Update readme.md
lmazuel 58a29bf
adding compute.json changes
f5f7060
Merge https://github.com/carissasun/azure-rest-api-specs
c5cdad5
deleting duplicates
9dcfd8c
Fix indent
lmazuel 3afcb2d
adding suppress
12bfdca
Merge https://github.com/carissasun/azure-rest-api-specs
5b03853
Update suppression rules
lmazuel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5165,10 +5165,13 @@ | |
"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", | ||
|
@@ -5180,6 +5183,7 @@ | |
"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." | ||
} | ||
}, | ||
"allOf": [ | ||
|
@@ -5313,6 +5317,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." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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": { | ||
|
@@ -5830,6 +5843,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." | ||
|
@@ -7022,6 +7039,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." | ||
|
@@ -7588,6 +7609,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." | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.