From 64bf8da9776e66b1bb90008b63658fc2b9a1c0dc Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Tue, 9 Oct 2018 14:31:11 +0900 Subject: [PATCH] api-ref: Replace non UUID string with UUID In the "List Migrations" (GET /os-migrations) API, there are the following response body examples. * Example List Migrations: JSON response * Example List Migrations (v2.59) * Example List Migrations With Paging (v2.59) In the second and third examples, the 'instance_uuid' are UUID strings. But in the first one, the 'instance_uuid' is not UUID. It should be a UUID string. So replace non UUID string with a UUID string in the example. Change-Id: I6c29c48f53838beb7da3ec0f849380e3706df422 --- doc/api_samples/os-migrations/migrations-get.json | 4 ++-- .../api_samples/os-migrations/migrations-get.json.tpl | 4 ++-- nova/tests/functional/api_sample_tests/test_migrations.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/api_samples/os-migrations/migrations-get.json b/doc/api_samples/os-migrations/migrations-get.json index 808636ac1aaf..bdcc768681da 100644 --- a/doc/api_samples/os-migrations/migrations-get.json +++ b/doc/api_samples/os-migrations/migrations-get.json @@ -6,7 +6,7 @@ "dest_host": "1.2.3.4", "dest_node": "node2", "id": 1234, - "instance_uuid": "instance_id_123", + "instance_uuid": "8600d31b-d1a1-4632-b2ff-45c2be1a70ff", "new_instance_type_id": 2, "old_instance_type_id": 1, "source_compute": "compute1", @@ -20,7 +20,7 @@ "dest_host": "5.6.7.8", "dest_node": "node20", "id": 5678, - "instance_uuid": "instance_id_456", + "instance_uuid": "9128d044-7b61-403e-b766-7547076ff6c1", "new_instance_type_id": 6, "old_instance_type_id": 5, "source_compute": "compute10", diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-migrations/migrations-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-migrations/migrations-get.json.tpl index 808636ac1aaf..bdcc768681da 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-migrations/migrations-get.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-migrations/migrations-get.json.tpl @@ -6,7 +6,7 @@ "dest_host": "1.2.3.4", "dest_node": "node2", "id": 1234, - "instance_uuid": "instance_id_123", + "instance_uuid": "8600d31b-d1a1-4632-b2ff-45c2be1a70ff", "new_instance_type_id": 2, "old_instance_type_id": 1, "source_compute": "compute1", @@ -20,7 +20,7 @@ "dest_host": "5.6.7.8", "dest_node": "node20", "id": 5678, - "instance_uuid": "instance_id_456", + "instance_uuid": "9128d044-7b61-403e-b766-7547076ff6c1", "new_instance_type_id": 6, "old_instance_type_id": 5, "source_compute": "compute10", diff --git a/nova/tests/functional/api_sample_tests/test_migrations.py b/nova/tests/functional/api_sample_tests/test_migrations.py index c438828f495d..51024501d32a 100644 --- a/nova/tests/functional/api_sample_tests/test_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_migrations.py @@ -38,7 +38,7 @@ def _stub_migrations(stub_self, context, filters): 'dest_compute': 'compute2', 'dest_host': '1.2.3.4', 'status': 'done', - 'instance_uuid': 'instance_id_123', + 'instance_uuid': INSTANCE_UUID_1, 'old_instance_type_id': 1, 'new_instance_type_id': 2, 'migration_type': 'resize', @@ -57,7 +57,7 @@ def _stub_migrations(stub_self, context, filters): 'dest_compute': 'compute20', 'dest_host': '5.6.7.8', 'status': 'done', - 'instance_uuid': 'instance_id_456', + 'instance_uuid': INSTANCE_UUID_2, 'old_instance_type_id': 5, 'new_instance_type_id': 6, 'migration_type': 'resize',