[rhmessaging-commits] rhmessaging commits: r3850 - in mgmt/trunk/cumin/python/cumin: grid and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-02-11 14:38:10 -0500 (Thu, 11 Feb 2010)
New Revision: 3850

Modified:
   mgmt/trunk/cumin/python/cumin/grid/slot.py
   mgmt/trunk/cumin/python/cumin/grid/slot.strings
   mgmt/trunk/cumin/python/cumin/model.py
Log:
Added job info to slot page.

Modified: mgmt/trunk/cumin/python/cumin/grid/slot.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/slot.py	2010-02-11 15:25:37 UTC (rev 3849)
+++ mgmt/trunk/cumin/python/cumin/grid/slot.py	2010-02-11 19:38:10 UTC (rev 3850)
@@ -128,6 +128,9 @@
         stats = StatSet(app, "general", slot, "load")
         self.add_child(stats)
 
+        job_info = SlotJobInfo(app, "job_info", slot, "JobInfo")
+        self.add_child(job_info)
+
         chart = self.LoadChart(app, "chart", slot)
         chart.stats = ("LoadAvg", "CondorLoadAvg")
         chart.duration.param.default = "3600"
@@ -140,6 +143,22 @@
         def render_title(self, session):
             return "Load"
 
+class SlotJobInfo(PropertySet):
+    def __init__(self, app, name, slot, category):
+        super(SlotJobInfo, self).__init__(app, name)
+
+        #self.defer_enabled = True
+        self.update_enabled = True
+        self.category = category
+        self.object = slot
+
+    def do_get_items(self, session):
+        obj = self.object.get(session)
+        cls = self.app.model.get_class_by_object(obj)
+
+        return [(x.get_title(session), x.value(session, obj), x.escape)
+                for x in cls.properties if x.category == self.category]
+
 class SlotMapPage(Page):
     """ handles the slots.vis request """
 

Modified: mgmt/trunk/cumin/python/cumin/grid/slot.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/slot.strings	2010-02-11 15:25:37 UTC (rev 3849)
+++ mgmt/trunk/cumin/python/cumin/grid/slot.strings	2010-02-11 19:38:10 UTC (rev 3850)
@@ -51,6 +51,8 @@
       <td>
         <h2>General</h2>
         {general}
+        <h2>Job Info</h2>
+        {job_info}
       </td>
       <td>
         {chart}

Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py	2010-02-11 15:25:37 UTC (rev 3849)
+++ mgmt/trunk/cumin/python/cumin/model.py	2010-02-11 19:38:10 UTC (rev 3850)
@@ -981,7 +981,12 @@
 
         prop = CuminProperty(self, "JobId")
         prop.title = "Current Job Id"
+        prop.category = "JobInfo"
 
+        prop = CuminProperty(self, "GlobalJobId")
+        prop.title = "Global Job Id"
+        prop.category = "JobInfo"
+
         prop = CuminProperty(self, "AccountingGroup")
         prop.title = "Accounting Group"
 
@@ -1008,10 +1013,18 @@
 
         prop = CuminProperty(self, "JobStart")
         prop.title = "JobStart"
+        prop.category = "JobInfo"
 
-        stat = CuminStat(self, "Activity")
-        stat.title = "Activity"
+        """
+        prop = CuminProperty(self, "Activity")
+        prop.title = "Activity"
+        prop.category = "JobInfo"
 
+        prop = CuminProperty(self, "State")
+        prop.title = "State"
+        prop.category = "JobInfo"
+        """
+
         stat = CuminStat(self, "CondorLoadAvg")
         stat.title = "Condor Load Avg"
         stat.format = "%2.02f"