[rhmessaging-commits] rhmessaging commits: r1111 - in mgmt: notes and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Oct 18 12:09:13 EDT 2007
Author: justi9
Date: 2007-10-18 12:09:13 -0400 (Thu, 18 Oct 2007)
New Revision: 1111
Modified:
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/page.strings
mgmt/cumin/python/cumin/server.py
mgmt/cumin/python/cumin/server.strings
mgmt/cumin/python/cumin/servergroup.py
mgmt/cumin/python/cumin/servergroup.strings
mgmt/notes/Todo
Log:
Adds a bunch of stub links for the demonstration, and adds more filter
types to the proposed server view.
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-18 14:22:03 UTC (rev 1110)
+++ mgmt/cumin/python/cumin/page.py 2007-10-18 16:09:13 UTC (rev 1111)
@@ -172,7 +172,7 @@
self.tabs.add_tab(self.servers)
self.tabs.add_tab(self.ClusterTab(app, "clusters"))
- self.tabs.add_tab(self.ProfileTab(app, "profiles"))
+ self.tabs.add_tab(self.ServerProfileTab(app, "profiles"))
# Proposed
@@ -181,7 +181,7 @@
self.proposed.add_tab(self.PServerTab(app, "servers"))
self.proposed.add_tab(self.ServerGroupTab(app, "groups"))
- self.proposed.add_tab(self.ProfileTab(app, "profiles"))
+ self.proposed.add_tab(self.ServerProfileTab(app, "profiles"))
self.proposed.add_tab(self.PClusterTab(app, "clusters"))
class DiscussedTabs(TabSet):
@@ -208,13 +208,7 @@
def render_title(self, session, model):
return "Clusters (%i)" % len(model.get_clusters())
- class ProfileTab(Widget):
- def __init__(self, app, name):
- super(MainView.ProfileTab, self).__init__(app, name)
-
- self.profiles = ServerProfileSet(app, "profiles")
- self.add_child(self.profiles)
-
+ class ServerProfileTab(ServerProfileSet):
def render_title(self, session, model):
return "Server Profiles (%i)" % len(model.get_server_profiles())
@@ -229,4 +223,3 @@
class PClusterTab(ClusterSet):
def render_title(self, session, model):
return "Clusters (%i)" % len(model.get_clusters())
-
Modified: mgmt/cumin/python/cumin/page.strings
===================================================================
--- mgmt/cumin/python/cumin/page.strings 2007-10-18 14:22:03 UTC (rev 1110)
+++ mgmt/cumin/python/cumin/page.strings 2007-10-18 16:09:13 UTC (rev 1111)
@@ -425,3 +425,31 @@
<ul class="radiotabs tabs">{tabs}</ul>
<div class="radiotabs mode">{mode}</div>
</div>
+
+[ServerGroupTab.html]
+<ul class="actions">
+ <li><a href="">Add Server Group</a></li>
+</ul>
+
+<table class="mobjects">
+ <tr>
+ <th>Server</th>
+ <th>Configuration</th>
+ <th>Status</th>
+ </tr>
+
+ {items}
+</table>
+
+[ServerProfileTab.html]
+<ul class="actions">
+ <li><a href="">Add Server Profile</a></li>
+</ul>
+
+<table class="mobjects">
+ <tr>
+ <th>Server Profile</th>
+ </tr>
+
+ {items}
+</table>
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-18 14:22:03 UTC (rev 1110)
+++ mgmt/cumin/python/cumin/server.py 2007-10-18 16:09:13 UTC (rev 1111)
@@ -7,6 +7,7 @@
from widgets import *
from parameters import *
from util import *
+from random import random
strings = StringCatalog(__file__)
@@ -56,6 +57,12 @@
else:
return none()
+ def render_item_status(self, session, server):
+ return "0 errors, 0 warnings"
+
+ def render_item_load(self, session, server):
+ return "%.2f" % random()
+
class ServerFrame(CuminFrame):
def __init__(self, app, name):
super(ServerFrame, self).__init__(app, name)
@@ -351,7 +358,7 @@
else:
return sorted_by(self.app.model.get_servers())
-class PServerBrowser(ServerSet):
+class PServerBrowser(Widget):
def __init__(self, app, name):
super(PServerBrowser, self).__init__(app, name)
@@ -368,22 +375,37 @@
self.cluster = ClusterParameter(app, "cluster")
self.add_parameter(self.cluster)
- def get_items(self, session, model):
- servers = sorted_by(model.get_servers())
- group = self.group.get(session)
- cluster = self.cluster.get(session)
+ self.servers = self.BrowserServers(app, "servers")
+ self.add_child(self.servers)
- for server in model.get_servers():
- if group and group not in server.server_group_items():
- servers.remove(server)
+ class BrowserServers(ServerSet):
+ def get_items(self, session, model):
+ servers = sorted_by(model.get_servers())
+ group = self.parent.group.get(session)
+ profile = self.parent.profile.get(session)
+ cluster = self.parent.cluster.get(session)
- if cluster and cluster is not server.get_cluster():
- # XXX
- if server in servers:
+ for server in model.get_servers():
+ if group and group not in server.server_group_items():
servers.remove(server)
- return servers
+ if profile and profile is not server.get_server_profile():
+ try:
+ servers.remove(server)
+ except ValueError:
+ pass
+
+ if cluster and cluster is not server.get_cluster():
+ try:
+ servers.remove(server)
+ except ValueError:
+ pass
+ return servers
+
+ def render_none(self, session, model):
+ return none()
+
def render_group_filters(self, session, model):
groups = sorted_by(model.get_server_groups())
return self._render_filters(session, groups, self.group_tmpl)
@@ -391,6 +413,13 @@
def render_group_link(self, session, group):
return self._render_filter_link(session, group, self.group)
+ def render_profile_filters(self, session, model):
+ profiles = sorted_by(model.get_server_profiles())
+ return self._render_filters(session, profiles, self.profile_tmpl)
+
+ def render_profile_link(self, session, profile):
+ return self._render_filter_link(session, profile, self.profile)
+
def render_cluster_filters(self, session, model):
clusters = sorted_by(model.get_clusters())
return self._render_filters(session, clusters, self.cluster_tmpl)
Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings 2007-10-18 14:22:03 UTC (rev 1110)
+++ mgmt/cumin/python/cumin/server.strings 2007-10-18 16:09:13 UTC (rev 1111)
@@ -179,26 +179,29 @@
[BrowserGroups.group_html]
<li>{group_link}</li>
+[PServerBrowser.css]
+
+
[PServerBrowser.html]
<table class="browser">
<tr>
<td class="nav">
+ <ul class="actions">
+ <li><a href="">Clear Filters</a></li>
+ </ul>
+
<h2>Filter by Group</h2>
<ul class="slist">{group_filters}</ul>
+ <h2>Filter by Profile</h2>
+ <ul class="slist">{profile_filters}</ul>
<h2>Filter by Cluster</h2>
<ul class="slist">{cluster_filters}</ul>
</td>
<td class="view">
- <table class="mobjects">
- <tr>
- <th>Server</th>
- <th>Profile</th>
- <th>Cluster</th>
- <th>Status</th>
- </tr>
-
- {items}
- </table>
+ <ul class="actions">
+ <li><a href="">Register Servers</a></li>
+ </ul>
+ {servers}
</td>
</tr>
</div>
@@ -212,3 +215,28 @@
[PServerBrowser.cluster_html]
<li>{cluster_link}</li>
+[BrowserServers.html]
+<form>
+<table class="mobjects">
+ <tr>
+ <th><input type="checkbox"/></th>
+ <th>Server</th>
+ <th>Profile</th>
+ <th>Cluster</th>
+ <th>Status</th>
+ <th>Load</th>
+ </tr>
+
+ {items}
+</table>
+</form>
+
+[BrowserServers.item_html]
+<tr>
+ <td><input type="checkbox"/ name="server" value="{item_id}"></td>
+ <td>{item_link}</td>
+ <td>{item_profile_link}</td>
+ <td>{item_cluster_link}</td>
+ <td>{item_status}</td>
+ <td>{item_load}</td>
+</tr>
Modified: mgmt/cumin/python/cumin/servergroup.py
===================================================================
--- mgmt/cumin/python/cumin/servergroup.py 2007-10-18 14:22:03 UTC (rev 1110)
+++ mgmt/cumin/python/cumin/servergroup.py 2007-10-18 16:09:13 UTC (rev 1111)
@@ -63,6 +63,9 @@
def render_name(self, session, group):
return group.name
+ def render_category(self, session, group):
+ return group.get_type().name
+
class GroupServerTab(Widget):
def render_title(self, session, group):
return "Servers (%i)" % len(group.server_items())
Modified: mgmt/cumin/python/cumin/servergroup.strings
===================================================================
--- mgmt/cumin/python/cumin/servergroup.strings 2007-10-18 14:22:03 UTC (rev 1110)
+++ mgmt/cumin/python/cumin/servergroup.strings 2007-10-18 16:09:13 UTC (rev 1111)
@@ -27,10 +27,12 @@
<dl class="properties">
<dt>Name</dt><dd>{name}</dd>
+ <dt>Category</dt><dd>{category}</dd>
</dl>
<ul class="actions">
<li><a href="">Edit This Server Group</a></li>
+ <li><a href="">Remove This Server Group</a></li>
</ul>
{tabs}
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-18 14:22:03 UTC (rev 1110)
+++ mgmt/notes/Todo 2007-10-18 16:09:13 UTC (rev 1111)
@@ -99,3 +99,5 @@
* Add a CuminItemSet with add/edit/remove href parts
* Make the groups browser use common code with the cluster browser
+
+ * Rename ServerGroupType to ServerGroupCategory
More information about the rhmessaging-commits
mailing list