diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-05-04 22:56:11 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-05-17 12:16:14 -0400 |
| commit | 9ec9fdce626d5e2937c6e0664621ad590f958e13 (patch) | |
| tree | 9535f82cee55119518d2a00262c641331581369a /nova/vnc | |
| parent | 1b6aa2d1af3d65f381aa9c57cc80531704c0ca8a (diff) | |
| download | nova-9ec9fdce626d5e2937c6e0664621ad590f958e13.tar.gz nova-9ec9fdce626d5e2937c6e0664621ad590f958e13.tar.xz nova-9ec9fdce626d5e2937c6e0664621ad590f958e13.zip | |
Add version to consoleauth rpc API.
Part of blueprint versioned-rpc-apis.
Change-Id: I9682bdbd06d744141b94385992b37cd2e55b8f5e
Diffstat (limited to 'nova/vnc')
| -rw-r--r-- | nova/vnc/xvp_proxy.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index 5aedfe0fb..1eca54530 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -26,6 +26,7 @@ import eventlet.green import eventlet.greenio import eventlet.wsgi +from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context from nova import flags from nova import log as logging @@ -49,8 +50,6 @@ xvp_proxy_opts = [ FLAGS = flags.FLAGS FLAGS.register_opts(xvp_proxy_opts) -flags.DECLARE('consoleauth_topic', 'nova.consoleauth') - class XCPVNCProxy(object): """Class to use the xvp auth protocol to proxy instance vnc consoles.""" @@ -145,9 +144,8 @@ class XCPVNCProxy(object): return "Invalid Request" ctxt = context.get_admin_context() - connect_info = rpc.call(ctxt, FLAGS.consoleauth_topic, - {'method': 'check_token', - 'args': {'token': token}}) + api = consoleauth_rpcapi.ConsoleAuthAPI() + connect_info = api.check_token(ctxt, token) if not connect_info: LOG.audit(_("Request made with invalid token: %s"), req) |