diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-09 20:42:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-09 20:42:58 +0000 |
| commit | a48e426731ff2955c0696a137609d8084ff11ca8 (patch) | |
| tree | 91a8c6434ec2631d26997db766946c40087898d4 | |
| parent | b403a1fc2d2db89d8c365109feb2642b281faae6 (diff) | |
| parent | f9a84812acbbf9a15f8e05e3fc3777d4b7c2f66b (diff) | |
| download | nova-a48e426731ff2955c0696a137609d8084ff11ca8.tar.gz nova-a48e426731ff2955c0696a137609d8084ff11ca8.tar.xz nova-a48e426731ff2955c0696a137609d8084ff11ca8.zip | |
Merge "Simplify topic handling in network rpcapi."
| -rw-r--r-- | nova/network/rpcapi.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index eba0aae52..b7e9cd70b 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -268,10 +268,7 @@ class NetworkAPI(rpc_proxy.RpcProxy): def migrate_instance_start(self, ctxt, instance_uuid, rxtx_factor, project_id, source_compute, dest_compute, floating_addresses, host=None): - if host is not None: - topic = rpc.queue_get_for(ctxt, self.topic, host) - else: - topic = self.topic + topic = rpc.queue_get_for(ctxt, self.topic, host) return self.call(ctxt, self.make_msg( 'migrate_instance_start', instance_uuid=instance_uuid, @@ -286,10 +283,7 @@ class NetworkAPI(rpc_proxy.RpcProxy): def migrate_instance_finish(self, ctxt, instance_uuid, rxtx_factor, project_id, source_compute, dest_compute, floating_addresses, host=None): - if host is not None: - topic = rpc.queue_get_for(ctxt, self.topic, host) - else: - topic = self.topic + topic = rpc.queue_get_for(ctxt, self.topic, host) return self.call(ctxt, self.make_msg( 'migrate_instance_finish', instance_uuid=instance_uuid, |