openstack/tempest
Code Issues Proposed changes

Do not pass disk_over_commit after Microversion 2.25

Browse Source 
disk_over_commit is removed from os-migrateLive in Microversion 2.25,
so do not pass it when calling live_migrate_server.

Ref: https://docs.openstack.org/nova/latest/reference/api-microversion-history.html#maximum-in-mitaka

Implements blueprint: clear-deprecated-api

Change-Id: Ie2c47908bfd2dd9753865f4f6ee58b991f538de8
This commit is contained in:
zhufl
2018-03-30 10:45:05 +08:00
committed by Ghanshyam Mann
parent c606a5bf2b
commit 40891d209a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tempest/api/compute/admin/test_live_migration.py
View File

@@ -66,7 +66,8 @@ class LiveMigrationTest(base.BaseV2ComputeAdminTest):
kwargs = dict()
block_migration = getattr(self, 'block_migration', None)
if self.block_migration is None:
kwargs['disk_over_commit'] = False
if self.is_requested_microversion_compatible('2.24'):
kwargs['disk_over_commit'] = False
block_migration = (CONF.compute_feature_enabled.
block_migration_for_live_migration and
not volume_backed)

7
tempest/api/compute/admin/test_live_migration_negative.py
View File

@@ -32,9 +32,10 @@ class LiveMigrationNegativeTest(base.BaseV2ComputeAdminTest):
def _migrate_server_to(self, server_id, dest_host):
bmflm = CONF.compute_feature_enabled.block_migration_for_live_migration
self.admin_servers_client.live_migrate_server(
server_id, host=dest_host, block_migration=bmflm,
disk_over_commit=False)
kwargs = dict(host=dest_host, block_migration=bmflm)
if self.is_requested_microversion_compatible('2.24'):
kwargs['disk_over_commit'] = False
self.admin_servers_client.live_migrate_server(server_id, **kwargs)
@decorators.attr(type=['negative'])
@decorators.idempotent_id('7fb7856e-ae92-44c9-861a-af62d7830bcb')