Author: croberts
Date: 2012-12-14 21:39:45 +0000 (Fri, 14 Dec 2012)
New Revision: 5603
Modified:
branches/elephant/cumin/model/cumin.xml
branches/elephant/cumin/model/rosemary.xml
branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
Log:
Ok, get_name_node_list is now up and working. The object selector for name nodes should
yield live data now.
Modified: branches/elephant/cumin/model/cumin.xml
===================================================================
--- branches/elephant/cumin/model/cumin.xml 2012-12-14 21:17:18 UTC (rev 5602)
+++ branches/elephant/cumin/model/cumin.xml 2012-12-14 21:39:45 UTC (rev 5603)
@@ -48,8 +48,9 @@
<package name="com.redhat.cumin.grid.hadoop">
<class name="NameNode" storage="none">
<property name="ID" type="sstr"/>
+ <property name="Ipc" type="sstr"/>
<property name="Submitted" type="sstr"/>
- <property name="Status" type="sstr"/>
+ <property name="State" type="sstr"/>
<property name="Uptime" type="sstr"/>
<property name="Owner" type="sstr"/>
<property name="Location" type="sstr"/>
Modified: branches/elephant/cumin/model/rosemary.xml
===================================================================
--- branches/elephant/cumin/model/rosemary.xml 2012-12-14 21:17:18 UTC (rev 5602)
+++ branches/elephant/cumin/model/rosemary.xml 2012-12-14 21:39:45 UTC (rev 5603)
@@ -40,11 +40,14 @@
<property name="ID">
<title>Id</title>
</property>
+ <property name="Ipc">
+ <title>Ipc</title>
+ </property>
<property name="Submitted">
<title>Submitted</title>
</property>
- <property name="Status">
- <title>Status</title>
+ <property name="State">
+ <title>State</title>
</property>
<property name="Uptime">
<title>Uptime</title>
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2012-12-14 21:17:18 UTC
(rev 5602)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2012-12-14 21:39:45 UTC
(rev 5603)
@@ -14,6 +14,19 @@
def get_sage_results(self, values):
results = self.app.remote.get_name_node_list()
return results
+
+ def process_record(self, key, record):
+ field_data = list()
+ for column in self.columns:
+ try:
+ val = record[column.name.lower()]
+ except AttributeError:
+ if (column.name == "Ipc"):
+ val = record.ref.ipc
+ else:
+ val = record.ref.id
+ field_data.append(val)
+ return field_data
class NameNodeSelector(ObjectSelector):
def __init__(self, app, name):
@@ -21,7 +34,7 @@
super(NameNodeSelector, self).__init__(app, name, cls)
- self.add_search_filter(self.table.loc_col)
+ self.add_search_filter(self.table.ipc_col)
self.table.adapter = NameNodeAdapter(app, cls)
task = NameNodeCreate(app)
@@ -38,26 +51,22 @@
def render_title(self, session):
return "HDFS Name nodes"
- def get_qmf_results(self, session):
- values = self.get_data_values(session)
- return self.table.adapter.get_sage_results(values)
-
class NameNodeTable(ObjectQmfSelectorTable):
def __init__(self, app, name, cls):
super(NameNodeTable, self).__init__(app, name, cls)
- self.loc_col = ObjectTableColumn(app, "loccol", cls.Location)
- self.loc_col.width = "20%"
+ self.ipc_col = ObjectTableColumn(app, "ipc", cls.Ipc)
+ self.ipc_col.width = "20%"
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.state_col = ObjectTableColumn(app, "statecol", cls.State)
self.uptime_col = ObjectTableColumn(app, "uptimecol", cls.Uptime)
self.owner_col = ObjectTableColumn(app, "ownercol", cls.Owner)
- self.add_column(self.loc_col)
+ self.add_column(self.ipc_col)
self.add_column(self.id_col)
self.add_column(self.sub_col)
- self.add_column(self.status_col)
+ self.add_column(self.state_col)
self.add_column(self.uptime_col)
self.add_column(self.owner_col)