r5546 - in branches/elephant/cumin: model python/cumin/grid-hadoop

Author: croberts
Date: 2012-11-16 15:32:40 +0000 (Fri, 16 Nov 2012)
New Revision: 5546

Modified:
   branches/elephant/cumin/model/cumin.xml
   branches/elephant/cumin/model/rosemary.xml
   branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py
Log:
Additional skeleton work for demo.

Modified: branches/elephant/cumin/model/cumin.xml
===================================================================
--- branches/elephant/cumin/model/cumin.xml	2012-11-16 14:46:00 UTC (rev 5545)
+++ branches/elephant/cumin/model/cumin.xml	2012-11-16 15:32:40 UTC (rev 5546)
@@ -48,6 +48,12 @@
   <package name="com.redhat.cumin.grid.hadoop">
     <class name="NameNode" storage="none">
       <property name="Name" type="sstr"/>
+      <property name="ID" type="sstr"/>
+      <property name="Submitted" type="sstr"/>
+      <property name="Status" type="sstr"/>
+      <property name="Uptime" type="sstr"/>
+      <property name="Owner" type="sstr"/>
+      <property name="Location" type="sstr"/>
     </class>
     <class name="DataNode" storage="none">
       <property name="Name" type="sstr"/>

Modified: branches/elephant/cumin/model/rosemary.xml
===================================================================
--- branches/elephant/cumin/model/rosemary.xml	2012-11-16 14:46:00 UTC (rev 5545)
+++ branches/elephant/cumin/model/rosemary.xml	2012-11-16 15:32:40 UTC (rev 5546)
@@ -40,6 +40,24 @@
       <property name="Name">
       	<title>Name</title>
       </property>
+      <property name="ID">
+      	<title>Id</title>
+      </property>
+      <property name="Submitted">
+      	<title>Submitted</title>
+      </property>
+      <property name="Status">
+      	<title>Status</title>
+      </property>
+      <property name="Uptime">
+      	<title>Uptime</title>
+      </property>
+      <property name="Owner">
+      	<title>Owner</title>
+      </property>
+      <property name="Location">
+      	<title>Location</title>
+      </property>
     </class>
     
     <class name="DataNode">

Modified: branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py
===================================================================
--- branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py	2012-11-16 14:46:00 UTC
(rev 5545)
+++ branches/elephant/cumin/python/cumin/grid-hadoop/hadoop.py	2012-11-16 15:32:40 UTC
(rev 5546)
@@ -127,7 +127,20 @@
         # TODO make some sage call and return the results
         # Here, we call self.remoteDataMethod
         results = MethodResult()
-        results.data = {"node1":
{"Name":"node1.lab.bos.redhat.com"},
"node2":{"Name":"node2.lab.bos.redhat.com"}}
+        results.data =
{"node1":{"Name":"node1.lab.bos.redhat.com",\
+                                 "ID":"12345", \
+                                 "Submitted":"11/14/2012", \
+                                 "Status":"Running", \
+                                 "Uptime":"2+00:54:56", \
+                                 "Owner":"croberts", \
+                                
"Location":"http://mrg7.lab.bos.redhat.com:40222"}, \
+                       
"node2":{"Name":"node2.lab.bos.redhat.com",\
+                                 "ID":"56789", \
+                                 "Submitted":"11/15/2012", \
+                                 "Status":"Running", \
+                                 "Uptime":"1+00:24:56", \
+                                 "Owner":"croberts", \
+                                
"Location":"http://mrg8.lab.bos.redhat.com:40222"}}
                 
         return results
 
@@ -147,7 +160,21 @@
 
         self.name_col = self.NameColumn(app, "name", cls.Name)
         self.add_column(self.name_col)
-    
+        
+        self.id_col = ObjectTableColumn(app, "idcol", cls.ID)
+        self.sub_col = ObjectTableColumn(app, "sub", cls.Submitted)
+        self.status_col = ObjectTableColumn(app, "statuscol", cls.Status)
+        self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime)
+        self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
+        self.loc_col = ObjectTableColumn(app, "loccol", cls.Location)
+        
+        self.add_column(self.id_col)
+        self.add_column(self.sub_col)
+        self.add_column(self.status_col)
+        self.add_column(self.uptime_col)
+        self.add_column(self.owner_col)
+        self.add_column(self.loc_col)
+            
     class NameColumn(ObjectTableColumn):
         def render_text_align(self, session):
             return "left"