diff options
| author | Russell Bryant <rbryant@redhat.com> | 2013-04-10 00:59:03 +0200 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2013-04-24 15:02:56 -0400 |
| commit | ddb3199318bf91e76b4c4e7330956ee581c91ccc (patch) | |
| tree | 5e9789b714483481d6d1b68d94debb92ed42ab0c /nova/compute | |
| parent | a025d7eee28026cb21cb0e732e6510d5d9b7d96f (diff) | |
Move get_backdoor_port to base rpc API.
Each service implemented the get_backdoor_port method individually. This
patch moves the implementation of this method to the base rpc API
instead, and removes the now unnecessary code from each of the services.
The server side method was left on all of the managers for rpc backwards
copmatibility. They can be removed on the next major rpc version bump
of those APIs.
Part of blueprint base-rpc-api.
Change-Id: Ia8838fafd80eb86a1c2d66f5e97370042d8d8c53
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rwxr-xr-x | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/compute/rpcapi.py | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 1b1a3c506..dd2d05dc9 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -2107,10 +2107,6 @@ class API(base.Base): """Retrieve diagnostics for the given instance.""" return self.compute_rpcapi.get_diagnostics(context, instance=instance) - def get_backdoor_port(self, context, host_name): - """Retrieve backdoor port.""" - return self.compute_rpcapi.get_backdoor_port(context, host_name) - @wrap_check_policy @check_instance_lock @check_instance_state(vm_state=[vm_states.ACTIVE, vm_states.RESCUED]) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 7fbe8910e..3a1d7e8ab 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -650,6 +650,8 @@ class ComputeManager(manager.SchedulerDependentManager): except exception.NotFound: return power_state.NOSTATE + # NOTE(russellb) This method can be removed in 3.0 of this API. It is + # deprecated in favor of the method in the base API. def get_backdoor_port(self, context): """Return backdoor port for eventlet_backdoor.""" return self.backdoor_port diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index dfa19517e..a8d7eaa47 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -620,10 +620,6 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy): instance=instance_p), topic=_compute_topic(self.topic, ctxt, None, instance)) - def get_backdoor_port(self, ctxt, host): - return self.call(ctxt, self.make_msg('get_backdoor_port'), - topic=_compute_topic(self.topic, ctxt, host, None)) - def publish_service_capabilities(self, ctxt): self.fanout_cast(ctxt, self.make_msg('publish_service_capabilities')) |