From 183ba80ec586b8661967c3a5eeb1bb44838276bc Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 25 Sep 2018 17:06:02 -0400 Subject: [PATCH] api-ref: add 'migrations' param to GET /os-migrations The response parameter table for the GET /os-migrations API reference was missing the top level "migrations" parameter which is the list of migration objects. While in here, fix the fake "Done" status to "done" in the sample. There is nothing in nova that uses a status of "Done". The evacuate operation uses "done". Change-Id: I1e193237e9aec05395cd2760d96e70db7791409b --- api-ref/source/os-migrations.inc | 1 + 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 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api-ref/source/os-migrations.inc b/api-ref/source/os-migrations.inc index 2a9e457cbdb5..0da9a558b1a4 100644 --- a/api-ref/source/os-migrations.inc +++ b/api-ref/source/os-migrations.inc @@ -42,6 +42,7 @@ Response .. rest_parameters:: parameters.yaml + - migrations: migrations - created_at: created - dest_compute: migrate_dest_compute - dest_host: migrate_dest_host diff --git a/doc/api_samples/os-migrations/migrations-get.json b/doc/api_samples/os-migrations/migrations-get.json index 91775be77581..808636ac1aaf 100644 --- a/doc/api_samples/os-migrations/migrations-get.json +++ b/doc/api_samples/os-migrations/migrations-get.json @@ -11,7 +11,7 @@ "old_instance_type_id": 1, "source_compute": "compute1", "source_node": "node1", - "status": "Done", + "status": "done", "updated_at": "2012-10-29T13:42:02.000000" }, { @@ -25,7 +25,7 @@ "old_instance_type_id": 5, "source_compute": "compute10", "source_node": "node10", - "status": "Done", + "status": "done", "updated_at": "2013-10-22T13:42:02.000000" } ] 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 91775be77581..808636ac1aaf 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 @@ -11,7 +11,7 @@ "old_instance_type_id": 1, "source_compute": "compute1", "source_node": "node1", - "status": "Done", + "status": "done", "updated_at": "2012-10-29T13:42:02.000000" }, { @@ -25,7 +25,7 @@ "old_instance_type_id": 5, "source_compute": "compute10", "source_node": "node10", - "status": "Done", + "status": "done", "updated_at": "2013-10-22T13:42:02.000000" } ] diff --git a/nova/tests/functional/api_sample_tests/test_migrations.py b/nova/tests/functional/api_sample_tests/test_migrations.py index fc9ac1224ed0..c438828f495d 100644 --- a/nova/tests/functional/api_sample_tests/test_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_migrations.py @@ -37,7 +37,7 @@ def _stub_migrations(stub_self, context, filters): 'source_compute': 'compute1', 'dest_compute': 'compute2', 'dest_host': '1.2.3.4', - 'status': 'Done', + 'status': 'done', 'instance_uuid': 'instance_id_123', 'old_instance_type_id': 1, 'new_instance_type_id': 2, @@ -56,7 +56,7 @@ def _stub_migrations(stub_self, context, filters): 'source_compute': 'compute10', 'dest_compute': 'compute20', 'dest_host': '5.6.7.8', - 'status': 'Done', + 'status': 'done', 'instance_uuid': 'instance_id_456', 'old_instance_type_id': 5, 'new_instance_type_id': 6,