Author: croberts
Date: 2013-02-13 19:36:42 +0000 (Wed, 13 Feb 2013)
New Revision: 5702
Modified:
branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings
branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings
branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings
branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings
Log:
Now using the live objects for the Details view.
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-13 18:58:59 UTC
(rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.py 2013-02-13 19:36:42 UTC
(rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+from cumin.objectframe import ObjectDetails
from wooly.forms import StringField, ScalarField, OptionInputSet
@@ -219,21 +220,13 @@
def get_title(self, session):
retval = "Data node:'%s' (%s)" %
(xml_escape(self.object.get(session).Name), xml_escape(self.object.get(session).Id))
return retval
-
+
def get_object(self, session, id):
- class Object(object):
- pass
- fake = Object()
- fake.Name = id
- fake.Id = id
- return fake
+ host = self.frame.host.get(session)
+ response = self.app.remote.get_data_node(self.frame.host.get(session), [id])
+ obj = HadoopObject(response,
self.app.model.com_redhat_cumin_grid_hadoop.DataNode)
+ return obj
-# def get_object(self, session, id):
-# host = self.frame.host.get(session)
-# response = self.app.remote.get_data_node(self.frame.host.get(session), [id])
-# obj = HadoopObject(response,
self.app.model.com_redhat_cumin_grid_hadoop.DataNode)
-# return obj
-
class DataNodeObjectView(HadoopObjectView):
def add_details_tab(self):
self.add_tab(DataNodeDetails(self.app, self.name + ".details",
self.object))
@@ -252,9 +245,9 @@
def render_title(self, session):
return "Overview"
-class DataNodeDetails(Widget):
+class DataNodeDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(DataNodeDetails, self).__init__(app, name)
+ super(DataNodeDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
Modified: branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings 2013-02-13 18:58:59
UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/datanode.strings 2013-02-13 19:36:42
UTC (rev 5702)
@@ -1,7 +0,0 @@
-[DataNodeDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-13 18:58:59 UTC (rev
5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.py 2013-02-13 19:36:42 UTC (rev
5702)
@@ -2,7 +2,7 @@
from cumin.objectselector import ObjectSelector, ObjectLinkColumn, ObjectTable,\
ObjectTableColumn, ObjectQmfTable, ObjectQmfSelectorTable, ObjectSelectorTaskForm,
ObjectSelectorTask
-from cumin.objectframe import ObjectFrame, ObjectTaskForm
+from cumin.objectframe import ObjectFrame, ObjectTaskForm, ObjectDetails
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
@@ -250,6 +250,8 @@
try:
if prop.name.lower() in ["id", "ipc"]:
setattr(self, prop.name,
aviary_response[1][0]["ref"][prop.name.lower()])
+ elif prop.name.lower() in ["parent_id",
"parent_ipc"]:
+ setattr(self, prop.name,
aviary_response[1][0]["parent"][prop.name.lower().split("_")[1]])
else:
setattr(self, prop.name, aviary_response[1][0][prop.name.lower()])
except AttributeError, e:
@@ -261,8 +263,11 @@
name = self.__class__.__name__
args = (name, self._class, self._id, self._save_time)
return "%s(%s,%s,%s)" % args
+
+class HadoopObjectDetails(ObjectDetails):
+ def __init__(self, app, name, object):
+ super(HadoopObjectDetails, self).__init__(app, name, object)
-
class HadoopNodeDeleteTask(ObjectSelectorTask):
def enter(self, session):
form_session = super(HadoopNodeDeleteTask, self).enter(session)
Modified: branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings 2013-02-13 18:58:59 UTC
(rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/hadoop.strings 2013-02-13 19:36:42 UTC
(rev 5702)
@@ -1 +1,2 @@
-[nothingyet]
\ No newline at end of file
+[HadoopObjectDetails.html]
+{props}
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-13 18:58:59 UTC
(rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.py 2013-02-13 19:36:42 UTC
(rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+from cumin.objectframe import ObjectDetails
from wooly.forms import StringField
@@ -214,12 +215,10 @@
return retval
def get_object(self, session, id):
- class Object(object):
- pass
- fake = Object()
- fake.Name = id
- fake.Id = id
- return fake
+ host = self.frame.host.get(session)
+ response = self.app.remote.get_job_tracker(self.frame.host.get(session), [id])
+ obj = HadoopObject(response,
self.app.model.com_redhat_cumin_grid_hadoop.JobTracker)
+ return obj
class JobTrackerObjectView(HadoopObjectView):
def add_details_tab(self):
@@ -233,9 +232,9 @@
def render_title(self, session):
return "Task trackers"
-class JobTrackerDetails(Widget):
+class JobTrackerDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(JobTrackerDetails, self).__init__(app, name)
+ super(JobTrackerDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
@@ -244,4 +243,4 @@
def render_name(self, session):
'''sample....would only be called if JobTrackerDetails display was
overridden to say {name}'''
obj = self.object.get(session)
- return obj.name
\ No newline at end of file
+ return obj.Name
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings 2013-02-13 18:58:59
UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/jobtracker.strings 2013-02-13 19:36:42
UTC (rev 5702)
@@ -1,7 +0,0 @@
-[JobTrackerDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-13 18:58:59 UTC
(rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.py 2013-02-13 19:36:42 UTC
(rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+
from wooly.forms import StringField
from hadoop import *
@@ -197,7 +198,7 @@
class NameNodeObjectView(HadoopObjectView):
def add_details_tab(self):
- self.add_tab(NameNodeDetails(self.app, self.name + ".details",
self.object))
+ self.add_tab(NameNodeDetails(self.app, "details", self.object))
class NameNodeOverview(Widget):
def __init__(self, app, name, node, module):
@@ -207,9 +208,9 @@
def render_title(self, session):
return "Data nodes"
-class NameNodeDetails(Widget):
+class NameNodeDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(NameNodeDetails, self).__init__(app, name)
+ super(NameNodeDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
@@ -218,4 +219,4 @@
def render_name(self, session):
'''sample....would only be called if NameNodeDetails display was
overridden to say {name}'''
obj = self.object.get(session)
- return obj.name
\ No newline at end of file
+ return obj.Name
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings 2013-02-13 18:58:59
UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/namenode.strings 2013-02-13 19:36:42
UTC (rev 5702)
@@ -1,7 +0,0 @@
-[NameNodeDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 18:58:59 UTC
(rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.py 2013-02-13 19:36:42 UTC
(rev 5702)
@@ -4,6 +4,7 @@
from cumin.util import *
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.task import Task, TaskLink
+from cumin.objectframe import ObjectDetails
from wooly.forms import StringField
@@ -288,12 +289,10 @@
return retval
def get_object(self, session, id):
- class Object(object):
- pass
- fake = Object()
- fake.Name = id
- fake.Id = id
- return fake
+ host = self.frame.host.get(session)
+ response = self.app.remote.get_task_tracker(self.frame.host.get(session), [id])
+ obj = HadoopObject(response,
self.app.model.com_redhat_cumin_grid_hadoop.TaskTracker)
+ return obj
class TaskTrackerObjectView(HadoopObjectView):
def add_details_tab(self):
@@ -313,9 +312,9 @@
def render_title(self, session):
return "Overview"
-class TaskTrackerDetails(Widget):
+class TaskTrackerDetails(HadoopObjectDetails):
def __init__(self, app, name, object):
- super(TaskTrackerDetails, self).__init__(app, name)
+ super(TaskTrackerDetails, self).__init__(app, name, object)
self.object = object
def render_title(self, session):
Modified: branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings
===================================================================
--- branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings 2013-02-13
18:58:59 UTC (rev 5701)
+++ branches/elephant/cumin/python/cumin/gridhadoop/tasktracker.strings 2013-02-13
19:36:42 UTC (rev 5702)
@@ -1,7 +0,0 @@
-[TaskTrackerDetails.html]
-<div class="{class}">
- <ul>
- <li>Name: {name}</li>
- <li>More details to come...</li>
- </ul>
-</div>
\ No newline at end of file