diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-29 06:36:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-29 06:36:43 +0000 |
| commit | dd6d7529665eb6bd06de55e0aadc1a860e1edb2a (patch) | |
| tree | cdbfe1ae053863d71b9eabe1b0ab0197b3135a67 | |
| parent | c9b7c3577f373477d003706bb5ca748a51bbf023 (diff) | |
| parent | 064f215172b78d18f18699f1cece7f2b61d198ad (diff) | |
| download | nova-18.0.0.0b3.tar.gz | |
Merge "Fix ServerMigrationSampleJsonTests to use sample files from version dir"18.0.0.0b3
| -rw-r--r-- | api-ref/source/server-migrations.inc | 2 | ||||
| -rw-r--r-- | doc/api_samples/server-migrations/v2.22/force_complete.json (renamed from doc/api_samples/server-migrations/force_complete.json) | 0 | ||||
| -rw-r--r-- | doc/api_samples/server-migrations/v2.22/live-migrate-server.json (renamed from doc/api_samples/server-migrations/live-migrate-server.json) | 0 | ||||
| -rw-r--r-- | nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.22/force_complete.json.tpl (renamed from nova/tests/functional/api_sample_tests/api_samples/server-migrations/force_complete.json.tpl) | 0 | ||||
| -rw-r--r-- | nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.22/live-migrate-server.json.tpl (renamed from nova/tests/functional/api_sample_tests/api_samples/server-migrations/live-migrate-server.json.tpl) | 0 | ||||
| -rw-r--r-- | nova/tests/functional/api_sample_tests/test_server_migrations.py | 2 |
6 files changed, 2 insertions, 2 deletions
diff --git a/api-ref/source/server-migrations.inc b/api-ref/source/server-migrations.inc index 3f0011b28c..f0d45f2d44 100644 --- a/api-ref/source/server-migrations.inc +++ b/api-ref/source/server-migrations.inc @@ -167,7 +167,7 @@ Request **Example Force Migration Complete (force_complete Action)** -.. literalinclude:: ../../doc/api_samples/server-migrations/force_complete.json +.. literalinclude:: ../../doc/api_samples/server-migrations/v2.22/force_complete.json :language: javascript Response diff --git a/doc/api_samples/server-migrations/force_complete.json b/doc/api_samples/server-migrations/v2.22/force_complete.json index e2adb7b5a0..e2adb7b5a0 100644 --- a/doc/api_samples/server-migrations/force_complete.json +++ b/doc/api_samples/server-migrations/v2.22/force_complete.json diff --git a/doc/api_samples/server-migrations/live-migrate-server.json b/doc/api_samples/server-migrations/v2.22/live-migrate-server.json index 251863d785..251863d785 100644 --- a/doc/api_samples/server-migrations/live-migrate-server.json +++ b/doc/api_samples/server-migrations/v2.22/live-migrate-server.json diff --git a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/force_complete.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.22/force_complete.json.tpl index e2adb7b5a0..e2adb7b5a0 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/force_complete.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.22/force_complete.json.tpl diff --git a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/live-migrate-server.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.22/live-migrate-server.json.tpl index 4800d4aa11..4800d4aa11 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/live-migrate-server.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.22/live-migrate-server.json.tpl diff --git a/nova/tests/functional/api_sample_tests/test_server_migrations.py b/nova/tests/functional/api_sample_tests/test_server_migrations.py index 890a1c5db6..7e4785539b 100644 --- a/nova/tests/functional/api_sample_tests/test_server_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_server_migrations.py @@ -29,12 +29,12 @@ from nova.tests.unit import fake_instance class ServerMigrationsSampleJsonTest(test_servers.ServersSampleBase): sample_dir = 'server-migrations' scenarios = [('v2_22', {'api_major_version': 'v2.1'})] + microversion = '2.22' def setUp(self): """setUp method for server usage.""" super(ServerMigrationsSampleJsonTest, self).setUp() self.uuid = self._post_server() - self.api.microversion = '2.22' @mock.patch.object(conductor_manager.ComputeTaskManager, '_live_migrate') @mock.patch.object(db, 'service_get_by_compute_host') |