Skip to content

DataBox : Swagger and example changes for next version of client DLL #4393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anuchandy merged 8 commits into from
Nov 21, 2018
Merged

DataBox : Swagger and example changes for next version of client DLL #4393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e124a24
Merge pull request #1 from Azure/master
soumya-jain19 Sep 25, 2018
2b6f4ba
Managed disk updates
saravanan211094 Oct 30, 2018
e3c0f81
changes
saravanan211094 Oct 30, 2018
9014249
Merge pull request #3 from AzureDataBox/saran1030
saravanan211094-git Oct 31, 2018
e2ea4a8
changing examples for managed disk details
saravanan211094 Nov 3, 2018
3f738b2
Merge branch 'master' of https://github.com/AzureDataBox/azure-rest-a…
saravanan211094 Nov 3, 2018
9de7691
changing readme and dll version in examples
saravanan211094 Nov 14, 2018
d826472
Merge branch 'master' of https://github.com/AzureDataBox/azure-rest-a…
saravanan211094 Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 116 additions & 21 deletions specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
}
}
}
},
},
"/subscriptions/{subscriptionId}/providers/Microsoft.DataBox/locations/{location}/validateAddress": {
"post": {
"tags": [
Expand Down Expand Up @@ -305,7 +305,7 @@
},
"JobsGet5": {
"$ref": "./examples/JobsGet5.json"
}
}
}
},
"put": {
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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
}
}
},
Expand Down Expand Up @@ -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"
Copy link
Member

@anuchandy anuchandy Nov 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand correctly, service now supports DestinationManagedDiskDetails and DestinationStorageAccountDetails instances as one of destination accounts for a JobResource.

For back-combat does the service still accept DestinationAccountDetails as one of the destination accounts for a JobResource?

Copy link
Author

@saran94 saran94 Nov 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, yes back-combat is also handled. service still supports DestinationAccountDetails also.

}
}
},
"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",
Expand Down Expand Up @@ -2071,7 +2156,7 @@
}
},
"x-ms-azure-resource": true
},
},
"ShareCredentialDetails": {
"description": "Credential details of the shares in account.",
"type": "object",
Expand All @@ -2088,7 +2173,8 @@
"HCS",
"BlockBlob",
"PageBlob",
"AzureFile"
"AzureFile",
"ManagedDisk"
],
"type": "string",
"readOnly": true,
Expand All @@ -2115,6 +2201,10 @@
{
"value": "AzureFile",
"description": "Azure storage file format."
},
{
"value": "ManagedDisk",
"description": "Azure Compute Disk."
}
]
}
Expand Down Expand Up @@ -2411,7 +2501,8 @@
"Country",
"Region",
"Feature",
"OfferType"
"OfferType",
"NoSubscriptionInfo"
],
"type": "string",
"readOnly": true,
Expand All @@ -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",
Expand All @@ -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."
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion ...abox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/AvailableSkusPost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"User-Agent": [
"FxVersion/4.6.26614.01",
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.0.0"
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.1.0"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand Down
2 changes: 1 addition & 1 deletion ...resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/BookShipmentPickupPost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"User-Agent": [
"FxVersion/4.6.26614.01",
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.0.0"
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.1.0"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand Down
6 changes: 3 additions & 3 deletions ...databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsCancelPost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parameters": {
"subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f",
"resourceGroupName": "SdkRg8120",
"jobName": "SdkJob7196",
"resourceGroupName": "SdkRg9836",
"jobName": "SdkJob8367",
"api-version": "2018-01-01",
"$expand": "details",
"x-ms-client-request-id": [
Expand All @@ -13,7 +13,7 @@
],
"User-Agent": [
"FxVersion/4.6.26614.01",
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.0.0"
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.1.0"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand Down
16 changes: 10 additions & 6 deletions ...ion/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parameters": {
"subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f",
"resourceGroupName": "SdkRg8120",
"jobName": "SdkJob7196",
"resourceGroupName": "SdkRg9836",
"jobName": "SdkJob8367",
"api-version": "2018-01-01",
"x-ms-client-request-id": [
"ee686d79-42c2-4b01-9afe-5e99f4cabfee"
Expand All @@ -12,7 +12,7 @@
],
"User-Agent": [
"FxVersion/4.6.26614.01",
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.0.0"
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.1.0"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand Down Expand Up @@ -44,7 +44,11 @@
},
"destinationAccountDetails": [
{
"accountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount"
"storageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount"
},
{
"stagingStorageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount",
"resourceGroupId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt"
}
]
}
Expand Down Expand Up @@ -73,8 +77,8 @@
"sku": {
"name": "DataBox"
},
"name": "SdkJob7196",
"id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/SdkRg8120/providers/Microsoft.DataBox/jobs/SdkJob7196",
"name": "SdkJob8367",
"id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/SdkRg9836/providers/Microsoft.DataBox/jobs/SdkJob8367",
"type": "Microsoft.DataBox/jobs"
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...ion/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parameters": {
"subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f",
"resourceGroupName": "SdkRg8120",
"jobName": "SdkJob7196",
"resourceGroupName": "SdkRg9836",
"jobName": "SdkJob8367",
"api-version": "2018-01-01",
"$expand": "details",
"x-ms-client-request-id": [
Expand All @@ -13,7 +13,7 @@
],
"User-Agent": [
"FxVersion/4.6.26614.01",
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.0.0"
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.1.0"
]
},
"responses": {
Expand Down
10 changes: 5 additions & 5 deletions ...cation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"parameters": {
"subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f",
"resourceGroupName": "SdkRg8120",
"jobName": "SdkJob7196",
"resourceGroupName": "SdkRg9836",
"jobName": "SdkJob8367",
"api-version": "2018-01-01",
"User-Agent": [
"FxVersion/4.6.26614.01",
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.0.0"
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.1.0"
]
},
"responses": {
Expand All @@ -24,8 +24,8 @@
"sku": {
"name": "DataBox"
},
"name": "SdkJob7196",
"id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/SdkRg8120/providers/Microsoft.DataBox/jobs/SdkJob7196",
"name": "SdkJob8367",
"id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/SdkRg9836/providers/Microsoft.DataBox/jobs/SdkJob8367",
"type": "Microsoft.DataBox/jobs"
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"parameters": {
"subscriptionId": "fa68082f-8ff7-4a25-95c7-ce9da541242f",
"resourceGroupName": "SdkRg8120",
"jobName": "SdkJob7196",
"jobName": "SdkJob8367",
"api-version": "2018-01-01",
"User-Agent": [
"FxVersion/4.6.26614.01",
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.0.0"
"Microsoft.Azure.Management.DataBox.DataBoxManagementClient/1.1.0"
]
},
"responses": {
Expand All @@ -24,8 +24,8 @@
"sku": {
"name": "DataBox"
},
"name": "SdkJob7196",
"id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/SdkRg8120/providers/Microsoft.DataBox/jobs/SdkJob7196",
"name": "SdkJob8367",
"id": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourceGroups/SdkRg8120/providers/Microsoft.DataBox/jobs/SdkJob8367",
"type": "Microsoft.DataBox/jobs"
}
}
Expand Down
Loading