openstack
/
nova
Code Issues Proposed changes

Fix ServerMigrationSampleJsonTestsV2_24 to use its own sample file 

The ServerMigrationSampleJsonTestsV2_24 functional tests set up
``self.api.microversion`` to 2.24 in its' setUp(), by doing this
it will not need to add its' own sample files, as there will be
no difference anyway. But this makes Tests that inherent from this
test class impossibe to run as the microversion will always been
overriden.

This patch fix it by change the tests to use self.microversion and
adds its' own sample files.

Part of blueprint abort-live-migration-in-queued-status

Change-Id: I07222efb8d566fa1dd395ef948eae6e6c4b13678
This commit is contained in:
Kevin_Zheng 2018-07-11 12:11:36 +08:00 committed by Matt Riedemann
parent d23794d25f
commit e8192177e8
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/api_samples/server-migrations/v2.24/live-migrate-server.json Normal file
View File

@ -0,0 +1,7 @@
{
"os-migrateLive": {
"host": "01c0cadef72d47e28a672a76060d492c",
"block_migration": false,
"disk_over_commit": false
}
}

7
nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.24/live-migrate-server.json.tpl Normal file
View File

@ -0,0 +1,7 @@
{
"os-migrateLive": {
"host": "%(hostname)s",
"block_migration": false,
"disk_over_commit": false
}
}

2
nova/tests/functional/api_sample_tests/test_server_migrations.py
View File

@ -163,13 +163,13 @@ class ServerMigrationsSamplesJsonTestV2_23(test_servers.ServersSampleBase):
class ServerMigrationsSampleJsonTestV2_24(test_servers.ServersSampleBase):
ADMIN_API = True
microversion = '2.24'
sample_dir = "server-migrations"
scenarios = [('v2_24', {'api_major_version': 'v2.1'})]
def setUp(self):
"""setUp method for server usage."""
super(ServerMigrationsSampleJsonTestV2_24, self).setUp()
self.api.microversion = '2.24'
self.uuid = self._post_server()
self.context = context.RequestContext('fake', 'fake')
fake_migration = {