diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-13 21:58:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-13 21:58:40 +0000 |
| commit | 09f24242a3e1fbd7171becda298f643d6b645223 (patch) | |
| tree | 4206d83ffe0762919b4a081f71f36e6765febc3d /nova | |
| parent | 6a848df4004c0c977320ba34bf735106505d7353 (diff) | |
| parent | f72f3498656e8b4857001a1f3d194305245d56ba (diff) | |
Merge "Fix rpc error with live_migration."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/scheduler/rpcapi.py | 6 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_rpcapi.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 737bccb83..d73059c40 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -37,7 +37,7 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): - remove instance_type_id, add instance_type - remove topic, 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 ''' @@ -72,14 +72,14 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): return self.call(ctxt, self.make_msg('show_host_resources', host=host)) 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 # this call in the scheduler driver doesn't return anything. instance_p = jsonutils.to_primitive(instance) return self.call(ctxt, self.make_msg('live_migration', block_migration=block_migration, 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, capabilities): diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index 109ff36a3..1fbc06390 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -95,7 +95,7 @@ class SchedulerRpcAPITestCase(test.TestCase): self._test_scheduler_api('live_migration', rpc_method='call', block_migration='fake_block_migration', 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') def test_update_service_capabilities(self): |