ditched rpc.create_consumer(conn) interface... instead you now do conn.create_consumer(..

4 files changed, 7 insertions, 26 deletions

diff --git a/nova/tests/test_rpc.py b/nova/tests/test_rpc.py
index 2b9922491..ba91ea3b2 100644
--- a/nova/tests/test_rpc.py
+++ b/nova/tests/test_rpc.py
@@ -33,10 +33,7 @@ class RpcTestCase(test.TestCase):
         super(RpcTestCase, self).setUp()
         self.conn = rpc.create_connection(True)
         self.receiver = TestReceiver()
-        rpc.create_consumer(self.conn,
-                'test',
-                self.receiver,
-                False)
+        self.conn.create_consumer('test', self.receiver, False)
         self.conn.consume_in_thread()
         self.context = context.get_admin_context()
 
@@ -143,10 +140,7 @@ class RpcTestCase(test.TestCase):
 
         nested = Nested()
         conn = rpc.create_connection(True)
-        rpc.create_consumer(conn,
-                'nested',
-                nested,
-                False)
+        conn.create_consumer('nested', nested, False)
         conn.consume_in_thread()
         value = 42
         result = rpc.call(self.context,
diff --git a/nova/tests/test_rpc_carrot.py b/nova/tests/test_rpc_carrot.py
index cf84980ab..ff704ecf8 100644
--- a/nova/tests/test_rpc_carrot.py
+++ b/nova/tests/test_rpc_carrot.py
@@ -33,10 +33,7 @@ class RpcCarrotTestCase(test.TestCase):
         super(RpcCarrotTestCase, self).setUp()
         self.conn = rpc.create_connection(True)
         self.receiver = TestReceiver()
-        rpc.create_consumer(self.conn,
-                'test',
-                self.receiver,
-                False)
+        self.conn.create_consumer('test', self.receiver, False)
         self.conn.consume_in_thread()
         self.context = context.get_admin_context()
 
@@ -151,10 +148,7 @@ class RpcCarrotTestCase(test.TestCase):
 
         nested = Nested()
         conn = rpc.create_connection(True)
-        rpc.create_consumer(conn,
-                'nested',
-                nested,
-                False)
+        conn.create_consumer('nested', nested, False)
         conn.consume_in_thread()
         value = 42
         result = rpc.call(self.context,
diff --git a/nova/tests/test_rpc_kombu.py b/nova/tests/test_rpc_kombu.py
index 457dfdeca..7db88ecd0 100644
--- a/nova/tests/test_rpc_kombu.py
+++ b/nova/tests/test_rpc_kombu.py
@@ -33,10 +33,7 @@ class RpcKombuTestCase(test.TestCase):
         super(RpcKombuTestCase, self).setUp()
         self.conn = rpc.create_connection()
         self.receiver = TestReceiver()
-        rpc.create_consumer(self.conn,
-                'test',
-                self.receiver,
-                False)
+        self.conn.create_consumer('test', self.receiver, False)
         self.conn.consume_in_thread()
         self.context = context.get_admin_context()
 
@@ -215,10 +212,7 @@ class RpcKombuTestCase(test.TestCase):
 
         nested = Nested()
         conn = rpc.create_connection(True)
-        rpc.create_consumer(conn,
-                'nested',
-                nested,
-                False)
+        conn.create_consumer('nested', nested, False)
         conn.consume_in_thread()
         value = 42
         result = rpc.call(self.context,
diff --git a/nova/tests/test_test.py b/nova/tests/test_test.py
index 6075abbb0..3482ff6a0 100644
--- a/nova/tests/test_test.py
+++ b/nova/tests/test_test.py
@@ -40,6 +40,5 @@ class IsolationTestCase(test.TestCase):
 
         connection = rpc.create_connection(new=True)
         proxy = NeverCalled()
-        rpc.create_consumer(connection, 'compute',
-                proxy, fanout=False)
+        connection.create_consumer('compute', proxy, fanout=False)
         connection.consume_in_thread()