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

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-10-29 16:29:37 -0400 (Wed, 29 Oct 2008)
New Revision: 2701

Modified:
   mgmt/trunk/cumin/python/cumin/client.py
   mgmt/trunk/cumin/python/cumin/client.strings
Log:
Checking in Irina's changes for syscon, auth, fedid for connections.

Modified: mgmt/trunk/cumin/python/cumin/client.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/client.py	2008-10-29 20:28:32 UTC (rev 2700)
+++ mgmt/trunk/cumin/python/cumin/client.py	2008-10-29 20:29:37 UTC (rev 2701)
@@ -23,6 +23,15 @@
 
         self.set_default_column(col)
 
+        col = self.SystemConnectionColumn(app, "sysconn")
+        self.add_column(col)
+        
+        col = self.AuthIdentityColumn(app, "authid")
+        self.add_column(col)
+        
+        col = self.FedLinkColumn(app, "fedlink")
+        self.add_column(col)
+        
         col = self.SentColumn(app, "sent")
         col.alignment = "right"
         self.add_column(col)
@@ -81,6 +90,30 @@
             href = self.frame.connection.get_href(session, conn)
             return fmt_link(href, fmt_shorten(data["addr"]))
 
+    class SystemConnectionColumn(SqlTableColumn): 
+        def render_title(self, session, data):
+            return "Connect Type"
+    
+        def render_content(self, session, data):
+            if data['sysconn']:
+                return "System"
+            else:
+                return "Client"
+    
+    class AuthIdentityColumn(SqlTableColumn):
+        def render_title(self, session, data):
+            return "Auth Id"
+    
+    class FedLinkColumn(SqlTableColumn):
+        def render_title(self, session, data):
+            return "Fed Link"
+    
+        def render_content(self, session, data):
+            if data['fedlink']:
+                return "Yes"
+            else:
+                return "No"
+
     class SentColumn(NullSortColumn, FreshDataOnlyColumn):
         def render_title(self, session, data):
             return "%s Sent" % self.parent.get_unit_plural(session)

Modified: mgmt/trunk/cumin/python/cumin/client.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/client.strings	2008-10-29 20:28:32 UTC (rev 2700)
+++ mgmt/trunk/cumin/python/cumin/client.strings	2008-10-29 20:29:37 UTC (rev 2701)
@@ -1,6 +1,9 @@
 [ConnectionSet.sql]
 select
   l.id,
+  l.system_connection as sysconn,
+  l.auth_identity as authid,
+  l.federation_link as fedlink,
   l.address as addr,
   (c.bytes_from_client - p.bytes_from_client)
    / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as bs,