From ca79470843ff351623d07378ab553b2548cb8dc0 Mon Sep 17 00:00:00 2001
From: Mandell Degerness <mdegerne@gmail.com>
Date: Thu, 4 Aug 2011 10:43:16 -0700
Subject: Fix to nova-ajax-console-proxy to use the new syntax.

create_consumer and create_connection abstractions were added recently.
---
 Authors                     |  1 +
 bin/nova-ajax-console-proxy | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Authors b/Authors
index 0e5931462..b216873df 100644
--- a/Authors
+++ b/Authors
@@ -64,6 +64,7 @@ Kirill Shileev <kshileev@gmail.com>
 Koji Iida <iida.koji@lab.ntt.co.jp>
 Lorin Hochstein <lorin@isi.edu>
 Lvov Maxim <usrleon@gmail.com>
+Mandell Degerness <mdegerne@gmail.com>
 Mark Washenberger <mark.washenberger@rackspace.com>
 Masanori Itoh <itoumsn@nttdata.co.jp>
 Matt Dietz <matt.dietz@rackspace.com>
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index 21cf68007..2329581a2 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -114,11 +114,11 @@ class AjaxConsoleProxy(object):
                 AjaxConsoleProxy.tokens[kwargs['token']] =  \
                     {'args': kwargs, 'last_activity': time.time()}
 
-        conn = rpc.Connection.instance(new=True)
-        consumer = rpc.TopicAdapterConsumer(
-                       connection=conn,
-                       proxy=TopicProxy,
-                       topic=FLAGS.ajax_console_proxy_topic)
+        conn = rpc.create_connection(new=True)
+        consumer = rpc.create_consumer(
+                       conn,
+                       FLAGS.ajax_console_proxy_topic,
+                       TopicProxy)
 
         def delete_expired_tokens():
             now = time.time()
-- 
cgit