Make live_migrate_server use **kwargs
As we discussed on
http://lists.openstack.org/pipermail/openstack-dev/2015-July/068864.html
All http POST/PUT methods need to contain **kwargs as their arguments.
This patch makes live_migrate_server use **kwargs.
Partially implements blueprint consistent-service-method-names
Change-Id: I4371de93c40176e92d605fed352743c6a3e04fd7
diff --git a/tempest/api/compute/admin/test_live_migration.py b/tempest/api/compute/admin/test_live_migration.py
index 489dbac..79c2ac9 100644
--- a/tempest/api/compute/admin/test_live_migration.py
+++ b/tempest/api/compute/admin/test_live_migration.py
@@ -56,9 +56,10 @@
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 fabe55d..2cd85f2 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 @@
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 37df179..a99a1f5 100644
--- a/tempest/services/compute/json/servers_client.py
+++ b/tempest/services/compute/json/servers_client.py
@@ -381,16 +381,10 @@
"""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,