Skip to content

Commit

Permalink
Update admin disk API to support DiskRP Migration Progress feature (#…
Browse files Browse the repository at this point in the history
…16072)

* DiskRP Admin: Clone 2021-04-01 to 2021-09-01

* Update admin disk API to support DiskRP Migration Progress feature

Co-authored-by: Xingdong Li <[email protected]>
  • Loading branch information
RemindD and RemindD authored Nov 8, 2021
1 parent fdf486a commit ddda805
Show file tree
Hide file tree
Showing 10 changed files with 1,383 additions and 10 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
"location": "redmond",
"migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"api-version": "2021-04-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"name": "redmond/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
"location": "redmond",
"properties": {
"migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"status": "Canceled",
"subtasks": [
{
"migrationSubTaskId": "726dff1c-e765-44c6-b16d-f66f2c28e730",
"properties": {
"migrationSubtaskStatus": "Canceled",
"startTime": "2018-05-17T08:26:54.57146Z",
"endTime": "2018-05-17T08:27:35.0559255Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
"targetDiskStateForMigration": "Unattached",
"diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"progress": "0%"
}
},
{
"migrationSubTaskId": "d6ab496c-4a76-474f-9ee2-9031053f06e8",
"properties": {
"migrationSubtaskStatus": "Succeeded",
"startTime": "2018-05-17T08:27:35.0871773Z",
"endTime": "2018-05-17T08:28:15.2842678Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"targetDiskStateForMigration": "Unattached",
"diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab",
"progress": "100%"
}
}
],
"creationTime": "2018-05-17T08:26:54.4777279Z",
"startTime": "2018-05-17T08:26:54.5402097Z",
"endTime": "0001-01-01T08:00:00Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"parameters": {
"subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
"location": "redmond",
"migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"api-version": "2021-04-01",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"disks": [
{
"location": "redmond",
"properties": {
"diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"status": "Unattached",
"sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4"
}
},
{
"location": "redmond",
"properties": {
"diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab",
"status": "Unattached",
"sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2"
}
}
]
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"name": "redmond/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
"location": "redmond",
"properties": {
"migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"status": "Pending",
"subtasks": [
{
"migrationSubTaskId": "726dff1c-e765-44c6-b16d-f66f2c28e730",
"properties": {
"migrationSubtaskStatus": "Pending",
"startTime": "0001-01-01T08:00:00Z",
"endTime": "0001-01-01T08:00:00Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
"targetDiskStateForMigration": "Unattached",
"diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"progress": "0%"
}
},
{
"migrationSubTaskId": "d6ab496c-4a76-474f-9ee2-9031053f06e8",
"properties": {
"migrationSubtaskStatus": "Pending",
"startTime": "0001-01-01T08:00:00Z",
"endTime": "0001-01-01T08:00:00Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"targetDiskStateForMigration": "Unattached",
"diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab"
}
}
],
"creationTime": "2018-05-17T08:26:54.4777279Z",
"startTime": "0001-01-01T08:00:00Z",
"endTime": "0001-01-01T08:00:00Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
"location": "redmond",
"migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"api-version": "2021-04-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"name": "redmond/ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
"location": "redmond",
"properties": {
"migrationId": "ec9f79cf-e4d7-4d37-926a-e69c2198be8a",
"status": "Running",
"subtasks": [
{
"migrationSubTaskId": "726dff1c-e765-44c6-b16d-f66f2c28e730",
"properties": {
"migrationSubtaskStatus": "Succeeded",
"startTime": "2018-05-17T08:26:54.57146Z",
"endTime": "2018-05-17T08:27:35.0559255Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
"targetDiskStateForMigration": "Unattached",
"diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"progress": "100%"
}
},
{
"migrationSubTaskId": "d6ab496c-4a76-474f-9ee2-9031053f06e8",
"properties": {
"migrationSubtaskStatus": "Running",
"startTime": "2018-05-17T08:27:35.0871773Z",
"endTime": "0001-01-01T08:00:00Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"targetDiskStateForMigration": "Unattached",
"diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab",
"progress": "50%"
}
}
],
"creationTime": "2018-05-17T08:26:54.4777279Z",
"startTime": "2018-05-17T08:26:54.5402097Z",
"endTime": "0001-01-01T08:00:00Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
{
"parameters": {
"subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
"location": "redmond",
"api-version": "2021-04-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/0050e481-63cd-4ad1-9c49-b8cbb992b75e",
"name": "redmond/0050e481-63cd-4ad1-9c49-b8cbb992b75e",
"type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
"location": "redmond",
"properties": {
"migrationId": "0050e481-63cd-4ad1-9c49-b8cbb992b75e",
"status": "Succeeded",
"subtasks": [
{
"migrationSubTaskId": "607d1e44-48f5-418e-a263-ec60fb35d285",
"properties": {
"migrationSubtaskStatus": "Succeeded",
"startTime": "2018-05-17T09:29:36.1290315Z",
"endTime": "2018-05-17T09:30:16.3566829Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"targetDiskStateForMigration": "Unattached",
"diskId": "5018f340-c41b-4e82-a553-248431c4df64",
"progress": "100%"
}
},
{
"migrationSubTaskId": "cfe7b95e-d45c-4515-af2a-3a889e70559a",
"properties": {
"migrationSubtaskStatus": "Succeeded",
"startTime": "2018-05-17T09:30:16.3723117Z",
"endTime": "2018-05-17T09:30:56.5945261Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
"targetDiskStateForMigration": "Unattached",
"diskId": "4d9c7dd9-50ea-473d-87be-f7a57acd8aae",
"progress": "100%"
}
}
],
"creationTime": "2018-05-17T09:29:36.0351498Z",
"startTime": "2018-05-17T09:29:36.0976561Z",
"endTime": "2018-05-17T09:31:06.6187954Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2"
}
},
{
"id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/diskmigrationjobs/9fbb98b2-fe81-449a-9d71-61bccb0d0489",
"name": "redmond/9fbb98b2-fe81-449a-9d71-61bccb0d0489",
"type": "Microsoft.Compute.Admin/locations/diskmigrationjobs",
"location": "redmond",
"properties": {
"migrationId": "9fbb98b2-fe81-449a-9d71-61bccb0d0489",
"status": "Succeeded",
"subtasks": [
{
"migrationSubTaskId": "5a76680f-3788-492c-9840-ffb4c9f95729",
"properties": {
"migrationSubtaskStatus": "Succeeded",
"startTime": "2018-05-18T02:18:49.1442797Z",
"endTime": "2018-05-18T02:19:29.4948624Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"targetDiskStateForMigration": "Unattached",
"diskId": "48dc9b56-5883-4011-9dc3-0e527f33e6ab",
"progress": "100%"
}
},
{
"migrationSubTaskId": "c302a235-9e8c-431d-8a5e-8b1fc984b7ab",
"properties": {
"migrationSubtaskStatus": "Succeeded",
"startTime": "2018-05-18T02:19:29.5104777Z",
"endTime": "2018-05-18T02:20:09.7263314Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2",
"sourceShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_1",
"targetDiskStateForMigration": "Unattached",
"diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"progress": "100%"
}
}
],
"creationTime": "2018-05-18T02:18:49.0978853Z",
"startTime": "2018-05-18T02:18:49.1286583Z",
"endTime": "2018-05-18T02:20:19.7823733Z",
"targetShare": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_2"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parameters": {
"subscriptionId": "04666444-56f0-4d4f-afc5-dbd6b134b084",
"location": "redmond",
"diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"api-version": "2021-04-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/04666444-56f0-4d4f-afc5-dbd6b134b084/providers/Microsoft.Compute.Admin/locations/redmond/disks/423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"name": "redmond/423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"type": "Microsoft.Compute.Admin/locations/disks",
"location": "redmond",
"properties": {
"diskId": "423e4eb4-f791-4d13-ad5b-4d415733b0d6",
"status": "Unattached",
"sharePath": "\\\\SU1FileServer.mydomain.com\\SU1_ObjStore_4",
"actualSizeGB": 183,
"provisionSizeGB": 200,
"userResourceId": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/DISKRG6ECD14E6/providers/Microsoft.Compute/Disks/diskrptest9vb55sb15w",
"diskType": "Disk",
"diskSku": "Standard_LRS",
"creationSourceUri": "/subscriptions/4496690e-348e-4dc0-addc-17395c3966ba/resourceGroups/diskrptest/providers/Microsoft.Compute/disks/testmd01",
"creationOption": "Copy",
"exclusiveAllocatedSize": 1073741824
}
}
}
}
}
Loading

0 comments on commit ddda805

Please sign in to comment.