From 4abedb1c096796557fdd029401f3d317f99c7f61 Mon Sep 17 00:00:00 2001 From: Carissa Sun Date: Wed, 30 May 2018 11:54:20 -0700 Subject: [PATCH 01/10] removing resourceUpdate, adding contents to disk and snapshot --- .../stable/2018-04-01/disk.json | 45 +++++++++---------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json index 37a2548132f3..7b4dd7e61029 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-04-01/disk.json @@ -710,21 +710,6 @@ ], "x-ms-azure-resource": true }, - "ResourceUpdate": { - "description": "The Resource model definition.", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - }, - "sku": { - "$ref": "#/definitions/DiskSku" - } - } - }, "Disk": { "properties": { "managedBy": { @@ -759,13 +744,18 @@ "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/DiskUpdateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "sku": { + "$ref": "#/definitions/DiskSku" } }, - "allOf": [ - { - "$ref": "#/definitions/ResourceUpdate" - } - ], "description": "Disk update resource." }, "DiskList": { @@ -1083,13 +1073,18 @@ "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/DiskUpdateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "sku": { + "$ref": "#/definitions/SnapshotSku" } }, - "allOf": [ - { - "$ref": "#/definitions/ResourceUpdate" - } - ], "description": "Snapshot update resource." }, "SnapshotList": { From e30677b7d8d1d80552dda038a4bcc777d00fc72f Mon Sep 17 00:00:00 2001 From: Carissa Sun Date: Mon, 10 Sep 2018 11:51:12 -0700 Subject: [PATCH 02/10] adding swagger spec for disk.json 2018-06-01 --- .../stable/2018-06-01/disk.json | 1207 +++++++++++++++++ .../compute/resource-manager/readme.md | 4 +- 2 files changed, 1209 insertions(+), 2 deletions(-) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json new file mode 100644 index 000000000000..b010c19e6154 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json @@ -0,0 +1,1207 @@ +{ + "swagger": "2.0", + "info": { + "title": "DiskResourceProviderClient", + "description": "The Disk Resource Provider Client.", + "version": "2018-06-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}": { + "put": { + "tags": [ + "Disks" + ], + "operationId": "Disks_CreateOrUpdate", + "description": "Creates or updates a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "disk", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Disk" + }, + "description": "Disk object supplied in the body of the Put disk operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Disk" + } + }, + "202": { + "description":"Accepted", + "schema": { + "$ref": "#/definitions/Disk" + } + } + }, + "x-ms-examples": { + "Create an empty managed disk.": { + "$ref": "./examples/CreateAnEmptyManagedDisk.json" + }, + "Create a managed disk from a platform image.": { + "$ref": "./examples/CreateAManagedDiskFromAPlatformImage.json" + }, + "Create a managed disk from an existing managed disk in the same or different subscription.": { + "$ref": "./examples/CreateAManagedDiskFromAnExistingManagedDisk.json" + }, + "Create a managed disk by importing an unmanaged blob from the same subscription.": { + "$ref": "./examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromTheSameSubscription.json" + }, + "Create a managed disk by importing an unmanaged blob from a different subscription.": { + "$ref": "./examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromADifferentSubscription.json" + }, + "Create a managed disk by copying a snapshot.": { + "$ref": "./examples/CreateAManagedDiskByCopyingASnapshot.json" + } + }, + "x-ms-long-running-operation": true + }, + "patch": { + "tags": [ + "Disks" + ], + "operationId": "Disks_Update", + "description": "Updates (patches) a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "disk", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/DiskUpdate" + }, + "description": "Disk object supplied in the body of the Patch disk operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Disk" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/Disk" + } + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "Disks" + ], + "operationId": "Disks_Get", + "description": "Gets information about a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Disk" + } + } + }, + "x-ms-examples": { + "Get information about a managed disk.": { + "$ref": "./examples/GetInformationAboutAManagedDisk.json" + } + } + }, + "delete": { + "tags": [ + "Disks" + ], + "operationId": "Disks_Delete", + "description": "Deletes a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "If the disk is deleted, this is an expected error code." + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks": { + "get": { + "tags": [ + "Disks" + ], + "operationId": "Disks_ListByResourceGroup", + "description": "Lists all the disks under a resource group.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DiskList" + } + } + }, + "x-ms-examples": { + "List all managed disks in a resource group.": { + "$ref": "./examples/ListManagedDisksInAResourceGroup.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks": { + "get": { + "tags": [ + "Disks" + ], + "operationId": "Disks_List", + "description": "Lists all the disks under a subscription.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DiskList" + } + } + }, + "x-ms-examples": { + "List all managed disks in a subscription.": { + "$ref": "./examples/ListManagedDisksInASubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/beginGetAccess": { + "post": { + "tags": [ + "Disks" + ], + "operationId": "Disks_GrantAccess", + "description": "Grants access to a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "grantAccessData", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GrantAccessData" + }, + "description": "Access data object supplied in the body of the get disk access operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AccessUri" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/endGetAccess": { + "post": { + "tags": [ + "Disks" + ], + "operationId": "Disks_RevokeAccess", + "description": "Revokes access to a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}": { + "put": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_CreateOrUpdate", + "description": "Creates or updates a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "snapshot", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Snapshot" + }, + "description": "Snapshot object supplied in the body of the Put disk operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Snapshot" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/Snapshot" + } + } + }, + "x-ms-examples": { + "Create a snapshot from an existing snapshot in the same or a different subscription.": { + "$ref": "./examples/CreateASnapshotFromAnExistingSnapshot.json" + }, + "Create a snapshot by importing an unmanaged blob from the same subscription.": { + "$ref": "./examples/CreateASnapshotByImportingAnUnmanagedBlobFromTheSameSubscription.json" + }, + "Create a snapshot by importing an unmanaged blob from a different subscription.": { + "$ref": "./examples/CreateASnapshotByImportingAnUnmanagedBlobFromADifferentSubscription.json" + } + }, + "x-ms-long-running-operation": true + }, + "patch": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Update", + "description": "Updates (patches) a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "snapshot", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/SnapshotUpdate" + }, + "description": "Snapshot object supplied in the body of the Patch snapshot operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Snapshot" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/Snapshot" + } + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Get", + "description": "Gets information about a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Snapshot" + } + } + }, + "x-ms-examples": { + "Get information about a snapshot.": { + "$ref": "./examples/GetInformationAboutASnapshot.json" + } + } + }, + "delete": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Delete", + "description": "Deletes a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "If the snapshot is deleted, this is an expected error code." + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots": { + "get": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_ListByResourceGroup", + "description": "Lists snapshots under a resource group.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SnapshotList" + } + } + }, + "x-ms-examples": { + "List all snapshots in a resource group.": { + "$ref": "./examples/ListSnapshotsInAResourceGroup.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/snapshots": { + "get": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_List", + "description": "Lists snapshots under a subscription.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SnapshotList" + } + } + }, + "x-ms-examples": { + "List all snapshots in a subscription.": { + "$ref": "./examples/ListSnapshotsInASubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/beginGetAccess": { + "post": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_GrantAccess", + "description": "Grants access to a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "grantAccessData", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GrantAccessData" + }, + "description": "Access data object supplied in the body of the get snapshot access operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AccessUri" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/endGetAccess": { + "post": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_RevokeAccess", + "description": "Revokes access to a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + } + } + }, + "definitions": { + "Resource": { + "description": "The Resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type" + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } + }, + "required": [ + "location" + ], + "x-ms-azure-resource": true + }, + "Disk": { + "properties": { + "managedBy": { + "readOnly": true, + "type": "string", + "description": "A relative URI containing the ID of the VM that has the disk attached." + }, + "sku": { + "$ref": "#/definitions/DiskSku" + }, + "zones": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The Logical zone list for Disk." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/DiskProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "Disk resource." + }, + "DiskUpdate": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/DiskUpdateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "sku": { + "$ref": "#/definitions/DiskSku" + } + }, + "description": "Disk update resource." + }, + "DiskList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Disk" + }, + "description": "A list of disks." + }, + "nextLink": { + "type": "string", + "description": "The uri to fetch the next page of disks. Call ListNext() with this to fetch the next page of disks." + } + }, + "required": [ + "value" + ], + "description": "The List Disks operation response." + }, + "DiskSku": { + "properties": { + "name": { + "type": "string", + "enum": [ + "Standard_LRS", + "Premium_LRS", + "StandardSSD_LRS", + "UltraSSD_LRS" + ], + "x-ms-enum": { + "name": "DiskStorageAccountTypes", + "modelAsString": true + }, + "description": "The sku name." + }, + "tier": { + "type": "string", + "readOnly": true, + "default": "Standard", + "description": "The sku tier." + } + }, + "description": "The disks sku name. Can be Standard_LRS, Premium_LRS, StandardSSD_LRS, or UltraSSD_LRS." + }, + "SnapshotSku": { + "properties": { + "name": { + "type": "string", + "enum": [ + "Standard_LRS", + "Premium_LRS", + "Standard_ZRS" + ], + "x-ms-enum": { + "name": "SnapshotStorageAccountTypes", + "modelAsString": true + }, + "description": "The sku name." + }, + "tier": { + "type": "string", + "readOnly": true, + "default": "Standard", + "description": "The sku tier." + } + }, + "description": "The snapshots sku name. Can be Standard_LRS, Premium_LRS, or Standard_ZRS." + }, + "DiskProperties": { + "properties": { + "timeCreated": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The time when the disk was created." + }, + "osType": { + "type": "string", + "description": "The Operating System type.", + "enum": [ + "Windows", + "Linux" + ], + "x-ms-enum": { + "name": "OperatingSystemTypes", + "modelAsString": false + } + }, + "creationData": { + "$ref": "#/definitions/CreationData", + "description": "Disk source information. CreationData information cannot be changed after the disk has been created." + }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." + }, + "encryptionSettings": { + "$ref": "#/definitions/EncryptionSettings", + "description": "Encryption settings for disk or snapshot" + }, + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The disk provisioning state." + }, + "diskIOPSReadWrite": { + "type":"integer", + "format": "int64", + "description": "The number of IOPS allowed for this disk; only settable by customers for UltraSSD disks. One operation can transfer between 4k and 256k bytes." + }, + "diskMBpsReadWrite": { + "type":"integer", + "format": "int32", + "description": "The bandwidth allowed for this disk; only settable by customers for UltraSSD disks. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10." + } + }, + "required": [ + "creationData" + ], + "description": "Disk resource properties." + }, + "SnapshotProperties": { + "properties": { + "timeCreated": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The time when the disk was created." + }, + "osType": { + "type": "string", + "description": "The Operating System type.", + "enum": [ + "Windows", + "Linux" + ], + "x-ms-enum": { + "name": "OperatingSystemTypes", + "modelAsString": false + } + }, + "creationData": { + "$ref": "#/definitions/CreationData", + "description": "Disk source information. CreationData information cannot be changed after the disk has been created." + }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." + }, + "encryptionSettings": { + "$ref": "#/definitions/EncryptionSettings", + "description": "Encryption settings for disk or snapshot" + }, + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The disk provisioning state." + } + }, + "required": [ + "creationData" + ], + "description": "Snapshot resource properties." + }, + "EncryptionSettings": { + "properties": { + "enabled": { + "type": "boolean", + "description": "Set this flag to true and provide DiskEncryptionKey and optional KeyEncryptionKey to enable encryption. Set this flag to false and remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If EncryptionSettings is null in the request object, the existing settings remain unchanged." + }, + "diskEncryptionKey": { + "$ref": "#/definitions/KeyVaultAndSecretReference", + "description": "Key Vault Secret Url and vault id of the disk encryption key" + }, + "keyEncryptionKey": { + "$ref": "#/definitions/KeyVaultAndKeyReference", + "description": "Key Vault Key Url and vault id of the key encryption key" + } + }, + "description": "Encryption settings for disk or snapshot" + }, + "KeyVaultAndSecretReference": { + "properties": { + "sourceVault": { + "$ref": "#/definitions/SourceVault", + "description": "Resource id of the KeyVault containing the key or secret" + }, + "secretUrl": { + "type": "string", + "description": "Url pointing to a key or secret in KeyVault" + } + }, + "required": [ + "secretUrl", + "sourceVault" + ], + "description": "Key Vault Secret Url and vault id of the encryption key " + }, + "KeyVaultAndKeyReference": { + "properties": { + "sourceVault": { + "$ref": "#/definitions/SourceVault", + "description": "Resource id of the KeyVault containing the key or secret" + }, + "keyUrl": { + "type": "string", + "description": "Url pointing to a key or secret in KeyVault" + } + }, + "required": [ + "keyUrl", + "sourceVault" + ], + "description": "Key Vault Key Url and vault id of KeK, KeK is optional and when provided is used to unwrap the encryptionKey" + }, + "SourceVault": { + "properties": { + "id": { + "type": "string", + "description": "Resource Id" + } + }, + "description": "The vault id is an Azure Resource Manager Resoure id in the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}" + }, + "DiskUpdateProperties": { + "properties": { + "osType": { + "type": "string", + "description": "the Operating System type.", + "enum": [ + "Windows", + "Linux" + ], + "x-ms-enum": { + "name": "OperatingSystemTypes", + "modelAsString": false + } + }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." + }, + "encryptionSettings": { + "$ref": "#/definitions/EncryptionSettings", + "description": "Encryption settings for disk or snapshot" + } + }, + "description": "Disk resource update properties." + }, + "CreationData": { + "properties": { + "createOption": { + "type": "string", + "enum": [ + "Empty", + "Attach", + "FromImage", + "Import", + "Copy", + "Restore" + ], + "x-ms-enum": { + "name": "DiskCreateOption", + "modelAsString": true + }, + "description": "This enumerates the possible sources of a disk's creation." + }, + "storageAccountId": { + "type": "string", + "description": "If createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription" + }, + "imageReference": { + "$ref": "#/definitions/ImageDiskReference", + "description": "Disk source information." + }, + "sourceUri": { + "type": "string", + "description": "If createOption is Import, this is the URI of a blob to be imported into a managed disk." + }, + "sourceResourceId": { + "type": "string", + "description": "If createOption is Copy, this is the ARM id of the source snapshot or disk." + } + }, + "required": [ + "createOption" + ], + "description": "Data used when creating a disk." + }, + "ImageDiskReference": { + "properties": { + "id": { + "type": "string", + "description": "A relative uri containing either a Platform Imgage Repository or user image reference." + }, + "lun": { + "type": "integer", + "format": "int32", + "description": "If the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null." + } + }, + "required": [ + "id" + ], + "description": "The source image used for creating the disk." + }, + "GrantAccessData": { + "properties": { + "access": { + "type": "string", + "enum": [ + "None", + "Read" + ], + "x-ms-enum": { + "name": "AccessLevel", + "modelAsString": true + } + }, + "durationInSeconds": { + "type": "integer", + "format": "int32", + "description": "Time duration in seconds until the SAS access expires." + } + }, + "required": [ + "access", + "durationInSeconds" + ], + "description": "Data used for requesting a SAS." + }, + "AccessUri": { + "properties": { + "accessSAS": { + "readOnly": true, + "type": "string", + "description": "A SAS uri for accessing a disk." + } + }, + "description": "A disk access SAS uri." + }, + "Snapshot": { + "properties": { + "managedBy": { + "readOnly": true, + "type": "string", + "description": "Unused. Always Null." + }, + "sku": { + "$ref": "#/definitions/SnapshotSku" + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SnapshotProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "Snapshot resource." + }, + "SnapshotUpdate": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/DiskUpdateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "sku": { + "$ref": "#/definitions/SnapshotSku" + } + }, + "description": "Snapshot update resource." + }, + "SnapshotList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Snapshot" + }, + "description": "A list of snapshots." + }, + "nextLink": { + "type": "string", + "description": "The uri to fetch the next page of snapshots. Call ListNext() with this to fetch the next page of snapshots." + } + }, + "required": [ + "value" + ], + "description": "The List Snapshots operation response." + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "DiskNameParameter": { + "name": "diskName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the managed disk that is being created. The name can't be changed after the disk is created. Supported characters for the name are a-z, A-Z, 0-9 and _. The maximum name length is 80 characters.", + "x-ms-parameter-location": "method" + }, + "SnapshotNameParameter": { + "name": "snapshotName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the snapshot that is being created. The name can't be changed after the snapshot is created. Supported characters for the name are a-z, A-Z, 0-9 and _. The max name length is 80 characters.", + "x-ms-parameter-location": "method" + } + } + } + \ No newline at end of file diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index ab7920472645..c7bb46e85f06 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -184,7 +184,7 @@ input-file: - Microsoft.Compute/stable/2018-06-01/compute.json - Microsoft.Compute/stable/2018-06-01/runCommands.json - Microsoft.Compute/stable/2017-09-01/skus.json -- Microsoft.Compute/stable/2018-04-01/disk.json +- Microsoft.Compute/stable/2018-06-01/disk.json - Microsoft.Compute/stable/2018-06-01/gallery.json - Microsoft.ContainerService/stable/2017-01-31/containerService.json ``` @@ -198,7 +198,7 @@ input-file: - Microsoft.Compute/stable/2018-04-01/compute.json - Microsoft.Compute/stable/2018-04-01/runCommands.json - Microsoft.Compute/stable/2017-09-01/skus.json -- Microsoft.Compute/stable/2018-04-01/disk.json +- Microsoft.Compute/stable/2018-06-01/disk.json - Microsoft.Compute/stable/2018-06-01/gallery.json - Microsoft.ContainerService/stable/2017-01-31/containerService.json ``` From 95e04f2a8e0d3f11f879867ab25390d6241cbab9 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Mon, 10 Sep 2018 13:08:33 -0700 Subject: [PATCH 03/10] Disks 2018-06-01 for Python --- specification/compute/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index c7bb46e85f06..45a20807b653 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -212,6 +212,7 @@ input-file: - Microsoft.Compute/stable/2018-06-01/compute.json - Microsoft.Compute/stable/2018-06-01/runCommands.json - Microsoft.Compute/stable/2018-06-01/gallery.json +- Microsoft.Compute/stable/2018-06-01/disks.json ``` ### Tag: package-2018-04-01 From 9f5a1737f7429d93bf6305c5b7d27e907df1db67 Mon Sep 17 00:00:00 2001 From: Carissa Sun Date: Mon, 10 Sep 2018 13:21:57 -0700 Subject: [PATCH 04/10] update disk --- .../stable/2018-06-01/disk.json | 2191 +++++++++-------- 1 file changed, 1113 insertions(+), 1078 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json index b010c19e6154..5b1e1c2e8443 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/disk.json @@ -1,1207 +1,1242 @@ { - "swagger": "2.0", - "info": { - "title": "DiskResourceProviderClient", - "description": "The Disk Resource Provider Client.", - "version": "2018-06-01" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } + "swagger": "2.0", + "info": { + "title": "DiskResourceProviderClient", + "description": "The Disk Resource Provider Client.", + "version": "2018-06-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" } - }, - "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}": { - "put": { - "tags": [ - "Disks" - ], - "operationId": "Disks_CreateOrUpdate", - "description": "Creates or updates a disk.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiskNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "disk", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Disk" - }, - "description": "Disk object supplied in the body of the Put disk operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Disk" - } - }, - "202": { - "description":"Accepted", - "schema": { - "$ref": "#/definitions/Disk" - } - } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}": { + "put": { + "tags": [ + "Disks" + ], + "operationId": "Disks_CreateOrUpdate", + "description": "Creates or updates a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" }, - "x-ms-examples": { - "Create an empty managed disk.": { - "$ref": "./examples/CreateAnEmptyManagedDisk.json" - }, - "Create a managed disk from a platform image.": { - "$ref": "./examples/CreateAManagedDiskFromAPlatformImage.json" - }, - "Create a managed disk from an existing managed disk in the same or different subscription.": { - "$ref": "./examples/CreateAManagedDiskFromAnExistingManagedDisk.json" - }, - "Create a managed disk by importing an unmanaged blob from the same subscription.": { - "$ref": "./examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromTheSameSubscription.json" - }, - "Create a managed disk by importing an unmanaged blob from a different subscription.": { - "$ref": "./examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromADifferentSubscription.json" - }, - "Create a managed disk by copying a snapshot.": { - "$ref": "./examples/CreateAManagedDiskByCopyingASnapshot.json" - } - }, - "x-ms-long-running-operation": true - }, - "patch": { - "tags": [ - "Disks" - ], - "operationId": "Disks_Update", - "description": "Updates (patches) a disk.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiskNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "disk", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/DiskUpdate" - }, - "description": "Disk object supplied in the body of the Patch disk operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Disk" - } - }, - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/Disk" - } - } + { + "$ref": "#/parameters/ResourceGroupNameParameter" }, - "x-ms-long-running-operation": true - }, - "get": { - "tags": [ - "Disks" - ], - "operationId": "Disks_Get", - "description": "Gets information about a disk.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiskNameParameter" + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "disk", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Disk" }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Disk" - } + "description": "Disk object supplied in the body of the Put disk operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Disk" } }, - "x-ms-examples": { - "Get information about a managed disk.": { - "$ref": "./examples/GetInformationAboutAManagedDisk.json" + "202": { + "description":"Accepted", + "schema": { + "$ref": "#/definitions/Disk" } } }, - "delete": { - "tags": [ - "Disks" - ], - "operationId": "Disks_Delete", - "description": "Deletes a disk.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" + "x-ms-examples": { + "Create an empty managed disk.": { + "$ref": "./examples/CreateAnEmptyManagedDisk.json" }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" + "Create a managed disk from a platform image.": { + "$ref": "./examples/CreateAManagedDiskFromAPlatformImage.json" }, - { - "$ref": "#/parameters/DiskNameParameter" + "Create a managed disk from an existing managed disk in the same or different subscription.": { + "$ref": "./examples/CreateAManagedDiskFromAnExistingManagedDisk.json" }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK" + "Create a managed disk by importing an unmanaged blob from the same subscription.": { + "$ref": "./examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromTheSameSubscription.json" }, - "202": { - "description": "Accepted" + "Create a managed disk by importing an unmanaged blob from a different subscription.": { + "$ref": "./examples/CreateAManagedDiskByImportingAnUnmanagedBlobFromADifferentSubscription.json" }, - "204": { - "description": "If the disk is deleted, this is an expected error code." + "Create a managed disk by copying a snapshot.": { + "$ref": "./examples/CreateAManagedDiskByCopyingASnapshot.json" } - }, - "x-ms-long-running-operation": true - } + }, + "x-ms-long-running-operation": true }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks": { - "get": { - "tags": [ - "Disks" - ], - "operationId": "Disks_ListByResourceGroup", - "description": "Lists all the disks under a resource group.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" + "patch": { + "tags": [ + "Disks" + ], + "operationId": "Disks_Update", + "description": "Updates (patches) a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "disk", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/DiskUpdate" }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/DiskList" - } + "description": "Disk object supplied in the body of the Patch disk operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Disk" } }, - "x-ms-examples": { - "List all managed disks in a resource group.": { - "$ref": "./examples/ListManagedDisksInAResourceGroup.json" + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/Disk" } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } - } + }, + "x-ms-long-running-operation": true }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks": { - "get": { - "tags": [ - "Disks" - ], - "operationId": "Disks_List", - "description": "Lists all the disks under a subscription.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/DiskList" - } - } + "get": { + "tags": [ + "Disks" + ], + "operationId": "Disks_Get", + "description": "Gets information about a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" }, - "x-ms-examples": { - "List all managed disks in a subscription.": { - "$ref": "./examples/ListManagedDisksInASubscription.json" - } + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + { + "$ref": "#/parameters/ApiVersionParameter" } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/beginGetAccess": { - "post": { - "tags": [ - "Disks" - ], - "operationId": "Disks_GrantAccess", - "description": "Grants access to a disk.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiskNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "grantAccessData", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/GrantAccessData" - }, - "description": "Access data object supplied in the body of the get disk access operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/AccessUri" - } - }, - "202": { - "description": "Accepted" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Disk" } - }, - "x-ms-long-running-operation": true + } + }, + "x-ms-examples": { + "Get information about a managed disk.": { + "$ref": "./examples/GetInformationAboutAManagedDisk.json" + } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/endGetAccess": { - "post": { - "tags": [ - "Disks" - ], - "operationId": "Disks_RevokeAccess", - "description": "Revokes access to a disk.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiskNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK" - }, - "202": { - "description": "Accepted" - } + "delete": { + "tags": [ + "Disks" + ], + "operationId": "Disks_Delete", + "description": "Deletes a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" }, - "x-ms-long-running-operation": true - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}": { - "put": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_CreateOrUpdate", - "description": "Creates or updates a snapshot.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SnapshotNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "snapshot", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Snapshot" - }, - "description": "Snapshot object supplied in the body of the Put disk operation." + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "If the disk is deleted, this is an expected error code." + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks": { + "get": { + "tags": [ + "Disks" + ], + "operationId": "Disks_ListByResourceGroup", + "description": "Lists all the disks under a resource group.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DiskList" } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Snapshot" - } - }, - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/Snapshot" - } + } + }, + "x-ms-examples": { + "List all managed disks in a resource group.": { + "$ref": "./examples/ListManagedDisksInAResourceGroup.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks": { + "get": { + "tags": [ + "Disks" + ], + "operationId": "Disks_List", + "description": "Lists all the disks under a subscription.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DiskList" } + } + }, + "x-ms-examples": { + "List all managed disks in a subscription.": { + "$ref": "./examples/ListManagedDisksInASubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/beginGetAccess": { + "post": { + "tags": [ + "Disks" + ], + "operationId": "Disks_GrantAccess", + "description": "Grants access to a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" }, - "x-ms-examples": { - "Create a snapshot from an existing snapshot in the same or a different subscription.": { - "$ref": "./examples/CreateASnapshotFromAnExistingSnapshot.json" - }, - "Create a snapshot by importing an unmanaged blob from the same subscription.": { - "$ref": "./examples/CreateASnapshotByImportingAnUnmanagedBlobFromTheSameSubscription.json" + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "grantAccessData", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GrantAccessData" }, - "Create a snapshot by importing an unmanaged blob from a different subscription.": { - "$ref": "./examples/CreateASnapshotByImportingAnUnmanagedBlobFromADifferentSubscription.json" + "description": "Access data object supplied in the body of the get disk access operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AccessUri" } }, - "x-ms-long-running-operation": true + "202": { + "description": "Accepted" + } }, - "patch": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_Update", - "description": "Updates (patches) a snapshot.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SnapshotNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "snapshot", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/SnapshotUpdate" - }, - "description": "Snapshot object supplied in the body of the Patch snapshot operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Snapshot" - } - }, - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/Snapshot" - } - } + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disks/{diskName}/endGetAccess": { + "post": { + "tags": [ + "Disks" + ], + "operationId": "Disks_RevokeAccess", + "description": "Revokes access to a disk.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" }, - "x-ms-long-running-operation": true + "202": { + "description": "Accepted" + } }, - "get": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_Get", - "description": "Gets information about a snapshot.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SnapshotNameParameter" + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}": { + "put": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_CreateOrUpdate", + "description": "Creates or updates a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "snapshot", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Snapshot" }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Snapshot" - } + "description": "Snapshot object supplied in the body of the Put disk operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Snapshot" } }, - "x-ms-examples": { - "Get information about a snapshot.": { - "$ref": "./examples/GetInformationAboutASnapshot.json" + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/Snapshot" } } }, - "delete": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_Delete", - "description": "Deletes a snapshot.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SnapshotNameParameter" + "x-ms-examples": { + "Create a snapshot from an existing snapshot in the same or a different subscription.": { + "$ref": "./examples/CreateASnapshotFromAnExistingSnapshot.json" + }, + "Create a snapshot by importing an unmanaged blob from the same subscription.": { + "$ref": "./examples/CreateASnapshotByImportingAnUnmanagedBlobFromTheSameSubscription.json" + }, + "Create a snapshot by importing an unmanaged blob from a different subscription.": { + "$ref": "./examples/CreateASnapshotByImportingAnUnmanagedBlobFromADifferentSubscription.json" + } + }, + "x-ms-long-running-operation": true + }, + "patch": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Update", + "description": "Updates (patches) a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "snapshot", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/SnapshotUpdate" }, - { - "$ref": "#/parameters/ApiVersionParameter" + "description": "Snapshot object supplied in the body of the Patch snapshot operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Snapshot" } - ], - "responses": { - "200": { - "description": "OK" - }, - "202": { - "description": "Accepted" - }, - "204": { - "description": "If the snapshot is deleted, this is an expected error code." + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/Snapshot" } + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Get", + "description": "Gets information about a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" }, - "x-ms-long-running-operation": true + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Snapshot" + } + } + }, + "x-ms-examples": { + "Get information about a snapshot.": { + "$ref": "./examples/GetInformationAboutASnapshot.json" + } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots": { - "get": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_ListByResourceGroup", - "description": "Lists snapshots under a resource group.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SnapshotList" - } - } + "delete": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Delete", + "description": "Deletes a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" }, - "x-ms-examples": { - "List all snapshots in a resource group.": { - "$ref": "./examples/ListSnapshotsInAResourceGroup.json" - } + "202": { + "description": "Accepted" }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + "204": { + "description": "If the snapshot is deleted, this is an expected error code." } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/snapshots": { - "get": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_List", - "description": "Lists snapshots under a subscription.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SnapshotList" - } - } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots": { + "get": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_ListByResourceGroup", + "description": "Lists snapshots under a resource group.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" }, - "x-ms-examples": { - "List all snapshots in a subscription.": { - "$ref": "./examples/ListSnapshotsInASubscription.json" - } + { + "$ref": "#/parameters/ResourceGroupNameParameter" }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + { + "$ref": "#/parameters/ApiVersionParameter" } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/beginGetAccess": { - "post": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_GrantAccess", - "description": "Grants access to a snapshot.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SnapshotNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "grantAccessData", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/GrantAccessData" - }, - "description": "Access data object supplied in the body of the get snapshot access operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/AccessUri" - } - }, - "202": { - "description": "Accepted" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SnapshotList" } - }, - "x-ms-long-running-operation": true + } + }, + "x-ms-examples": { + "List all snapshots in a resource group.": { + "$ref": "./examples/ListSnapshotsInAResourceGroup.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/endGetAccess": { - "post": { - "tags": [ - "Snapshots" - ], - "operationId": "Snapshots_RevokeAccess", - "description": "Revokes access to a snapshot.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SnapshotNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK" - }, - "202": { - "description": "Accepted" - } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/snapshots": { + "get": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_List", + "description": "Lists snapshots under a subscription.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" }, - "x-ms-long-running-operation": true + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SnapshotList" + } + } + }, + "x-ms-examples": { + "List all snapshots in a subscription.": { + "$ref": "./examples/ListSnapshotsInASubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "definitions": { - "Resource": { - "description": "The Resource model definition.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource Id" - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - }, - "location": { - "type": "string", - "description": "Resource location" - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/beginGetAccess": { + "post": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_GrantAccess", + "description": "Grants access to a snapshot.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "grantAccessData", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GrantAccessData" }, - "description": "Resource tags" + "description": "Access data object supplied in the body of the get snapshot access operation." } - }, - "required": [ - "location" ], - "x-ms-azure-resource": true - }, - "Disk": { - "properties": { - "managedBy": { - "readOnly": true, - "type": "string", - "description": "A relative URI containing the ID of the VM that has the disk attached." - }, - "sku": { - "$ref": "#/definitions/DiskSku" - }, - "zones": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The Logical zone list for Disk." + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/AccessUri" + } }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/DiskProperties" + "202": { + "description": "Accepted" } }, - "allOf": [ + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/snapshots/{snapshotName}/endGetAccess": { + "post": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_RevokeAccess", + "description": "Revokes access to a snapshot.", + "parameters": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SnapshotNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" } ], - "description": "Disk resource." - }, - "DiskUpdate": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/DiskUpdateProperties" - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" + "responses": { + "200": { + "description": "OK" }, - "sku": { - "$ref": "#/definitions/DiskSku" + "202": { + "description": "Accepted" } }, - "description": "Disk update resource." + "x-ms-long-running-operation": true + } + } + }, + "definitions": { + "Resource": { + "description": "The Resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type" + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } }, - "DiskList": { - "properties": { - "value": { + "required": [ + "location" + ], + "x-ms-azure-resource": true + }, + "Disk": { + "properties": { + "managedBy": { + "readOnly": true, + "type": "string", + "description": "A relative URI containing the ID of the VM that has the disk attached." + }, + "sku": { + "$ref": "#/definitions/DiskSku" + }, + "zones": { "type": "array", "items": { - "$ref": "#/definitions/Disk" - }, - "description": "A list of disks." + "type": "string" }, - "nextLink": { - "type": "string", - "description": "The uri to fetch the next page of disks. Call ListNext() with this to fetch the next page of disks." - } + "description": "The Logical zone list for Disk." }, - "required": [ - "value" - ], - "description": "The List Disks operation response." + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/DiskProperties" + } }, - "DiskSku": { + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "Disk resource." + }, + "DiskUpdate": { + "properties": { "properties": { - "name": { - "type": "string", - "enum": [ - "Standard_LRS", - "Premium_LRS", - "StandardSSD_LRS", - "UltraSSD_LRS" - ], - "x-ms-enum": { - "name": "DiskStorageAccountTypes", - "modelAsString": true - }, - "description": "The sku name." + "x-ms-client-flatten": true, + "$ref": "#/definitions/DiskUpdateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" }, - "tier": { - "type": "string", - "readOnly": true, - "default": "Standard", - "description": "The sku tier." - } + "description": "Resource tags" }, - "description": "The disks sku name. Can be Standard_LRS, Premium_LRS, StandardSSD_LRS, or UltraSSD_LRS." + "sku": { + "$ref": "#/definitions/DiskSku" + } }, - "SnapshotSku": { - "properties": { - "name": { - "type": "string", - "enum": [ - "Standard_LRS", - "Premium_LRS", - "Standard_ZRS" - ], - "x-ms-enum": { - "name": "SnapshotStorageAccountTypes", - "modelAsString": true - }, - "description": "The sku name." + "description": "Disk update resource." + }, + "DiskList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Disk" }, - "tier": { - "type": "string", - "readOnly": true, - "default": "Standard", - "description": "The sku tier." - } + "description": "A list of disks." }, - "description": "The snapshots sku name. Can be Standard_LRS, Premium_LRS, or Standard_ZRS." + "nextLink": { + "type": "string", + "description": "The uri to fetch the next page of disks. Call ListNext() with this to fetch the next page of disks." + } }, - "DiskProperties": { - "properties": { - "timeCreated": { - "readOnly": true, - "type": "string", - "format": "date-time", - "description": "The time when the disk was created." - }, - "osType": { - "type": "string", - "description": "The Operating System type.", - "enum": [ - "Windows", - "Linux" - ], - "x-ms-enum": { - "name": "OperatingSystemTypes", - "modelAsString": false - } - }, - "creationData": { - "$ref": "#/definitions/CreationData", - "description": "Disk source information. CreationData information cannot be changed after the disk has been created." + "required": [ + "value" + ], + "description": "The List Disks operation response." + }, + "DiskSku": { + "properties": { + "name": { + "type": "string", + "enum": [ + "Standard_LRS", + "Premium_LRS", + "StandardSSD_LRS", + "UltraSSD_LRS" + ], + "x-ms-enum": { + "name": "DiskStorageAccountTypes", + "modelAsString": true }, - "diskSizeGB": { - "type": "integer", - "format": "int32", - "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." - }, - "encryptionSettings": { - "$ref": "#/definitions/EncryptionSettings", - "description": "Encryption settings for disk or snapshot" - }, - "provisioningState": { - "readOnly": true, - "type": "string", - "description": "The disk provisioning state." - }, - "diskIOPSReadWrite": { - "type":"integer", - "format": "int64", - "description": "The number of IOPS allowed for this disk; only settable by customers for UltraSSD disks. One operation can transfer between 4k and 256k bytes." - }, - "diskMBpsReadWrite": { - "type":"integer", - "format": "int32", - "description": "The bandwidth allowed for this disk; only settable by customers for UltraSSD disks. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10." - } + "description": "The sku name." }, - "required": [ - "creationData" - ], - "description": "Disk resource properties." + "tier": { + "type": "string", + "readOnly": true, + "default": "Standard", + "description": "The sku tier." + } }, - "SnapshotProperties": { - "properties": { - "timeCreated": { - "readOnly": true, - "type": "string", - "format": "date-time", - "description": "The time when the disk was created." - }, - "osType": { - "type": "string", - "description": "The Operating System type.", - "enum": [ - "Windows", - "Linux" - ], - "x-ms-enum": { - "name": "OperatingSystemTypes", - "modelAsString": false - } - }, - "creationData": { - "$ref": "#/definitions/CreationData", - "description": "Disk source information. CreationData information cannot be changed after the disk has been created." - }, - "diskSizeGB": { - "type": "integer", - "format": "int32", - "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." - }, - "encryptionSettings": { - "$ref": "#/definitions/EncryptionSettings", - "description": "Encryption settings for disk or snapshot" + "description": "The disks sku name. Can be Standard_LRS, Premium_LRS, StandardSSD_LRS, or UltraSSD_LRS." + }, + "SnapshotSku": { + "properties": { + "name": { + "type": "string", + "enum": [ + "Standard_LRS", + "Premium_LRS", + "Standard_ZRS" + ], + "x-ms-enum": { + "name": "SnapshotStorageAccountTypes", + "modelAsString": true }, - "provisioningState": { - "readOnly": true, - "type": "string", - "description": "The disk provisioning state." - } + "description": "The sku name." }, - "required": [ - "creationData" - ], - "description": "Snapshot resource properties." + "tier": { + "type": "string", + "readOnly": true, + "default": "Standard", + "description": "The sku tier." + } }, - "EncryptionSettings": { - "properties": { - "enabled": { - "type": "boolean", - "description": "Set this flag to true and provide DiskEncryptionKey and optional KeyEncryptionKey to enable encryption. Set this flag to false and remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If EncryptionSettings is null in the request object, the existing settings remain unchanged." - }, - "diskEncryptionKey": { - "$ref": "#/definitions/KeyVaultAndSecretReference", - "description": "Key Vault Secret Url and vault id of the disk encryption key" - }, - "keyEncryptionKey": { - "$ref": "#/definitions/KeyVaultAndKeyReference", - "description": "Key Vault Key Url and vault id of the key encryption key" + "description": "The snapshots sku name. Can be Standard_LRS, Premium_LRS, or Standard_ZRS." + }, + "DiskProperties": { + "properties": { + "timeCreated": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The time when the disk was created." + }, + "osType": { + "type": "string", + "description": "The Operating System type.", + "enum": [ + "Windows", + "Linux" + ], + "x-ms-enum": { + "name": "OperatingSystemTypes", + "modelAsString": false } }, - "description": "Encryption settings for disk or snapshot" + "creationData": { + "$ref": "#/definitions/CreationData", + "description": "Disk source information. CreationData information cannot be changed after the disk has been created." + }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." + }, + "encryptionSettings": { + "$ref": "#/definitions/EncryptionSettings", + "description": "Encryption settings for disk or snapshot" + }, + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The disk provisioning state." + }, + "diskIOPSReadWrite": { + "type":"integer", + "format": "int64", + "description": "The number of IOPS allowed for this disk; only settable for UltraSSD disks. One operation can transfer between 4k and 256k bytes." + }, + "diskMBpsReadWrite": { + "type":"integer", + "format": "int32", + "description": "The bandwidth allowed for this disk; only settable for UltraSSD disks. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10." + } }, - "KeyVaultAndSecretReference": { - "properties": { - "sourceVault": { - "$ref": "#/definitions/SourceVault", - "description": "Resource id of the KeyVault containing the key or secret" - }, - "secretUrl": { - "type": "string", - "description": "Url pointing to a key or secret in KeyVault" + "required": [ + "creationData" + ], + "description": "Disk resource properties." + }, + "SnapshotProperties": { + "properties": { + "timeCreated": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The time when the disk was created." + }, + "osType": { + "type": "string", + "description": "The Operating System type.", + "enum": [ + "Windows", + "Linux" + ], + "x-ms-enum": { + "name": "OperatingSystemTypes", + "modelAsString": false } }, - "required": [ - "secretUrl", - "sourceVault" - ], - "description": "Key Vault Secret Url and vault id of the encryption key " + "creationData": { + "$ref": "#/definitions/CreationData", + "description": "Disk source information. CreationData information cannot be changed after the disk has been created." + }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." + }, + "encryptionSettings": { + "$ref": "#/definitions/EncryptionSettings", + "description": "Encryption settings for disk or snapshot" + }, + "provisioningState": { + "readOnly": true, + "type": "string", + "description": "The disk provisioning state." + } }, - "KeyVaultAndKeyReference": { - "properties": { - "sourceVault": { - "$ref": "#/definitions/SourceVault", - "description": "Resource id of the KeyVault containing the key or secret" - }, - "keyUrl": { - "type": "string", - "description": "Url pointing to a key or secret in KeyVault" - } + "required": [ + "creationData" + ], + "description": "Snapshot resource properties." + }, + "EncryptionSettings": { + "properties": { + "enabled": { + "type": "boolean", + "description": "Set this flag to true and provide DiskEncryptionKey and optional KeyEncryptionKey to enable encryption. Set this flag to false and remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If EncryptionSettings is null in the request object, the existing settings remain unchanged." }, - "required": [ - "keyUrl", - "sourceVault" - ], - "description": "Key Vault Key Url and vault id of KeK, KeK is optional and when provided is used to unwrap the encryptionKey" + "diskEncryptionKey": { + "$ref": "#/definitions/KeyVaultAndSecretReference", + "description": "Key Vault Secret Url and vault id of the disk encryption key" + }, + "keyEncryptionKey": { + "$ref": "#/definitions/KeyVaultAndKeyReference", + "description": "Key Vault Key Url and vault id of the key encryption key" + } }, - "SourceVault": { - "properties": { - "id": { - "type": "string", - "description": "Resource Id" - } + "description": "Encryption settings for disk or snapshot" + }, + "KeyVaultAndSecretReference": { + "properties": { + "sourceVault": { + "$ref": "#/definitions/SourceVault", + "description": "Resource id of the KeyVault containing the key or secret" }, - "description": "The vault id is an Azure Resource Manager Resoure id in the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}" + "secretUrl": { + "type": "string", + "description": "Url pointing to a key or secret in KeyVault" + } }, - "DiskUpdateProperties": { - "properties": { - "osType": { - "type": "string", - "description": "the Operating System type.", - "enum": [ - "Windows", - "Linux" - ], - "x-ms-enum": { - "name": "OperatingSystemTypes", - "modelAsString": false - } - }, - "diskSizeGB": { - "type": "integer", - "format": "int32", - "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." - }, - "encryptionSettings": { - "$ref": "#/definitions/EncryptionSettings", - "description": "Encryption settings for disk or snapshot" - } + "required": [ + "secretUrl", + "sourceVault" + ], + "description": "Key Vault Secret Url and vault id of the encryption key " + }, + "KeyVaultAndKeyReference": { + "properties": { + "sourceVault": { + "$ref": "#/definitions/SourceVault", + "description": "Resource id of the KeyVault containing the key or secret" }, - "description": "Disk resource update properties." + "keyUrl": { + "type": "string", + "description": "Url pointing to a key or secret in KeyVault" + } }, - "CreationData": { - "properties": { - "createOption": { - "type": "string", - "enum": [ - "Empty", - "Attach", - "FromImage", - "Import", - "Copy", - "Restore" - ], - "x-ms-enum": { - "name": "DiskCreateOption", - "modelAsString": true - }, - "description": "This enumerates the possible sources of a disk's creation." - }, - "storageAccountId": { - "type": "string", - "description": "If createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription" - }, - "imageReference": { - "$ref": "#/definitions/ImageDiskReference", - "description": "Disk source information." - }, - "sourceUri": { - "type": "string", - "description": "If createOption is Import, this is the URI of a blob to be imported into a managed disk." - }, - "sourceResourceId": { - "type": "string", - "description": "If createOption is Copy, this is the ARM id of the source snapshot or disk." + "required": [ + "keyUrl", + "sourceVault" + ], + "description": "Key Vault Key Url and vault id of KeK, KeK is optional and when provided is used to unwrap the encryptionKey" + }, + "SourceVault": { + "properties": { + "id": { + "type": "string", + "description": "Resource Id" + } + }, + "description": "The vault id is an Azure Resource Manager Resoure id in the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}" + }, + "DiskUpdateProperties": { + "properties": { + "osType": { + "type": "string", + "description": "the Operating System type.", + "enum": [ + "Windows", + "Linux" + ], + "x-ms-enum": { + "name": "OperatingSystemTypes", + "modelAsString": false } }, - "required": [ - "createOption" - ], - "description": "Data used when creating a disk." - }, - "ImageDiskReference": { - "properties": { - "id": { - "type": "string", - "description": "A relative uri containing either a Platform Imgage Repository or user image reference." - }, - "lun": { - "type": "integer", + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." + }, + "encryptionSettings": { + "$ref": "#/definitions/EncryptionSettings", + "description": "Encryption settings for disk or snapshot" + }, + "diskIOPSReadWrite": { + "type":"integer", + "format": "int64", + "description": "The number of IOPS allowed for this disk; only settable for UltraSSD disks. One operation can transfer between 4k and 256k bytes." + }, + "diskMBpsReadWrite": { + "type":"integer", "format": "int32", - "description": "If the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null." + "description": "The bandwidth allowed for this disk; only settable for UltraSSD disks. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10." + } + }, + "description": "Disk resource update properties." + }, + "SnapshotUpdateProperties": { + "properties": { + "osType": { + "type": "string", + "description": "the Operating System type.", + "enum": [ + "Windows", + "Linux" + ], + "x-ms-enum": { + "name": "OperatingSystemTypes", + "modelAsString": false } }, - "required": [ - "id" - ], - "description": "The source image used for creating the disk." + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size." + }, + "encryptionSettings": { + "$ref": "#/definitions/EncryptionSettings", + "description": "Encryption settings for disk or snapshot" + } }, - "GrantAccessData": { - "properties": { - "access": { - "type": "string", - "enum": [ - "None", - "Read" - ], - "x-ms-enum": { - "name": "AccessLevel", - "modelAsString": true - } + "description": "Snapshot resource update properties." + }, + "CreationData": { + "properties": { + "createOption": { + "type": "string", + "enum": [ + "Empty", + "Attach", + "FromImage", + "Import", + "Copy", + "Restore" + ], + "x-ms-enum": { + "name": "DiskCreateOption", + "modelAsString": true }, - "durationInSeconds": { - "type": "integer", - "format": "int32", - "description": "Time duration in seconds until the SAS access expires." - } + "description": "This enumerates the possible sources of a disk's creation." }, - "required": [ - "access", - "durationInSeconds" - ], - "description": "Data used for requesting a SAS." + "storageAccountId": { + "type": "string", + "description": "If createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription" + }, + "imageReference": { + "$ref": "#/definitions/ImageDiskReference", + "description": "Disk source information." + }, + "sourceUri": { + "type": "string", + "description": "If createOption is Import, this is the URI of a blob to be imported into a managed disk." + }, + "sourceResourceId": { + "type": "string", + "description": "If createOption is Copy, this is the ARM id of the source snapshot or disk." + } }, - "AccessUri": { - "properties": { - "accessSAS": { - "readOnly": true, - "type": "string", - "description": "A SAS uri for accessing a disk." - } + "required": [ + "createOption" + ], + "description": "Data used when creating a disk." + }, + "ImageDiskReference": { + "properties": { + "id": { + "type": "string", + "description": "A relative uri containing either a Platform Imgage Repository or user image reference." }, - "description": "A disk access SAS uri." + "lun": { + "type": "integer", + "format": "int32", + "description": "If the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null." + } }, - "Snapshot": { - "properties": { - "managedBy": { - "readOnly": true, - "type": "string", - "description": "Unused. Always Null." - }, - "sku": { - "$ref": "#/definitions/SnapshotSku" - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SnapshotProperties" + "required": [ + "id" + ], + "description": "The source image used for creating the disk." + }, + "GrantAccessData": { + "properties": { + "access": { + "type": "string", + "enum": [ + "None", + "Read" + ], + "x-ms-enum": { + "name": "AccessLevel", + "modelAsString": true } }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "description": "Snapshot resource." + "durationInSeconds": { + "type": "integer", + "format": "int32", + "description": "Time duration in seconds until the SAS access expires." + } }, - "SnapshotUpdate": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/DiskUpdateProperties" - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - }, - "sku": { - "$ref": "#/definitions/SnapshotSku" - } + "required": [ + "access", + "durationInSeconds" + ], + "description": "Data used for requesting a SAS." + }, + "AccessUri": { + "properties": { + "accessSAS": { + "readOnly": true, + "type": "string", + "description": "A SAS uri for accessing a disk." + } + }, + "description": "A disk access SAS uri." + }, + "Snapshot": { + "properties": { + "managedBy": { + "readOnly": true, + "type": "string", + "description": "Unused. Always Null." + }, + "sku": { + "$ref": "#/definitions/SnapshotSku" }, - "description": "Snapshot update resource." + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SnapshotProperties" + } }, - "SnapshotList": { + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "Snapshot resource." + }, + "SnapshotUpdate": { + "properties": { "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/Snapshot" - }, - "description": "A list of snapshots." + "x-ms-client-flatten": true, + "$ref": "#/definitions/SnapshotUpdateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" }, - "nextLink": { - "type": "string", - "description": "The uri to fetch the next page of snapshots. Call ListNext() with this to fetch the next page of snapshots." - } + "description": "Resource tags" }, - "required": [ - "value" - ], - "description": "The List Snapshots operation response." - } - }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" + "sku": { + "$ref": "#/definitions/SnapshotSku" + } }, - "DiskNameParameter": { - "name": "diskName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the managed disk that is being created. The name can't be changed after the disk is created. Supported characters for the name are a-z, A-Z, 0-9 and _. The maximum name length is 80 characters.", - "x-ms-parameter-location": "method" + "description": "Snapshot update resource." + }, + "SnapshotList": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Snapshot" + }, + "description": "A list of snapshots." + }, + "nextLink": { + "type": "string", + "description": "The uri to fetch the next page of snapshots. Call ListNext() with this to fetch the next page of snapshots." + } }, - "SnapshotNameParameter": { - "name": "snapshotName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the snapshot that is being created. The name can't be changed after the snapshot is created. Supported characters for the name are a-z, A-Z, 0-9 and _. The max name length is 80 characters.", - "x-ms-parameter-location": "method" - } + "required": [ + "value" + ], + "description": "The List Snapshots operation response." + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "DiskNameParameter": { + "name": "diskName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the managed disk that is being created. The name can't be changed after the disk is created. Supported characters for the name are a-z, A-Z, 0-9 and _. The maximum name length is 80 characters.", + "x-ms-parameter-location": "method" + }, + "SnapshotNameParameter": { + "name": "snapshotName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the snapshot that is being created. The name can't be changed after the snapshot is created. Supported characters for the name are a-z, A-Z, 0-9 and _. The max name length is 80 characters.", + "x-ms-parameter-location": "method" } } - \ No newline at end of file +} From f128ff0876f538e2cba5b92988bc54b3c041b623 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Mon, 10 Sep 2018 14:42:40 -0700 Subject: [PATCH 05/10] Update readme.md --- specification/compute/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 45a20807b653..2f6e5dae73bc 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -212,7 +212,7 @@ input-file: - Microsoft.Compute/stable/2018-06-01/compute.json - Microsoft.Compute/stable/2018-06-01/runCommands.json - Microsoft.Compute/stable/2018-06-01/gallery.json -- Microsoft.Compute/stable/2018-06-01/disks.json +- Microsoft.Compute/stable/2018-06-01/disk.json ``` ### Tag: package-2018-04-01 From 58a29bf7212339a823515b086b8ef1077a72355a Mon Sep 17 00:00:00 2001 From: Carissa Sun Date: Mon, 10 Sep 2018 16:41:59 -0700 Subject: [PATCH 06/10] adding compute.json changes --- .../stable/2018-06-01/compute.json | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index cb1e30bc5ca2..62ad9f3c0df6 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -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." + } + }, + "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." From c5cdad53036869893fca1fc5c7658a1dd85e3e59 Mon Sep 17 00:00:00 2001 From: Carissa Sun Date: Mon, 10 Sep 2018 17:21:09 -0700 Subject: [PATCH 07/10] deleting duplicates --- .../Microsoft.Compute/stable/2018-06-01/compute.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 62ad9f3c0df6..42f3e5077154 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -5164,12 +5164,10 @@ }, "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" ], @@ -5182,7 +5180,6 @@ "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." } }, From 9dcfd8c0d7b148bad8edcef20b2bda46c18dc08b Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Wed, 12 Sep 2018 11:19:16 -0700 Subject: [PATCH 08/10] Fix indent --- .../stable/2018-06-01/compute.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json index 42f3e5077154..a58e696a1d5b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2018-06-01/compute.json @@ -5314,15 +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." - } - }, - "description": "Enables or disables a capability on the virtual machine or virtual machine scale set" - }, + "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." + } + }, + "description": "Enables or disables a capability on the virtual machine or virtual machine scale set" + }, "AdditionalUnattendContent": { "properties": { "passName": { From 3afcb2d4a30bb3123688965a55adb143fc32c36e Mon Sep 17 00:00:00 2001 From: Carissa Sun Date: Wed, 12 Sep 2018 15:53:52 -0700 Subject: [PATCH 09/10] adding suppress --- specification/compute/resource-manager/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 2f6e5dae73bc..8219ee5545d8 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -161,6 +161,12 @@ directive: suppress: - TrackedResourcePatchOperation + + - where: + - $.definitions.AdditionalCapabilities.properties + suppress: + - NO_CAMEL_CASE + ``` ### Tag: package-2018-06-exclude-gallery From 5b038530a1f422d8520d5099b604cedbbf39efc2 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Wed, 12 Sep 2018 16:20:32 -0700 Subject: [PATCH 10/10] Update suppression rules --- specification/compute/resource-manager/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 8219ee5545d8..4d1993562087 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -163,9 +163,9 @@ directive: - where: - - $.definitions.AdditionalCapabilities.properties + - $.definitions.AdditionalCapabilities.properties.ultraSSDEnabled suppress: - - NO_CAMEL_CASE + - DefinitionsPropertiesNamesCamelCase ``` ### Tag: package-2018-06-exclude-gallery