-
Notifications
You must be signed in to change notification settings - Fork 5.6k
DiskRP swagger change for api version 2020-06-30 #10208
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 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
394e7e5
Copy disk.json from old release
laurawu19 be3eff2
Modify disk.json and examples
laurawu19 82cd567
Add diskState to snapshotProperties.git status
laurawu19 3452a21
Update readme.md
laurawu19 2d0ee47
Address comments and add example for ultra disk created with logicalS…
laurawu19 c3dffea
Address comments and add example for ultra disk created with logicalS…
laurawu19 9e46c69
Resolve conflicts
laurawu19 22aed43
Add new api listDiskEncryptionSetAssociatedResources
laurawu19 ceeb11e
set default value
laurawu19 892b663
Update description in disk.json
laurawu19 c921cf7
Merge remote-tracking branch 'upstream/master'
laurawu19 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
32 changes: 32 additions & 0 deletions
32
...pute/resource-manager/Microsoft.Compute/stable/2020-06-30/examples/CreateADiskAccess.json
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 |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "api-version": "2020-06-30", | ||
| "diskAccessName": "myDiskAccess", | ||
| "diskAccess": { | ||
| "location": "West US" | ||
| } | ||
| }, | ||
| "responses": { | ||
| "202": { | ||
| "body": { | ||
| "name": "myDiskAccess", | ||
| "location": "West US", | ||
| "type": "Microsoft.Compute/diskAccesses" | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "name": "myDiskAccess", | ||
| "id": "/subscriptions/{subscription-id}/resourceGroups/myResourcegroup/providers/Microsoft.Compute/diskAccesses/myDiskAccess", | ||
| "type": "Microsoft.Compute/diskAccesses", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Succeeded", | ||
| "timeCreated": "2020-05-01T04:41:35.079872+00:00" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
...source-manager/Microsoft.Compute/stable/2020-06-30/examples/CreateADiskEncryptionSet.json
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 |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "api-version": "2020-06-30", | ||
| "diskEncryptionSetName": "myDiskEncryptionSet", | ||
| "diskEncryptionSet": { | ||
| "location": "West US", | ||
| "identity": { | ||
| "type": "SystemAssigned" | ||
| }, | ||
| "properties": { | ||
| "activeKey": { | ||
| "sourceVault": { | ||
| "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" | ||
| }, | ||
| "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" | ||
| }, | ||
| "encryptionType": "EncryptionAtRestWithCustomerKey" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "202": { | ||
| "body": { | ||
| "name": "myDiskEncryptionSet", | ||
| "location": "West US", | ||
| "identity": { | ||
| "type": "SystemAssigned" | ||
| }, | ||
| "properties": { | ||
| "activeKey": { | ||
| "sourceVault": { | ||
| "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" | ||
| }, | ||
| "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" | ||
| }, | ||
| "encryptionType": "EncryptionAtRestWithCustomerKey", | ||
| "previousKeys": [] | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "name": "myDiskEncryptionSet", | ||
| "location": "West US", | ||
| "identity": { | ||
| "type": "SystemAssigned" | ||
| }, | ||
| "properties": { | ||
| "activeKey": { | ||
| "sourceVault": { | ||
| "id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVMVault" | ||
| }, | ||
| "keyUrl": "https://myvmvault.vault-int.azure-int.net/keys/{key}" | ||
| }, | ||
| "encryptionType": "EncryptionAtRestWithCustomerKey", | ||
| "previousKeys": [] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
...er/Microsoft.Compute/stable/2020-06-30/examples/CreateAManagedDiskByCopyingASnapshot.json
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "api-version": "2020-06-30", | ||
| "diskName": "myDisk", | ||
| "disk": { | ||
| "location": "West US", | ||
| "properties": { | ||
| "creationData": { | ||
| "createOption": "Copy", | ||
| "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "202": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "creationData": { | ||
| "createOption": "Copy", | ||
| "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "creationData": { | ||
| "createOption": "Copy", | ||
| "sourceResourceId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/snapshots/mySnapshot" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
...6-30/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromADifferentSubscription.json
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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "api-version": "2020-06-30", | ||
| "diskName": "myDisk", | ||
| "disk": { | ||
| "location": "West US", | ||
| "properties": { | ||
| "creationData": { | ||
| "createOption": "Import", | ||
| "storageAccountId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", | ||
| "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "202": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "creationData": { | ||
| "createOption": "Import", | ||
| "storageAccountId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", | ||
| "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "creationData": { | ||
| "createOption": "Import", | ||
| "storageAccountId": "subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myStorageAccount", | ||
| "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
...0-06-30/examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromTheSameSubscription.json
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "api-version": "2020-06-30", | ||
| "diskName": "myDisk", | ||
| "disk": { | ||
| "location": "West US", | ||
| "properties": { | ||
| "creationData": { | ||
| "createOption": "Import", | ||
| "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "202": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "creationData": { | ||
| "createOption": "Import", | ||
| "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "creationData": { | ||
| "createOption": "Import", | ||
| "sourceUri": "https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...er/Microsoft.Compute/stable/2020-06-30/examples/CreateAManagedDiskFromAPlatformImage.json
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 |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "{subscription-id}", | ||
| "resourceGroupName": "myResourceGroup", | ||
| "api-version": "2020-06-30", | ||
| "diskName": "myDisk", | ||
| "disk": { | ||
| "location": "West US", | ||
| "properties": { | ||
| "osType": "Windows", | ||
| "creationData": { | ||
| "createOption": "FromImage", | ||
| "imageReference": { | ||
| "id": "/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "202": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "osType": "Windows", | ||
| "creationData": { | ||
| "createOption": "FromImage", | ||
| "imageReference": { | ||
| "id": "/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "name": "myDisk", | ||
| "location": "West US", | ||
| "properties": { | ||
| "provisioningState": "Updating", | ||
| "osType": "Windows", | ||
| "creationData": { | ||
| "createOption": "FromImage", | ||
| "imageReference": { | ||
| "id": "/Subscriptions/{subscriptionId}/Providers/Microsoft.Compute/Locations/uswest/Publishers/Microsoft/ArtifactTypes/VMImage/Offers/{offer}" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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.