openstack/nova
Code Issues Proposed changes

Fix rpc error with live_migration.

Browse Source 
The topic argument to live_migration was removed on the manager side in
rpc API version 1.3, but was not removed from scheduler/rpcapi.py.
Remove it now.

Change-Id: I0b1c68848f7bd55f6f10c63b9433746f0a343a63
This commit is contained in:
Russell Bryant 2012-08-13 14:35:47 -04:00
parent e4a7edd175
commit f72f349865
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/scheduler/rpcapi.py
View File

@ -37,7 +37,7 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
- remove instance_type_id, add instance_type - remove instance_type_id, add instance_type
- remove topic, it was unused - remove topic, it was unused
1.2 - Remove topic from run_instance, it was unused 1.2 - Remove topic from run_instance, it was unused
1.3 - Remove instance_id, add instance to live_migration 1.3 - Remove instance_id and topic, add instance to live_migration
1.4 - Remove update_db from prep_resize 1.4 - Remove update_db from prep_resize
''' '''
@ -72,14 +72,14 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
return self.call(ctxt, self.make_msg('show_host_resources', host=host)) return self.call(ctxt, self.make_msg('show_host_resources', host=host))
def live_migration(self, ctxt, block_migration, disk_over_commit, def live_migration(self, ctxt, block_migration, disk_over_commit,
instance, dest, topic): instance, dest):
# NOTE(comstud): Call vs cast so we can get exceptions back, otherwise # NOTE(comstud): Call vs cast so we can get exceptions back, otherwise
# this call in the scheduler driver doesn't return anything. # this call in the scheduler driver doesn't return anything.
instance_p = jsonutils.to_primitive(instance) instance_p = jsonutils.to_primitive(instance)
return self.call(ctxt, self.make_msg('live_migration', return self.call(ctxt, self.make_msg('live_migration',
block_migration=block_migration, block_migration=block_migration,
disk_over_commit=disk_over_commit, instance=instance_p, disk_over_commit=disk_over_commit, instance=instance_p,
dest=dest, topic=topic), version='1.3') dest=dest), version='1.3')
def update_service_capabilities(self, ctxt, service_name, host, def update_service_capabilities(self, ctxt, service_name, host,
capabilities): capabilities):

2
nova/tests/scheduler/test_rpcapi.py
View File

@ -95,7 +95,7 @@ class SchedulerRpcAPITestCase(test.TestCase):
self._test_scheduler_api('live_migration', rpc_method='call', self._test_scheduler_api('live_migration', rpc_method='call',
block_migration='fake_block_migration', block_migration='fake_block_migration',
disk_over_commit='fake_disk_over_commit', disk_over_commit='fake_disk_over_commit',
instance='fake_instance', dest='fake_dest', topic='fake_topic', instance='fake_instance', dest='fake_dest',
version='1.3') version='1.3')
def test_update_service_capabilities(self): def test_update_service_capabilities(self):