diff --git a/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json b/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json index e36656b72347..bdc93069e144 100644 --- a/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json +++ b/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json @@ -147,7 +147,7 @@ } } } - }, + }, "/subscriptions/{subscriptionId}/providers/Microsoft.DataBox/locations/{location}/validateAddress": { "post": { "tags": [ @@ -305,7 +305,7 @@ }, "JobsGet5": { "$ref": "./examples/JobsGet5.json" - } + } } }, "put": { @@ -397,11 +397,11 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "JobsDelete": { - "$ref": "./examples/JobsDelete.json" - } + "JobsDelete": { + "$ref": "./examples/JobsDelete.json" } - }, + } + }, "patch": { "tags": [ "Jobs" @@ -455,11 +455,11 @@ } }, "x-ms-long-running-operation": true, - "x-ms-examples": { - "JobsPatch": { - "$ref": "./examples/JobsPatch.json" - } + "x-ms-examples": { + "JobsPatch": { + "$ref": "./examples/JobsPatch.json" } + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataBox/jobs/{jobName}/bookShipmentPickUp": { @@ -555,10 +555,10 @@ } }, "x-ms-examples": { - "JobsCancelPost": { - "$ref": "./examples/JobsCancelPost.json" - } + "JobsCancelPost": { + "$ref": "./examples/JobsCancelPost.json" } + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataBox/jobs/{jobName}/listCredentials": { @@ -921,6 +921,18 @@ "description": "Total amount of data to be processed by the job.", "type": "integer", "readOnly": true + }, + "filesProcessed": { + "format": "int64", + "description": "Number of files processed by the job as of now.", + "type": "integer", + "readOnly": true + }, + "totalFilesToProcess": { + "format": "int64", + "description": "Total number of files to be processed by the job.", + "type": "integer", + "readOnly": true } } }, @@ -1307,17 +1319,90 @@ } }, "DestinationAccountDetails": { - "description": "Details for the destination account.", + "description": "Details of the destination of the data", "required": [ - "accountId" + "dataDestinationType" ], "type": "object", "properties": { + "dataDestinationType": { + "description": "Data Destination Type.", + "enum": [ + "UnknownType", + "StorageAccount", + "ManagedDisk" + ], + "type": "string", + "x-ms-enum": { + "name": "DataDestinationType", + "modelAsExtensible": true, + "values": [ + { + "value": "UnknownType", + "description": "Unknown type." + }, + { + "value": "StorageAccount", + "description": "Storage Accounts ." + }, + { + "value": "ManagedDisk", + "description": "Azure Managed disk storage." + } + ] + } + }, "accountId": { - "description": "Destination storage account id.", + "description": "Arm Id of the destination where the data has to be moved.", "type": "string" } - } + }, + "discriminator": "dataDestinationType" + }, + "DestinationManagedDiskDetails": { + "description": "Details for the destination compute disks.", + "required": [ + "resourceGroupId", + "stagingStorageAccountId", + "dataDestinationType" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DestinationAccountDetails" + } + ], + "properties": { + "resourceGroupId": { + "description": "Destination Resource Group Id where the Compute disks should be created.", + "type": "string" + }, + "stagingStorageAccountId": { + "description": "Arm Id of the storage account that can be used to copy the vhd for staging.", + "type": "string" + } + }, + "x-ms-discriminator-value": "ManagedDisk" + }, + "DestinationStorageAccountDetails": { + "description": "Details for the destination storage account.", + "required": [ + "storageAccountId", + "dataDestinationType" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DestinationAccountDetails" + } + ], + "properties": { + "storageAccountId": { + "description": "Destination Storage Account Arm Id.", + "type": "string" + } + }, + "x-ms-discriminator-value": "StorageAccount" }, "DestinationToServiceLocationMap": { "description": "Map of destination location to service location", @@ -2071,7 +2156,7 @@ } }, "x-ms-azure-resource": true - }, + }, "ShareCredentialDetails": { "description": "Credential details of the shares in account.", "type": "object", @@ -2088,7 +2173,8 @@ "HCS", "BlockBlob", "PageBlob", - "AzureFile" + "AzureFile", + "ManagedDisk" ], "type": "string", "readOnly": true, @@ -2115,6 +2201,10 @@ { "value": "AzureFile", "description": "Azure storage file format." + }, + { + "value": "ManagedDisk", + "description": "Azure Compute Disk." } ] } @@ -2411,7 +2501,8 @@ "Country", "Region", "Feature", - "OfferType" + "OfferType", + "NoSubscriptionInfo" ], "type": "string", "readOnly": true, @@ -2429,7 +2520,7 @@ }, { "value": "Region", - "description": "SKU is not available to push data to the requested storage account region." + "description": "SKU is not available to push data to the requested Azure region." }, { "value": "Feature", @@ -2438,6 +2529,10 @@ { "value": "OfferType", "description": "Subscription does not have required offer types for the SKU." + }, + { + "value": "NoSubscriptionInfo", + "description": "Subscription has not registered to Microsoft.DataBox and Service does not have the subscription notification." } ] }