Merge "Fix ServerMigrationSampleJsonTests to use sample files from version dir"

This commit is contained in:
Zuul 2018-07-29 06:36:42 +00:00 committed by Gerrit Code Review
commit dd6d752966
6 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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')