From ddad5c1e110ea713e3c20fcd2f41523493e49cf5 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Wed, 17 Oct 2012 12:13:06 -0700
Subject: [PATCH] Use consoleauth rpcapi in nova-novncproxy.

The nova-novncproxy service was using rpc.call directly when it should
have been going through the rpcapi client proxy class.  This patch fixes
that.

Fix bug 1067858.

Change-Id: I626fb01ff61ff507520d528122358ef687d297b7
---
 bin/nova-novncproxy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
index 3abaaa76..483c72e8 100755
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@@ -28,6 +28,7 @@ import sys
 
 import websockify
 
+from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova import context
 from nova import flags
 from nova.openstack.common import cfg
@@ -84,9 +85,8 @@ class NovaWebSocketProxy(websockify.WebSocketProxy):
         cookie.load(self.headers.getheader('cookie'))
         token = cookie['token'].value
         ctxt = context.get_admin_context()
-        connect_info = rpc.call(ctxt, 'consoleauth',
-                                {'method': 'check_token',
-                                 'args': {'token': token}})
+        rpcapi = consoleauth_rpcapi.ConsoleAuthAPI()
+        connect_info = rpcapi.check_token(ctxt, token=token)
 
         if not connect_info:
             LOG.audit("Invalid Token: %s", token)