diff --git a/tempest/api/compute/admin/test_live_migration.py b/tempest/api/compute/admin/test_live_migration.py index 489dbaca32..79c2ac9e2e 100644 --- a/tempest/api/compute/admin/test_live_migration.py +++ b/tempest/api/compute/admin/test_live_migration.py @@ -56,9 +56,10 @@ class LiveBlockMigrationTestJSON(base.BaseV2ComputeAdminTest): return self._get_server_details(server_id)[self._host_key] def _migrate_server_to(self, server_id, dest_host): + bmflm = CONF.compute_feature_enabled.block_migration_for_live_migration body = self.admin_servers_client.live_migrate_server( - server_id, dest_host, - CONF.compute_feature_enabled.block_migration_for_live_migration) + server_id, host=dest_host, block_migration=bmflm, + disk_over_commit=False) return body def _get_host_other_than(self, host): diff --git a/tempest/api/compute/test_live_block_migration_negative.py b/tempest/api/compute/test_live_block_migration_negative.py index fabe55d77c..2cd85f2110 100644 --- a/tempest/api/compute/test_live_block_migration_negative.py +++ b/tempest/api/compute/test_live_block_migration_negative.py @@ -40,10 +40,10 @@ class LiveBlockMigrationNegativeTestJSON(base.BaseV2ComputeAdminTest): cls.admin_servers_client = cls.os_adm.servers_client def _migrate_server_to(self, server_id, dest_host): + bmflm = CONF.compute_feature_enabled.block_migration_for_live_migration body = self.admin_servers_client.live_migrate_server( - server_id, dest_host, - CONF.compute_feature_enabled. - block_migration_for_live_migration) + server_id, host=dest_host, block_migration=bmflm, + disk_over_commit=False) return body @test.attr(type=['negative']) diff --git a/tempest/services/compute/json/servers_client.py b/tempest/services/compute/json/servers_client.py index 37df179788..a99a1f55e0 100644 --- a/tempest/services/compute/json/servers_client.py +++ b/tempest/services/compute/json/servers_client.py @@ -381,16 +381,10 @@ class ServersClient(service_client.ServiceClient): """Removes a security group from the server.""" return self.action(server_id, 'removeSecurityGroup', None, name=name) - def live_migrate_server(self, server_id, dest_host, use_block_migration): + def live_migrate_server(self, server_id, **kwargs): """This should be called with administrator privileges .""" - migrate_params = { - "disk_over_commit": False, - "block_migration": use_block_migration, - "host": dest_host - } - - req_body = json.dumps({'os-migrateLive': migrate_params}) + req_body = json.dumps({'os-migrateLive': kwargs}) resp, body = self.post("servers/%s/action" % server_id, req_body) self.validate_response(schema.server_actions_common_schema,