[rhmessaging-commits] rhmessaging commits: r975 - mgmt/cumin/python/cumin.

Author: justi9 Date: 2007-10-09 10:20:22 -0400 (Tue, 09 Oct 2007) New Revision: 975 Modified: mgmt/cumin/python/cumin/model.py mgmt/cumin/python/cumin/page.py mgmt/cumin/python/cumin/page.strings mgmt/cumin/python/cumin/server.py mgmt/cumin/python/cumin/virtualhost.py Log: Make Virtual Hosts a top-level UI item. Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2007-10-09 14:18:54 UTC (rev 974) +++ mgmt/cumin/python/cumin/model.py 2007-10-09 14:20:22 UTC (rev 975) @@ -89,6 +89,9 @@ def get_virtual_host(self, id): return self.get_index(self.virtual_host).get(id) + def get_virtual_hosts(self): + return self.get_index(self.virtual_host).values() + def get_queue(self, id): return self.get_index(self.queue).get(id) Modified: mgmt/cumin/python/cumin/page.py =================================================================== --- mgmt/cumin/python/cumin/page.py 2007-10-09 14:18:54 UTC (rev 974) +++ mgmt/cumin/python/cumin/page.py 2007-10-09 14:20:22 UTC (rev 975) @@ -3,6 +3,7 @@ from wooly.widgets import * from wooly.resources import * +from virtualhost import * from server import * from cluster import * from widgets import * @@ -91,6 +92,9 @@ self.view = MainView(app, "view") self.add_child(self.view) + self.vhost = VirtualHostFrame(app, "vhost") + self.add_child(self.vhost) + self.server = ServerFrame(app, "server") self.add_child(self.server) @@ -106,6 +110,10 @@ def show_view(self, session): return self.show_mode(session, self.view) + def show_virtual_host(self, session, vhost): + self.vhost.set_virtual_host(session, vhost) + return self.show_mode(session, self.vhost) + def show_server(self, session, server): self.server.set_server(session, server) return self.show_mode(session, self.server) @@ -133,12 +141,23 @@ self.tabs = TabSet(app, "tabs") self.add_child(self.tabs) + self.tabs.add_child(self.VirtualHostTab(app, "vhosts")) self.tabs.add_child(self.ServerTab(app, "servers")) self.tabs.add_child(ClusterSet(app, "clusters")) def render_title(self, session, model): return "Red Hat Messaging" + class VirtualHostTab(TabSet): + def __init__(self, app, name): + super(MainView.VirtualHostTab, self).__init__(app, name) + + self.vhosts = VirtualHostSet(app, "vhosts") + self.add_child(self.vhosts) + + def render_title(self, session, model): + return "Virtual Hosts (%i)" % len(model.get_virtual_hosts()) + class ServerTab(TabSet): def __init__(self, app, name): super(MainView.ServerTab, self).__init__(app, name) Modified: mgmt/cumin/python/cumin/page.strings =================================================================== --- mgmt/cumin/python/cumin/page.strings 2007-10-09 14:18:54 UTC (rev 974) +++ mgmt/cumin/python/cumin/page.strings 2007-10-09 14:20:22 UTC (rev 975) @@ -325,6 +325,7 @@ <div class="oblock"> <h1>{title}</h1> <ul class="actions"> + <li><a href="">Add Virtual Host</a></li> <li><a href="">Add Server</a></li> <li><a href="">Add Server Group</a></li> <li><a href="">Add Cluster</a></li> @@ -332,6 +333,10 @@ {tabs} </div> +[VirtualHostTab.html] +<ul class="VirtualHostTab radiotabs tabs">{tabs}</ul> +<div class="VirtualHostTab mode">{mode}</div> + [ServerTab.html] <ul class="ServerTab radiotabs tabs">{tabs}</ul> <div class="ServerTab mode">{mode}</div> Modified: mgmt/cumin/python/cumin/server.py =================================================================== --- mgmt/cumin/python/cumin/server.py 2007-10-09 14:18:54 UTC (rev 974) +++ mgmt/cumin/python/cumin/server.py 2007-10-09 14:20:22 UTC (rev 975) @@ -84,7 +84,7 @@ self.tabs = TabSet(app, "tabs") self.add_child(self.tabs) - self.vhosts = VirtualHostSet(app, "virtual_hosts") + self.vhosts = self.ServerVirtualHosts(app, "vhosts") self.tabs.add_child(self.vhosts) self.log = self.ServerLog(app, "log") @@ -109,6 +109,13 @@ return html + class ServerVirtualHosts(VirtualHostSet): + def render_title(self, session, server): + return "Virtual Hosts (%i)" % len(server.virtual_host_items()) + + def get_items(self, session, server): + return sorted(server.virtual_host_items(), cmp, lambda x: x.name) + class ServerLog(Widget): def render_title(self, session, server): return "Log Messages" Modified: mgmt/cumin/python/cumin/virtualhost.py =================================================================== --- mgmt/cumin/python/cumin/virtualhost.py 2007-10-09 14:18:54 UTC (rev 974) +++ mgmt/cumin/python/cumin/virtualhost.py 2007-10-09 14:20:22 UTC (rev 975) @@ -9,17 +9,17 @@ strings = StringCatalog(__file__) class VirtualHostSet(ItemSet): - def render_title(self, session, server): - return "Virtual Hosts (%i)" % len(server.virtual_host_items()) + def render_title(self, session, model): + return "Virtual Hosts (%i)" % len(model.get_virtual_hosts()) - def get_items(self, session, server): - return sorted(server.virtual_host_items(), cmp, lambda x: x.name) + def get_items(self, session, model): + return sorted(model.get_virtual_hosts(), cmp, lambda x: x.name) def render_item_link(self, session, vhost): branch = session.branch() self.page().show_virtual_host(branch, vhost) - return mlink(branch.marshal(), "Virtual Host", vhost.name) + return mlink(branch.marshal(), "VirtualHost", vhost.name) class VirtualHostFrame(CuminFrame): def __init__(self, app, name): @@ -44,6 +44,7 @@ self.exchange = ExchangeFrame(app, "exchange") self.add_child(self.exchange) + # XXX move this to the top level class VirtualHostParameter(Parameter): def do_unmarshal(self, string): return self.app.model.get_virtual_host(int(string))