summaryrefslogtreecommitdiffstats
path: root/nova/consoleauth
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-25 18:54:05 +0000
committerGerrit Code Review <review@openstack.org>2013-04-25 18:54:05 +0000
commit858d1f4ea23ad8210f818367ec2ba0fe125a8b72 (patch)
treee55d98f330b7b6e525a3936b14f9c6469e4b9921 /nova/consoleauth
parentd50edab2bc5403f3184efe3480642fcb725cac22 (diff)
parentddb3199318bf91e76b4c4e7330956ee581c91ccc (diff)
Merge "Move get_backdoor_port to base rpc API."
Diffstat (limited to 'nova/consoleauth')
-rw-r--r--nova/consoleauth/manager.py2
-rw-r--r--nova/consoleauth/rpcapi.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py
index d959a709b..a235eafb6 100644
--- a/nova/consoleauth/manager.py
+++ b/nova/consoleauth/manager.py
@@ -122,5 +122,7 @@ class ConsoleAuthManager(manager.Manager):
self.mc.delete(token.encode('UTF-8'))
self.mc.delete(instance_uuid.encode('UTF-8'))
+ # NOTE(russellb) This method can be removed in 2.0 of this API. It is
+ # deprecated in favor of the method in the base API.
def get_backdoor_port(self, context):
return self.backdoor_port
diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py
index 9ab477340..62aeab8da 100644
--- a/nova/consoleauth/rpcapi.py
+++ b/nova/consoleauth/rpcapi.py
@@ -71,7 +71,3 @@ class ConsoleAuthAPI(nova.openstack.common.rpc.proxy.RpcProxy):
self.make_msg('delete_tokens_for_instance',
instance_uuid=instance_uuid),
version="1.2")
-
- def get_backdoor_port(self, ctxt, host):
- return self.call(ctxt, self.make_msg('get_backdoor_port'),
- version='1.1')