[rhmessaging-commits] rhmessaging commits: r1105 - mgmt/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Wed Oct 17 14:24:41 EDT 2007
Author: justi9
Date: 2007-10-17 14:24:40 -0400 (Wed, 17 Oct 2007)
New Revision: 1105
Added:
mgmt/cumin/python/cumin/configproperty.py
mgmt/cumin/python/cumin/servergroup.py
mgmt/cumin/python/cumin/servergroup.strings
mgmt/cumin/python/cumin/serverprofile.py
mgmt/cumin/python/cumin/serverprofile.strings
Modified:
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/server.py
mgmt/cumin/python/cumin/server.strings
Log:
File reorganization. Splits out some classes that were building up in
server.py into serverprofile.py and servergroups.py. Moves config
property ui stuff to configproperty.py. Adds respective .strings
files.
Added: mgmt/cumin/python/cumin/configproperty.py
===================================================================
--- mgmt/cumin/python/cumin/configproperty.py (rev 0)
+++ mgmt/cumin/python/cumin/configproperty.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,23 @@
+from wooly import *
+from wooly.widgets import *
+
+from widgets import *
+from util import *
+
+class ConfigPropertySet(ItemSet):
+ def get_items(self, session, model):
+ return sorted_by(model.get_config_properties())
+
+ def render_item_name(self, session, prop):
+ return prop.name
+
+ def render_item_value(self, session, prop):
+ return prop.value
+
+class ConfigPropertyParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_config_property(int(string))
+
+ def do_marshal(self, prop):
+ return str(prop.id)
+
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-17 17:54:51 UTC (rev 1104)
+++ mgmt/cumin/python/cumin/page.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -2,6 +2,7 @@
from wooly.widgets import *
from wooly.resources import *
+from serverprofile import *
from server import *
from cluster import *
from widgets import *
Modified: mgmt/cumin/python/cumin/server.py
===================================================================
--- mgmt/cumin/python/cumin/server.py 2007-10-17 17:54:51 UTC (rev 1104)
+++ mgmt/cumin/python/cumin/server.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -1,6 +1,8 @@
from wooly import *
from wooly.widgets import *
+from servergroup import *
+from configproperty import *
from virtualhost import *
from widgets import *
from util import *
@@ -70,33 +72,6 @@
def render_title(self, session, server):
return "Server '%s'" % server.name
-class ServerGroupSet(ItemSet):
- def render_item_content(self, session, group):
- branch = session.branch()
- self.page().show_server_group(branch, group).show_view(branch)
-
- return mlink(branch.marshal(), "ServerGroup", group.name)
-
- def render_none(self, session, group):
- return none()
-
-class ConfigPropertySet(ItemSet):
- def get_items(self, session, model):
- return sorted_by(model.get_config_properties())
-
- def render_item_name(self, session, prop):
- return prop.name
-
- def render_item_value(self, session, prop):
- return prop.value
-
-class ConfigPropertyParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_config_property(int(string))
-
- def do_marshal(self, prop):
- return str(prop.id)
-
class ServerConfigPropertyForm(CuminForm, Frame):
def __init__(self, app, name):
super(ServerConfigPropertyForm, self).__init__(app, name)
@@ -359,148 +334,3 @@
return sorted_by(group.server_items())
else:
return sorted_by(self.app.model.get_servers())
-
-class ServerGroupParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_server_group(int(string))
-
- def do_marshal(self, group):
- return str(group.id)
-
-class ServerGroupForm(CuminForm):
- def __init__(self, app, name):
- super(ServerGroupForm, self).__init__(app, name)
-
- self.group_name = TextInput(app, "name", self)
- self.add_child(self.group_name)
-
- def process_submit(self, session, object):
- if object is self.app.model:
- group = ServerGroup(object)
- else:
- group = object
-
- group.lock()
- try:
- group.name = self.group_name.get(session)
- group.set_type(self.app.model.get_server_group_types()[0])
- finally:
- group.unlock()
-
- branch = session.branch()
- self.page().show_server_group(branch, group)
- session.set_redirect(branch.marshal())
-
- def process_cancel(self, session, model):
- branch = session.branch()
- self.page().show_view(branch)
- session.set_redirect(branch.marshal())
-
-class ServerGroupAdd(ServerGroupForm, Frame):
- def render_title(self, session, model):
- return "Add Group"
-
-class ServerGroupEdit(ServerGroupForm, Frame):
- def __init__(self, app, name):
- super(ServerGroupEdit, self).__init__(app, name)
-
- self.param = ServerGroupParameter(app, "id")
- self.add_parameter(self.param)
-
- def get_object(self, session, object):
- return self.param.get(session)
-
- def set_object(self, session, group):
- self.param.set(session, group)
-
- def process_display(self, session, group):
- self.group_name.set(session, group.name)
-
- def render_title(self, session, group):
- return "Edit Group '%s'" % group.name
-
-class ServerProfileSet(ItemSet):
- def get_items(self, session, model):
- return sorted_by(model.get_server_profiles())
-
- def render_item_link(self, session, profile):
- branch = session.branch()
- frame = self.page().show_server_profile(branch, profile)
- frame.show_view(branch)
- return mlink(branch.marshal(), "ServerProfile", profile.name)
-
-class ServerProfileParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_server_profile(int(string))
-
- def do_marshal(self, profile):
- return str(profile.id)
-
-class ServerProfileFrame(CuminFrame):
- def __init__(self, app, name):
- super(ServerProfileFrame, self).__init__(app, name)
-
- self.param = ServerProfileParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
-
- self.view = ServerProfileView(app, "view")
- self.add_mode(self.view)
-
- def show_view(self, session):
- return self.show_mode(session, self.view)
-
- def render_title(self, session, profile):
- return "Server Profile '%s'" % profile.name
-
-class ServerProfileView(Widget):
- def __init__(self, app, name):
- super(ServerProfileView, self).__init__(app, name)
-
- self.tabs = TabSet(app, "tabs")
- self.add_child(self.tabs)
-
- self.tabs.add_tab(self.ProfileConfigTab(app, "config"))
- self.tabs.add_tab(self.ProfileServerTab(app, "servers"))
-
- def render_title(self, session, profile):
- return "Server Profile '%s'" % profile.name
-
- def render_name(self, session, profile):
- return profile.name
-
- class ProfileConfigTab(ConfigPropertySet):
- def get_items(self, session, profile):
- return sorted_by(profile.config_property_items())
-
- def render_title(self, session, profile):
- return "Configuration"
-
- class ProfileServerTab(ServerSet):
- def __init__(self, app, name):
- super(ServerProfileView.ProfileServerTab, self).__init__(app, name)
-
- def render_title(self, session, profile):
- return "Servers (%i)" % len(profile.server_items())
-
- def get_items(self, session, profile):
- return sorted_by(profile.server_items())
-
- def render_item_config_href(self, session, server):
- branch = session.branch()
- frame = self.page().show_server(branch, server)
- frame.show_view(branch).show_config(branch)
- return branch.marshal()
-
- def render_item_config_status(self, session, server):
- diffs = 0
-
- for prop in server.get_server_profile().config_property_items():
- for iprop in server.config_property_items():
- if iprop.name == prop.name:
- if iprop.value != prop.value:
- diffs += 1
-
- return "%i difference(s)" % diffs
-
-
Modified: mgmt/cumin/python/cumin/server.strings
===================================================================
--- mgmt/cumin/python/cumin/server.strings 2007-10-17 17:54:51 UTC (rev 1104)
+++ mgmt/cumin/python/cumin/server.strings 2007-10-17 18:24:40 UTC (rev 1105)
@@ -16,20 +16,6 @@
<td>0 errors, 0 warnings</td>
</tr>
-[ServerProfileSet.html]
-<table class="ServerProfileSet mobjects">
- <tr>
- <th>Server Profile</th>
- </tr>
-
- {items}
-</table>
-
-[ServerProfileSet.item_html]
-<tr>
- <td>{item_link}</td>
-</tr>
-
[ServerConfigTab.css]
.ServerConfigTab.diff {
background-color: #ff9;
@@ -190,86 +176,3 @@
[BrowserGroups.group_html]
<li>{group_link}</li>
-
-[ServerGroupForm.html]
-<form id="{id}" class="ServerGroupForm mform" method="post" action="?">
- <div class="head">
- <h1>{title}</h1>
- </div>
- <div class="body">
- <span class="legend">Name</span>
- <fieldset>{name}</fieldset>
-
- {hidden_inputs}
- </div>
- <div class="foot">
- <div style="display: block; float: left;"><button>Help</button></div>
- {cancel}
- {submit}
- </div>
-</form>
-<script defer="defer">
-(function() {
- var elem = wooly.doc().elem("{id}").node.elements[1];
- elem.focus();
- elem.select();
-}())
-</script>
-
-[ServerProfileView.html]
-<div class="oblock">
- <h1>{title}</h1>
-
- <dl class="properties">
- <dt>Name</dt><dd>{name}</dd>
- </dl>
-
- <ul class="actions">
- <li><a href="">Edit This Profile</a></li>
- </ul>
-
- {tabs}
-</div>
-
-[ProfileConfigTab.html]
-<ul class="actions">
- <li><a href="">Add Property</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Property</th>
- <th>Configured Value</th>
- <th></th>
- </tr>
-
- {items}
-</table>
-
-[ProfileConfigTab.item_html]
-<tr>
- <td>{item_name}</td>
- <td>{item_value}</td>
- <td><a class="action" href="">Edit</a></td>
-</tr>
-
-[ProfileServerTab.html]
-<ul class="actions">
- <li><a href="">Apply Profile Configuration to Servers</a></li>
-</ul>
-
-<table class="mobjects">
- <tr>
- <th>Server</th>
- <th>Configuration Status</th>
- <th></th>
- </tr>
-
- {items}
-</table>
-
-[ProfileServerTab.item_html]
-<tr>
- <td>{item_link}</td>
- <td><a href="{item_config_href}">{item_config_status}</a></td>
-</tr>
Added: mgmt/cumin/python/cumin/servergroup.py
===================================================================
--- mgmt/cumin/python/cumin/servergroup.py (rev 0)
+++ mgmt/cumin/python/cumin/servergroup.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,76 @@
+from wooly import *
+from wooly.widgets import *
+
+from widgets import *
+from util import *
+
+strings = StringCatalog(__file__)
+
+class ServerGroupSet(ItemSet):
+ def render_item_content(self, session, group):
+ branch = session.branch()
+ self.page().show_server_group(branch, group).show_view(branch)
+
+ return mlink(branch.marshal(), "ServerGroup", group.name)
+
+ def render_none(self, session, group):
+ return none()
+
+class ServerGroupParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_server_group(int(string))
+
+ def do_marshal(self, group):
+ return str(group.id)
+
+class ServerGroupForm(CuminForm):
+ def __init__(self, app, name):
+ super(ServerGroupForm, self).__init__(app, name)
+
+ self.group_name = TextInput(app, "name", self)
+ self.add_child(self.group_name)
+
+ def process_submit(self, session, object):
+ if object is self.app.model:
+ group = ServerGroup(object)
+ else:
+ group = object
+
+ group.lock()
+ try:
+ group.name = self.group_name.get(session)
+ group.set_type(self.app.model.get_server_group_types()[0])
+ finally:
+ group.unlock()
+
+ branch = session.branch()
+ self.page().show_server_group(branch, group)
+ session.set_redirect(branch.marshal())
+
+ def process_cancel(self, session, model):
+ branch = session.branch()
+ self.page().show_view(branch)
+ session.set_redirect(branch.marshal())
+
+class ServerGroupAdd(ServerGroupForm, Frame):
+ def render_title(self, session, model):
+ return "Add Group"
+
+class ServerGroupEdit(ServerGroupForm, Frame):
+ def __init__(self, app, name):
+ super(ServerGroupEdit, self).__init__(app, name)
+
+ self.param = ServerGroupParameter(app, "id")
+ self.add_parameter(self.param)
+
+ def get_object(self, session, object):
+ return self.param.get(session)
+
+ def set_object(self, session, group):
+ self.param.set(session, group)
+
+ def process_display(self, session, group):
+ self.group_name.set(session, group.name)
+
+ def render_title(self, session, group):
+ return "Edit Group '%s'" % group.name
Added: mgmt/cumin/python/cumin/servergroup.strings
===================================================================
--- mgmt/cumin/python/cumin/servergroup.strings (rev 0)
+++ mgmt/cumin/python/cumin/servergroup.strings 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,24 @@
+[ServerGroupForm.html]
+<form id="{id}" class="ServerGroupForm mform" method="post" action="?">
+ <div class="head">
+ <h1>{title}</h1>
+ </div>
+ <div class="body">
+ <span class="legend">Name</span>
+ <fieldset>{name}</fieldset>
+
+ {hidden_inputs}
+ </div>
+ <div class="foot">
+ <div style="display: block; float: left;"><button>Help</button></div>
+ {cancel}
+ {submit}
+ </div>
+</form>
+<script defer="defer">
+(function() {
+ var elem = wooly.doc().elem("{id}").node.elements[1];
+ elem.focus();
+ elem.select();
+}())
+</script>
Added: mgmt/cumin/python/cumin/serverprofile.py
===================================================================
--- mgmt/cumin/python/cumin/serverprofile.py (rev 0)
+++ mgmt/cumin/python/cumin/serverprofile.py 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,93 @@
+from wooly import *
+from wooly.widgets import *
+
+from configproperty import *
+from server import *
+from widgets import *
+from util import *
+
+strings = StringCatalog(__file__)
+
+class ServerProfileSet(ItemSet):
+ def get_items(self, session, model):
+ return sorted_by(model.get_server_profiles())
+
+ def render_item_link(self, session, profile):
+ branch = session.branch()
+ frame = self.page().show_server_profile(branch, profile)
+ frame.show_view(branch)
+ return mlink(branch.marshal(), "ServerProfile", profile.name)
+
+class ServerProfileParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_server_profile(int(string))
+
+ def do_marshal(self, profile):
+ return str(profile.id)
+
+class ServerProfileFrame(CuminFrame):
+ def __init__(self, app, name):
+ super(ServerProfileFrame, self).__init__(app, name)
+
+ self.param = ServerProfileParameter(app, "id")
+ self.add_parameter(self.param)
+ self.set_object_parameter(self.param)
+
+ self.view = ServerProfileView(app, "view")
+ self.add_mode(self.view)
+
+ def show_view(self, session):
+ return self.show_mode(session, self.view)
+
+ def render_title(self, session, profile):
+ return "Server Profile '%s'" % profile.name
+
+class ServerProfileView(Widget):
+ def __init__(self, app, name):
+ super(ServerProfileView, self).__init__(app, name)
+
+ self.tabs = TabSet(app, "tabs")
+ self.add_child(self.tabs)
+
+ self.tabs.add_tab(self.ProfileConfigTab(app, "config"))
+ self.tabs.add_tab(self.ProfileServerTab(app, "servers"))
+
+ def render_title(self, session, profile):
+ return "Server Profile '%s'" % profile.name
+
+ def render_name(self, session, profile):
+ return profile.name
+
+ class ProfileConfigTab(ConfigPropertySet):
+ def get_items(self, session, profile):
+ return sorted_by(profile.config_property_items())
+
+ def render_title(self, session, profile):
+ return "Configuration"
+
+ class ProfileServerTab(ServerSet):
+ def __init__(self, app, name):
+ super(ServerProfileView.ProfileServerTab, self).__init__(app, name)
+
+ def render_title(self, session, profile):
+ return "Servers (%i)" % len(profile.server_items())
+
+ def get_items(self, session, profile):
+ return sorted_by(profile.server_items())
+
+ def render_item_config_href(self, session, server):
+ branch = session.branch()
+ frame = self.page().show_server(branch, server)
+ frame.show_view(branch).show_config(branch)
+ return branch.marshal()
+
+ def render_item_config_status(self, session, server):
+ diffs = 0
+
+ for prop in server.get_server_profile().config_property_items():
+ for iprop in server.config_property_items():
+ if iprop.name == prop.name:
+ if iprop.value != prop.value:
+ diffs += 1
+
+ return "%i difference(s)" % diffs
Added: mgmt/cumin/python/cumin/serverprofile.strings
===================================================================
--- mgmt/cumin/python/cumin/serverprofile.strings (rev 0)
+++ mgmt/cumin/python/cumin/serverprofile.strings 2007-10-17 18:24:40 UTC (rev 1105)
@@ -0,0 +1,71 @@
+[ServerProfileSet.html]
+<table class="ServerProfileSet mobjects">
+ <tr>
+ <th>Server Profile</th>
+ </tr>
+
+ {items}
+</table>
+
+[ServerProfileSet.item_html]
+<tr>
+ <td>{item_link}</td>
+</tr>
+
+[ServerProfileView.html]
+<div class="oblock">
+ <h1>{title}</h1>
+
+ <dl class="properties">
+ <dt>Name</dt><dd>{name}</dd>
+ </dl>
+
+ <ul class="actions">
+ <li><a href="">Edit This Profile</a></li>
+ </ul>
+
+ {tabs}
+</div>
+
+[ProfileConfigTab.html]
+<ul class="actions">
+ <li><a href="">Add Property</a></li>
+</ul>
+
+<table class="mobjects">
+ <tr>
+ <th>Property</th>
+ <th>Configured Value</th>
+ <th></th>
+ </tr>
+
+ {items}
+</table>
+
+[ProfileConfigTab.item_html]
+<tr>
+ <td>{item_name}</td>
+ <td>{item_value}</td>
+ <td><a class="action" href="">Edit</a></td>
+</tr>
+
+[ProfileServerTab.html]
+<ul class="actions">
+ <li><a href="">Apply Profile Configuration to Servers</a></li>
+</ul>
+
+<table class="mobjects">
+ <tr>
+ <th>Server</th>
+ <th>Configuration Status</th>
+ <th></th>
+ </tr>
+
+ {items}
+</table>
+
+[ProfileServerTab.item_html]
+<tr>
+ <td>{item_link}</td>
+ <td><a href="{item_config_href}">{item_config_status}</a></td>
+</tr>
More information about the rhmessaging-commits
mailing list