[rhmessaging-commits] rhmessaging commits: r3077 - mgmt/trunk/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Tue Jan 27 17:00:28 EST 2009
Author: eallen
Date: 2009-01-27 17:00:27 -0500 (Tue, 27 Jan 2009)
New Revision: 3077
Modified:
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/cumin/python/cumin/pool.py
mgmt/trunk/cumin/python/cumin/pool.strings
mgmt/trunk/cumin/python/cumin/slot.strings
mgmt/trunk/cumin/python/cumin/stat.py
mgmt/trunk/cumin/python/cumin/stat.strings
mgmt/trunk/cumin/python/cumin/system.strings
Log:
Added slot state to grid slot visualization.
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2009-01-27 21:59:38 UTC (rev 3076)
+++ mgmt/trunk/cumin/python/cumin/model.py 2009-01-27 22:00:27 UTC (rev 3077)
@@ -629,8 +629,14 @@
("Benchmarking", "yellow"),
("Unknown", "grey")]
+ load_states = [("Unclaimed", "Unclaimed"),
+ ("Claimed", "Claimed"),
+ ("Owner", "Owner"),
+ ("Matched", "Matched"),
+ ("Preempting", "Preempting")]
+
def get_field_tuples(self, session):
- return [("name", "Name"), ("machine", "Machine"), ("job_id", "Job")]
+ return [("name", "Name"), ("machine", "Machine"), ("job_id", "Job"), ("state", "State"), ("activity", "Activity")]
def get_extra(self, session, slot):
return [("jid", slot["jid"])]
@@ -645,6 +651,9 @@
def get_colors(self):
return self.load_colors
+ def get_states(self):
+ return self.load_states
+
class CuminSystem(RemoteClass):
def __init__(self, model):
super(CuminSystem, self).__init__(model, "system", Sysimage, SysimageStats)
Modified: mgmt/trunk/cumin/python/cumin/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.py 2009-01-27 21:59:38 UTC (rev 3076)
+++ mgmt/trunk/cumin/python/cumin/pool.py 2009-01-27 22:00:27 UTC (rev 3077)
@@ -394,6 +394,10 @@
action = self.app.model.pool.slots
return action.get_colors()
+ def get_states(self, session):
+ action = self.app.model.pool.slots
+ return action.get_states()
+
def get_color(self, session, job):
action = self.app.model.pool.slots
return action.get_color(session, job)
Modified: mgmt/trunk/cumin/python/cumin/pool.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/pool.strings 2009-01-27 21:59:38 UTC (rev 3076)
+++ mgmt/trunk/cumin/python/cumin/pool.strings 2009-01-27 22:00:27 UTC (rev 3077)
@@ -92,6 +92,15 @@
font-size: 0.8em;
}
+div#legend_slot_grid { float: left; margin-right: 1.5em;}
+div#legend_slot_grid h2, div#legend1_slot_grid h2 { margin-bottom: 1em;}
+div#legend1_slot_grid .btn.Unclaimed,
+div#legend1_slot_grid .btn.Claimed,
+div#legend1_slot_grid .btn.Matched,
+div#legend1_slot_grid .btn.Owner,
+div#legend1_slot_grid .btn.Preempting { width:28px; height:28px; margin-bottom:1px;}
+
+
[PoolStats.html]
<div style="width: 50%; float: left;">
<h2>General</h2>
@@ -120,8 +129,13 @@
</div>
</div>
<div id="legend_{name}" class="cell_legend">
+ <h2>Activities</h2>
{grid_legend}
</div>
+ <div id="legend1_{name}" class="cell_legend">
+ <h2>States</h2>
+ {grid_legend1}
+ </div>
</div>
</div>
{grid_updater}
Modified: mgmt/trunk/cumin/python/cumin/slot.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/slot.strings 2009-01-27 21:59:38 UTC (rev 3076)
+++ mgmt/trunk/cumin/python/cumin/slot.strings 2009-01-27 22:00:27 UTC (rev 3077)
@@ -6,7 +6,8 @@
s.system,
s.job_id,
j.id as jid,
- c.activity
+ c.activity,
+ c.state
from slot as s
left outer join slot_stats as c on c.id = s.stats_curr_id
left outer join job as j on j.custom_id = s.job_id
Modified: mgmt/trunk/cumin/python/cumin/stat.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.py 2009-01-27 21:59:38 UTC (rev 3076)
+++ mgmt/trunk/cumin/python/cumin/stat.py 2009-01-27 22:00:27 UTC (rev 3077)
@@ -148,8 +148,13 @@
self.add_child(self.cells)
legend = self.Legend(app, "grid_legend")
+ legend.get_method = self.get_colors
self.add_child(legend)
+ legend1 = self.Legend(app, "grid_legend1")
+ legend1.get_method = self.get_states
+ self.add_child(legend1)
+
ajax = self.Updater(app, "grid_updater")
self.add_child(ajax)
@@ -285,6 +290,9 @@
def get_colors(self, session):
return ["clear"]
+ def get_states(self, session):
+ return ["Unclaimed"]
+
def get_url(self, session):
""" returns something like
"call.xml?class=system;id=%i;method=slots" % system.id
@@ -309,7 +317,7 @@
return super(StatUtilizationGrid.Legend, self).render(session, *args)
def do_get_items(self, session, *args):
- return self.parent.get_colors(session)
+ return self.get_method(session)
def render_legend_text(self, session, color):
return color[0]
Modified: mgmt/trunk/cumin/python/cumin/stat.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.strings 2009-01-27 21:59:38 UTC (rev 3076)
+++ mgmt/trunk/cumin/python/cumin/stat.strings 2009-01-27 22:00:27 UTC (rev 3077)
@@ -246,7 +246,12 @@
.btn.green2 { background: #6c6; }
.btn.green3 { background: #393; }
-.btn[class] { background-image: url(resource?name=shade1.png); background-position: bottom; }
+.btn[class] { background-position: bottom; }
+.btn.Claimed { background-image: url(resource?name=claimed1.png); }
+.btn.Unclaimed { background-image: url(resource?name=shade1.png); }
+.btn.Matched { background-image: url(resource?name=match.png); }
+.btn.Owner { background-image: url(resource?name=pwn.png); }
+.btn.Preempting { background-image: url(resource?name=preempt.png); }
div.visualization {
padding-right: 2em;
@@ -334,5 +339,5 @@
[Legend.item_html]
<li>
- <button class="btn {legend_color}" style="background-image: none; width:1em; height:1em;" ></button> {legend_text}
+ <button class="btn {legend_color}" ></button> {legend_text}
</li>
Modified: mgmt/trunk/cumin/python/cumin/system.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.strings 2009-01-27 21:59:38 UTC (rev 3076)
+++ mgmt/trunk/cumin/python/cumin/system.strings 2009-01-27 22:00:27 UTC (rev 3077)
@@ -52,7 +52,7 @@
var slot = obj.slots.slot[cell]
var oslot_Button = document.getElementById("button_"+cell);
if (oslot_Button) {
- oslot_Button.className = "btn "+slot.color;
+ oslot_Button.className = "btn " + slot.color + " " + slot.state;
oslot_Button.onmouseover = over_cell;
oslot_Button.onmouseout = out_cell;
if (slot.jid == "None") {
@@ -70,10 +70,18 @@
if (oslot_Machine) {
oslot_Machine.innerHTML = slot.machine;
}
- var oslot_Job = document.getElementById("cell_job_id_"+cell);
- if (oslot_Job) {
- oslot_Job.innerHTML = slot.job_id;
- }
+ var oslot_Job = document.getElementById("cell_job_id_"+cell);
+ if (oslot_Job) {
+ oslot_Job.innerHTML = slot.job_id;
+ }
+ var oslot_State = document.getElementById("cell_state_"+cell);
+ if (oslot_State) {
+ oslot_State.innerHTML = slot.state;
+ }
+ var oslot_Activity = document.getElementById("cell_activity_"+cell);
+ if (oslot_Activity) {
+ oslot_Activity.innerHTML = slot.activity;
+ }
}
setTimeout("get_slot_grid()", 2500);
}
More information about the rhmessaging-commits
mailing list