[rhmessaging-commits] rhmessaging commits: r2828 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-11-17 15:52:11 -0500 (Mon, 17 Nov 2008)
New Revision: 2828

Modified:
   mgmt/trunk/cumin/python/cumin/model.py
Log:
Reimplement (and rename) the method to get the current session for a mgmt connection

Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py	2008-11-17 20:41:29 UTC (rev 2827)
+++ mgmt/trunk/cumin/python/cumin/model.py	2008-11-17 20:52:11 UTC (rev 2828)
@@ -253,14 +253,12 @@
     def do_invoke(self, object, args, completion):
         pass
 
-    def getSessionFromRegistration(self, reg):
-        conn = self.model.data.getConnectionByRegistration(reg)
-        for sess in conn.mconn.sessions:
-            if conn.mconn.sessions[sess].name == conn.getSessionId():
-                #this is active management session
-                return conn.mconn.sessions[sess]
+    def get_session_by_registration(self, reg):
+        assert reg.broker
+        assert reg.broker.managedBroker in self.model.data.managedBrokers
 
-        return conn.mconn.session(str(uuid4()))
+        broker = self.model.data.managedBrokers[reg.broker.managedBroker][0]
+        return broker.getAmqpSession()
 
 class CuminActionInvocation(object):
     def __init__(self, action, object):
@@ -792,7 +790,7 @@
             if args["ive"]:
                 declArgs[self.IVE] = 1
             
-            session = self.getSessionFromRegistration(reg)
+            session = self.get_session_by_registration(reg)
             session.exchange_declare(exchange=exchange.name, 
                                      type=exchange.type, 
                                      durable=exchange.durable, 
@@ -871,7 +869,7 @@
             if args["optimistic"]:
                 declArgs[self.OPTIMISTIC_CONSUME] = 1
                 
-            session = self.getSessionFromRegistration(reg)
+            session = self.get_session_by_registration(reg)
             session.queue_declare(queue=queue.name, 
                         durable=queue.durable, 
                         arguments=declArgs)
@@ -1109,7 +1107,7 @@
 
         def do_invoke(self, queue, args, completion):
             reg = queue.vhost.broker.registration
-            session = self.getSessionFromRegistration(reg)
+            session = self.get_session_by_registration(reg)
             session.queue_delete(queue=queue.name)
                 
             completion("OK")
@@ -1126,7 +1124,7 @@
 
         def do_invoke(self, queue, args, completion):
             reg = queue.vhost.broker.registration
-            session = self.getSessionFromRegistration(reg)
+            session = self.get_session_by_registration(reg)
             binding_info = args['exchange_keys']
             do_bind(session, queue, binding_info)
 
@@ -1234,7 +1232,7 @@
             return frame.remove.show(session)
         
         def do_invoke(self, exchange, reg, completion):
-            session = self.getSessionFromRegistration(reg)
+            session = self.get_session_by_registration(reg)
             session.exchange_delete(exchange=exchange.name)
             
             completion("OK")
@@ -1273,10 +1271,10 @@
         
         def do_invoke(self, binding, args, completion):
             reg = binding.exchange.vhost.broker.registration
-            session = self.getSessionFromRegistration(reg)
-            session.exchange_unbind (queue=binding.queue.name, 
-                                     exchange=binding.exchange.name, 
-                                     binding_key=binding.bindingKey)
+            session = self.get_session_by_registration(reg)
+            session.exchange_unbind(queue=binding.queue.name, 
+                                    exchange=binding.exchange.name, 
+                                    binding_key=binding.bindingKey)
  
             completion("OK")