Skip to content

Commit fc77ec7

Browse files
mihaelabalutoiuDany9966
authored andcommitted
Update api docs
Signed-off-by: Mihaela Balutoiu <[email protected]>
1 parent 9cec021 commit fc77ec7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1688
-1944
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"deployment": {
3+
"clone_disks": true,
4+
"force": false,
5+
"transfer_id": "0460aa4d-6b16-4c98-bd56-27ee186e4a22",
6+
"skip_os_morphing": false,
7+
"instance_osmorphing_minion_pool_mappings": {
8+
"instance1": "morphing_pool"
9+
}
10+
}
11+
}

coriolis/api-refs/api_samples/migration/openstack-migration-from-replica-resp.json renamed to coriolis/api-refs/api_samples/deployment/openstack-deployment-from-transfer-resp.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"migration": {
2+
"deployment": {
33
"created_at": "2019-07-11T13:01:03.000000",
44
"updated_at": null,
55
"deleted_at": null,
@@ -22,8 +22,10 @@
2222
"port_reuse_policy": "keep_mac",
2323
"set_dhcp": true
2424
},
25-
"type": "migration",
26-
"instances": ["ubuntu-xenial"],
25+
"type": "deployment",
26+
"instances": [
27+
"ubuntu-xenial"
28+
],
2729
"reservation_id": null,
2830
"notes": null,
2931
"origin_endpoint_id": "5a276274-f964-4c07-aec4-01a7971d9eea",
@@ -33,14 +35,16 @@
3335
"storage_mappings": {},
3436
"source_environment": {},
3537
"id": "480a4ba6-db63-43cb-a91b-4ef65665cd26",
36-
"replica_id": "78f89897-fca0-465c-bf0c-b23b36dfd619",
37-
"status": "RUNNING",
38+
"transfer_id": "78f89897-fca0-465c-bf0c-b23b36dfd619",
3839
"last_execution_status": "UNEXECUTED",
3940
"origin_minion_pool_id": null,
4041
"destination_minion_pool_id": "a5e00fd3-42ac-4570-898b-5bbee0ff4acb",
41-
"instance_osmorphing_minion_pool_mappings": {"instance1": "morphing_pool"},
42+
"instance_osmorphing_minion_pool_mappings": {
43+
"instance1": "morphing_pool"
44+
},
45+
"user_scripts": {},
46+
"transfer_scenario_type": "replica",
4247
"shutdown_instances": false,
43-
"replication_count": 2,
4448
"tasks": [
4549
{
4650
"created_at": "2019-07-11T13:01:03.000000",
@@ -53,7 +57,7 @@
5357
"host": null,
5458
"process_id": null,
5559
"status": "PENDING",
56-
"task_type": "VALIDATE_REPLICA_DEPLOYMENT_INPUTS",
60+
"task_type": "VALIDATE_DEPLOYMENT_INPUTS",
5761
"exception_details": null,
5862
"depends_on": null,
5963
"on_error": false,
@@ -91,7 +95,7 @@
9195
"host": null,
9296
"process_id": null,
9397
"status": "PENDING",
94-
"task_type": "CREATE_REPLICA_DISK_SNAPSHOTS",
98+
"task_type": "CREATE_TRANSFER_DISK_SNAPSHOTS",
9599
"exception_details": null,
96100
"depends_on": [
97101
"9a1cfa58-553f-41ba-ac98-e79d2072051a",
@@ -112,7 +116,7 @@
112116
"host": null,
113117
"process_id": null,
114118
"status": "PENDING",
115-
"task_type": "DEPLOY_REPLICA_INSTANCE",
119+
"task_type": "DEPLOY_INSTANCE_RESOURCES",
116120
"exception_details": null,
117121
"depends_on": [
118122
"2466c7c1-a228-48a0-a805-38903accec46"
@@ -192,7 +196,7 @@
192196
"host": null,
193197
"process_id": null,
194198
"status": "PENDING",
195-
"task_type": "FINALIZE_REPLICA_INSTANCE_DEPLOYMENT",
199+
"task_type": "FINALIZE_INSTANCE_DEPLOYMENT",
196200
"exception_details": null,
197201
"depends_on": [
198202
"8892d1cf-0120-4e3f-9563-c0ee8cb278e8"
@@ -212,7 +216,7 @@
212216
"host": null,
213217
"process_id": null,
214218
"status": "PENDING",
215-
"task_type": "DELETE_REPLICA_DISK_SNAPSHOTS",
219+
"task_type": "DELETE_TRANSFER_TARGET_DISK_SNAPSHOTS",
216220
"exception_details": null,
217221
"depends_on": [
218222
"86048ea8-9520-4797-877b-66934e1723ac"

coriolis/api-refs/api_samples/migration/openstack-migration-get-resp.json renamed to coriolis/api-refs/api_samples/deployment/openstack-deployment-get-resp.json

Lines changed: 79 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"migration": {
2+
"deployment": {
33
"created_at": "2019-07-10T07:24:09.000000",
44
"updated_at": "2019-07-10T08:39:05.000000",
55
"deleted_at": null,
@@ -8,44 +8,99 @@
88
"user_id": "7cf9b4745d514517b3eae440438136bc",
99
"project_id": "ffc16db2011e41f28152897c279b6bcc",
1010
"destination_environment": {
11-
"migr_flavor_name": "m1.small",
12-
"storage_mappings": {
13-
"lvmdriver-1": "lvm-1"
14-
},
15-
"keypair_name": "new-key",
16-
"delete_disks_on_vm_termination": false,
17-
"migr_image_map": {
18-
"linux": "ubuntu-xenial-img",
19-
"windows": "63d8f1a4-3192-4edc-b113-0d099b4bc458"
20-
},
21-
"migr_network": "provider-net",
22-
"port_reuse_policy": "keep_mac",
23-
"set_dhcp": true,
24-
"network_map": {
25-
"private": "provider-net"
11+
"migr_flavor_name": "m1.small",
12+
"storage_mappings": {
13+
"lvmdriver-1": "lvm-1"
14+
},
15+
"keypair_name": "new-key",
16+
"delete_disks_on_vm_termination": false,
17+
"migr_image_map": {
18+
"linux": "ubuntu-xenial-img",
19+
"windows": "63d8f1a4-3192-4edc-b113-0d099b4bc458"
20+
},
21+
"migr_network": "provider-net",
22+
"port_reuse_policy": "keep_mac",
23+
"set_dhcp": true,
24+
"network_map": {
25+
"private": "provider-net"
2626
}
2727
},
28-
"type": "migration",
29-
"instances": ["windows"],
28+
"type": "deployment",
29+
"instances": [
30+
"windows"
31+
],
3032
"reservation_id": null,
3133
"notes": "",
3234
"origin_endpoint_id": "b59051a2-bbf3-4fb7-a1eb-539db55339dc",
3335
"destination_endpoint_id": "6258fa20-5d1f-44fa-ae12-c94122263fa3",
34-
"transfer_result": null,
36+
"transfer_result": {
37+
"windows": {
38+
"num_cpu": 1,
39+
"num_cores_per_socket": 1,
40+
"memory_mb": 1024,
41+
"nested_virtualization": false,
42+
"name": "windows-instance",
43+
"id": "00ea28b8-4760-4890-bd79-227b7327a209",
44+
"flavor_name": "ds1G",
45+
"os_type": "linux",
46+
"firmware_type": "BIOS",
47+
"secure_boot": false,
48+
"devices": {
49+
"nics": [
50+
{
51+
"name": "8ea26385-04e5-418b-9ca7-e36c36d6c69b",
52+
"id": "8ea26385-04e5-418b-9ca7-e36c36d6c69b",
53+
"mac_address": "00:50:56:9c:23:b6",
54+
"ip_addresses": [
55+
"10.0.0.34"
56+
],
57+
"network_id": "0e83bf34-9cc7-4580-9189-a9d9c3c7abb8",
58+
"network_name": "private"
59+
}
60+
],
61+
"disks": [
62+
{
63+
"format": "raw",
64+
"guest_device": "/dev/vda",
65+
"size_bytes": 1073741824,
66+
"path": "",
67+
"id": "6eb6f752-4ae5-450d-995f-436ecc48f400",
68+
"storage_backend_identifier": "lvmdriver-1"
69+
}
70+
],
71+
"cdroms": [],
72+
"serial_ports": [],
73+
"floppies": [],
74+
"controllers": []
75+
}
76+
}
77+
},
3578
"network_map": {
3679
"private": "provider-net"
3780
},
38-
"storage_mappings": {},
81+
"storage_mappings": {
82+
"backend_mappings": [
83+
{
84+
"source": "afsan1",
85+
"destination": "lvmdriver-1"
86+
}
87+
],
88+
"disk_mappings": [
89+
{
90+
"disk_id": "3000",
91+
"destination": "lvmdriver-1"
92+
}
93+
]
94+
},
3995
"source_environment": {},
4096
"id": "1e31443d-5eb1-403f-9f15-c67a2c372bc3",
41-
"replica_id": null,
42-
"status": "COMPLETED",
97+
"transfer_id": "20281dd8-b00e-4801-99e4-39d7fae7ed76",
4398
"last_execution_status": "COMPLETED",
4499
"origin_minion_pool_id": null,
45100
"destination_minion_pool_id": "a5e00fd3-42ac-4570-898b-5bbee0ff4acb",
46101
"instance_osmorphing_minion_pool_mappings": {},
102+
"transfer_scenario_type": "replica",
47103
"shutdown_instances": false,
48-
"replication_count": 2,
49104
"tasks": [
50105
{
51106
"created_at": "2019-07-10T07:24:09.000000",
@@ -58,7 +113,7 @@
58113
"host": "coriolis-worker",
59114
"process_id": 11,
60115
"status": "COMPLETED",
61-
"task_type": "VALIDATE_MIGRATION_INPUTS",
116+
"task_type": "VALIDATE_DEPLOYMENT_INPUTS",
62117
"exception_details": null,
63118
"depends_on": null,
64119
"on_error": false,

coriolis/api-refs/api_samples/migration/openstack-migration-list-detail-resp.json renamed to coriolis/api-refs/api_samples/deployment/openstack-deployment-list-detail-resp.json

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"migrations": [
2+
"deployments": [
33
{
44
"created_at": "2019-08-20T12:32:31.000000",
55
"updated_at": "2019-08-20T12:32:42.000000",
@@ -37,7 +37,8 @@
3737
"port_reuse_policy": "keep_mac",
3838
"set_dhcp": true
3939
},
40-
"type": "migration",
40+
"type": "deployment",
41+
"executions": [],
4142
"instances": [
4243
"CI/openwrt"
4344
],
@@ -65,14 +66,17 @@
6566
},
6667
"source_environment": {},
6768
"id": "65bd70e4-c4ab-4f60-9d78-779c0b58c2ab",
68-
"replica_id": null,
69-
"status": "ERROR",
69+
"transfer_id": "0460aa4d-6b16-4c98-bd56-27ee186e4a22",
7070
"last_execution_status": "COMPLETED",
7171
"origin_minion_pool_id": null,
7272
"destination_minion_pool_id": "a5e00fd3-42ac-4570-898b-5bbee0ff4acb",
7373
"instance_osmorphing_minion_pool_mappings": {},
74-
"shutdown_instances": false,
75-
"replication_count": 2
74+
"user_scripts": {
75+
"global": {},
76+
"instances": {}
77+
},
78+
"transfer_scenario_type": "replica",
79+
"shutdown_instances": false
7680
},
7781
{
7882
"created_at": "2019-08-22T08:29:33.000000",
@@ -107,7 +111,7 @@
107111
},
108112
"migr_network": "private"
109113
},
110-
"type": "migration",
114+
"type": "deployment",
111115
"instances": [
112116
"CI/openwrt"
113117
],
@@ -124,6 +128,7 @@
124128
"name": "openwrt",
125129
"id": "00ea28b8-4760-4890-bd79-227b7327a209",
126130
"flavor_name": "ds1G",
131+
"secure_boot": false,
127132
"devices": {
128133
"nics": [
129134
{
@@ -175,10 +180,13 @@
175180
"source_environment": {
176181
"vixdisklib_compatibility_version": "6.0"
177182
},
183+
"user_scripts": {
184+
"global": {},
185+
"instances": {}
186+
},
178187
"id": "9566af98-2c89-4969-ad73-a416e8a8a5ce",
179-
"replica_id": "96d71f92-1cbd-48cb-98aa-06ce8cbf89cf",
180-
"status": "COMPLETED",
181-
"replication_count": 2
188+
"transfer_id": "0460aa4d-6b16-4c98-bd56-27ee186e4a22",
189+
"transfer_scenario_type": "replica"
182190
}
183191
]
184192
}

coriolis/api-refs/api_samples/endpoint/endpoint-get-resp-secret.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"type": "openstack",
1414
"name": "devstack",
1515
"description": null,
16-
"mapped_regions": ["public"]
16+
"mapped_regions": [
17+
"public"
18+
]
1719
}
1820
}

coriolis/api-refs/api_samples/endpoint/endpoint-list-resp.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
"type": "openstack",
2424
"name": "Endpoint Name Example",
2525
"description": "Example Endpoint Description",
26-
"mapped_regions": ["public"]
26+
"mapped_regions": [
27+
"public"
28+
]
2729
},
2830
{
2931
"created_at": "2019-07-09T07:04:13.000000",

coriolis/api-refs/api_samples/endpoint/openstack-endpoint-create-req.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
"type": "openstack",
4848
"name": "Endpoint Name Example",
4949
"description": "Example Endpoint Description",
50-
"mapped_regions": ["public"]
50+
"mapped_regions": [
51+
"public"
52+
]
5153
}
5254
}

coriolis/api-refs/api_samples/endpoint/openstack-endpoint-destination-options-list-resp.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@
1010
},
1111
{
1212
"name": "migr_fip_pool_name",
13-
"values": ["public"],
13+
"values": [
14+
"public"
15+
],
1416
"config_default": "public"
1517
},
1618
{
1719
"name": "security_groups",
18-
"values": ["default""def-grp"],
20+
"values": [
21+
"default",
22+
"def-grp"
23+
],
1924
"config_default": []
2025
},
2126
{

coriolis/api-refs/api_samples/endpoint/openstack-endpoint-get-resp.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
"type": "openstack",
4343
"name": "Endpoint Name Example",
4444
"description": "Example Endpoint Description",
45-
"mapped_regions": ["public"]
45+
"mapped_regions": [
46+
"public"
47+
]
4648
}
4749
}

coriolis/api-refs/api_samples/endpoint/openstack-endpoint-update-req.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
},
4747
"name": "Updated Name",
4848
"description": "Updated description",
49-
"mapped_regions": ["public"]
49+
"mapped_regions": [
50+
"public"
51+
]
5052
}
5153
}

coriolis/api-refs/api_samples/endpoint/openstack-endpoint-update-resp.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
"type": "openstack",
5555
"name": "Updated Name",
5656
"description": "Updated description",
57-
"mapped_regions": ["public"]
57+
"mapped_regions": [
58+
"public"
59+
]
5860
}
5961
}

coriolis/api-refs/api_samples/migration/migration-from-replica-req.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)