openstack/tempest
Code Issues Proposed changes

Make live_migrate_server use **kwargs

Browse Source 
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
This commit is contained in:
Ken'ichi Ohmichi
2015-08-18 04:16:15 +00:00
parent a65b277674
commit 86f5893af5
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
tempest/api/compute/test_live_block_migration_negative.py
View File

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

10
tempest/services/compute/json/servers_client.py
View File

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