Skip to content

Commit

Permalink
sync with diskRP 2021-12-01 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
grizzlytheodore committed Feb 28, 2022
1 parent f9be196 commit d7378eb
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@
"Create a managed disk and associate with disk access resource.": {
"$ref": "./examples/diskExamples/Disk_Create_WithDiskAccess.json"
},
"Create a managed disk with dataAccessAuthMode": {
"$ref": "./examples/diskExamples/Disk_Create_WithDataAccessAuthMode.json"
},
"Create a managed disk and associate with disk encryption set.": {
"$ref": "./examples/diskExamples/Disk_Create_WithDiskEncryptionSet.json"
},
Expand Down Expand Up @@ -195,6 +198,9 @@
},
"Update a managed disk to change tier.": {
"$ref": "./examples/diskExamples/Disk_Update_ChangeTier.json"
},
"Update a managed disk to add architecture.": {
"$ref": "./examples/diskExamples//Disk_Update_ToAddArchitecture.json"
}
}
},
Expand Down Expand Up @@ -715,6 +721,9 @@
},
"publicNetworkAccess": {
"$ref": "./diskRPCommon.json#/definitions/PublicNetworkAccess"
},
"dataAccessAuthMode": {
"$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode"
}
},
"required": [
Expand Down Expand Up @@ -795,7 +804,7 @@
},
"supportedCapabilities": {
"$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities",
"description": "List of supported capabilities (like accelerated networking) to be added on the OS disk."
"description": "List of supported capabilities to be added on the OS disk."
},
"propertyUpdatesInProgress": {
"readOnly": true,
Expand All @@ -808,6 +817,9 @@
},
"publicNetworkAccess": {
"$ref": "./diskRPCommon.json#/definitions/PublicNetworkAccess"
},
"dataAccessAuthMode": {
"$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode"
}
},
"description": "Disk resource update properties."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,21 @@
"acceleratedNetwork": {
"type": "boolean",
"description": "True if the image from which the OS disk is created supports accelerated networking."
},
"architecture": {
"type": "string",
"description": "CPU architecture supported by an OS disk.",
"enum": [
"x64",
"Arm64"
],
"x-ms-enum": {
"name": "Architecture",
"modelAsString": true
}
}
},
"description": "List of supported capabilities (like accelerated networking) persisted on the disk resource for VM use."
"description": "List of supported capabilities persisted on the disk resource for VM use."
},
"DiskSecurityType": {
"type": "string",
Expand Down Expand Up @@ -508,6 +520,28 @@
}
},
"description": "A disk access SAS uri."
},
"DataAccessAuthMode": {
"type": "string",
"description": "Additional authentication requirements when exporting or uploading to a disk or snapshot.",
"enum": [
"AzureActiveDirectory",
"None"
],
"x-ms-enum": {
"name": "DataAccessAuthMode",
"modelAsString": true,
"values": [
{
"value": "AzureActiveDirectory",
"description": "When export/upload URL is used, the system checks if the user has an identity in Azure Active Directory and has necessary permissions to export/upload the data. Please refer to aka.ms/DisksAzureADAuth."
},
{
"value": "None",
"description": "No additional authentication would be performed when accessing export/upload URL."
}
]
}
}
},
"parameters": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
},
"supportedCapabilities": {
"$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities",
"description": "List of supported capabilities (like accelerated networking) for the image from which the OS disk was created."
"description": "List of supported capabilities for the image from which the OS disk was created."
},
"familyId": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"api-version": "2022-03-02",
"diskName": "myDisk",
"disk": {
"location": "West US",
"properties": {
"creationData": {
"createOption": "Empty"
},
"diskSizeGB": 200,
"dataAccessAuthMode": "AzureActiveDirectory"
}
}
},
"responses": {
"202": {
"body": {
"properties": {
"creationData": {
"createOption": "Empty"
},
"diskSizeGB": 200,
"provisioningState": "Updating"
},
"location": "West US",
"name": "myDisk"
}
},
"200": {
"body": {
"properties": {
"creationData": {
"createOption": "Empty"
},
"diskSizeGB": 200,
"provisioningState": "Succeeded",
"dataAccessAuthMode": "AzureActiveDirectory"
},
"location": "West US",
"name": "myDisk"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"api-version": "2022-03-02",
"diskName": "myDisk",
"disk": {
"properties": {
"supportedCapabilities": {
"architecture": "Arm64"
}
}
}
},
"responses": {
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDisk?api-version=2021-12-01"
},
"body": {
"name": "myDisk",
"location": "westus",
"sku": {
"name": "Standard_LRS",
"tier": "Standard"
},
"properties": {
"osType": "Windows",
"hyperVGeneration": "V1",
"supportedCapabilities": {
"architecture": "Arm64"
},
"creationData": {
"createOption": "FromImage",
"imageReference": {
"id": "/Subscriptions/{subscription-id}/Providers/Microsoft.Compute/Locations/westus/Publishers/test_test_pmc2pc1/ArtifactTypes/VMImage/Offers/marketplace_vm_test/Skus/test_sku/Versions/1.0.0"
}
},
"diskSizeGB": 127,
"provisioningState": "Updating"
}
}
},
"200": {
"body": {
"name": "myDisk",
"location": "westus",
"sku": {
"name": "Standard_LRS",
"tier": "Standard"
},
"properties": {
"osType": "Windows",
"hyperVGeneration": "V1",
"supportedCapabilities": {
"architecture": "Arm64"
},
"creationData": {
"createOption": "FromImage",
"imageReference": {
"id": "/Subscriptions/{subscription-id}/Providers/Microsoft.Compute/Locations/westus/Publishers/test_test_pmc2pc1/ArtifactTypes/VMImage/Offers/marketplace_vm_test/Skus/test_sku/Versions/1.0.0"
}
},
"diskSizeGB": 127,
"provisioningState": "Succeeded"
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
},
"supportedCapabilities": {
"$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities",
"description": "List of supported capabilities (like Accelerated Networking) for the image from which the source disk from the snapshot was originally created."
"description": "List of supported capabilities for the image from which the source disk from the snapshot was originally created."
},
"creationData": {
"$ref": "./diskRPCommon.json#/definitions/CreationData",
Expand Down Expand Up @@ -586,6 +586,9 @@
"completionPercent": {
"type": "number",
"description": "Percentage complete for the background copy when a resource is created via the CopyStart operation."
},
"dataAccessAuthMode": {
"$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode"
}
},
"required": [
Expand Down Expand Up @@ -634,9 +637,12 @@
"publicNetworkAccess": {
"$ref": "./diskRPCommon.json#/definitions/PublicNetworkAccess"
},
"dataAccessAuthMode": {
"$ref": "./diskRPCommon.json#/definitions/DataAccessAuthMode"
},
"supportedCapabilities": {
"$ref": "./diskRPCommon.json#/definitions/SupportedCapabilities",
"description": "List of supported capabilities (like accelerated networking) for the image from which the OS disk was created."
"description": "List of supported capabilities for the image from which the OS disk was created."
}
},
"description": "Snapshot resource update properties."
Expand Down

0 comments on commit d7378eb

Please sign in to comment.