Author: justi9 Date: 2008-08-12 17:37:06 -0400 (Tue, 12 Aug 2008) New Revision: 2287 Added: mgmt/trunk/cumin/python/cumin/pool.py mgmt/trunk/cumin/python/cumin/pool.strings Modified: mgmt/trunk/cumin/python/cumin/model.py mgmt/trunk/cumin/python/cumin/page.py mgmt/trunk/cumin/python/cumin/parameters.py Log: Add basic navigation for grid pools Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-08-12 21:35:11 UTC (rev 2286) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-08-12 21:37:06 UTC (rev 2287) @@ -36,6 +36,7 @@ CuminBrokerRegistration(self) CuminBrokerGroup(self) + CuminPool(self) def check(self): self.data.check() @@ -1353,6 +1354,16 @@ def get_icon_href(self, session): return "resource?name=group-36.png" +class CuminPool(CuminClass): + def __init__(self, model): + super(CuminPool, self).__init__(model, "pool", Pool) + + def get_title(self, session): + return "Pool" + + def show_object(self, session, pool): + return self.cumin_model.show_main(session).show_pool(session, pool) + class ModelPage(Page): def __init__(self, app, name): super(ModelPage, self).__init__(app, name) Modified: mgmt/trunk/cumin/python/cumin/page.py =================================================================== --- mgmt/trunk/cumin/python/cumin/page.py 2008-08-12 21:35:11 UTC (rev 2286) +++ mgmt/trunk/cumin/python/cumin/page.py 2008-08-12 21:37:06 UTC (rev 2287) @@ -7,6 +7,7 @@ from brokergroup import * from brokerprofile import * from brokercluster import * +from pool import * from system import * from action import * from widgets import * @@ -89,6 +90,9 @@ self.__cluster = BrokerClusterFrame(app, "cluster") self.add_mode(self.__cluster) + self.__pool = PoolFrame(app, "pool") + self.add_mode(self.__pool) + self.__system = SystemFrame(app, "system") self.add_mode(self.__system) @@ -159,6 +163,11 @@ frame.set_object(session, cluster) return self.page.set_current_frame(session, frame) + def show_pool(self, session, pool): + frame = self.show_mode(session, self.__pool) + frame.set_object(session, pool) + return self.page.set_current_frame(session, frame) + def show_system(self, session, system): frame = self.show_mode(session, self.__system) frame.set_object(session, system) @@ -198,7 +207,7 @@ self.add_parameter(self.selection) self.add_link(self.MessagingTab(app, "mtab")) - #self.add_link(self.GridTab(app, "gtab")) + self.add_link(self.GridTab(app, "gtab")) self.add_link(self.SystemsTab(app, "stab")) def render_class(self, session): @@ -278,6 +287,11 @@ return "Tags" class GridView(TabbedModeSet): + def __init__(self, app, name): + super(GridView, self).__init__(app, name) + + self.add_tab(PoolSet(app, "pools")) + def render_title(self, session): return "Grid" Modified: mgmt/trunk/cumin/python/cumin/parameters.py =================================================================== --- mgmt/trunk/cumin/python/cumin/parameters.py 2008-08-12 21:35:11 UTC (rev 2286) +++ mgmt/trunk/cumin/python/cumin/parameters.py 2008-08-12 21:37:06 UTC (rev 2287) @@ -72,6 +72,13 @@ def do_marshal(self, peer): return str(peer.id) +class PoolParameter(Parameter): + def do_unmarshal(self, string): + return Pool.get(int(string)) + + def do_marshal(self, pool): + return str(pool.id) + class QueueParameter(Parameter): def do_unmarshal(self, string): return Queue.get(int(string)) Added: mgmt/trunk/cumin/python/cumin/pool.py =================================================================== --- mgmt/trunk/cumin/python/cumin/pool.py (rev 0) +++ mgmt/trunk/cumin/python/cumin/pool.py 2008-08-12 21:37:06 UTC (rev 2287) @@ -0,0 +1,63 @@ +import logging + +from wooly import * +from wooly.widgets import * +from wooly.forms import * +from wooly.resources import * +from wooly.tables import * + +from stat import * +from widgets import * +from parameters import * +from formats import * +from util import * + +strings = StringCatalog(__file__) +log = logging.getLogger("cumin.pool") + +class PoolSet(CuminTable): + def __init__(self, app, name): + super(PoolSet, self).__init__(app, name) + + col = self.NameColumn(app, "name") + self.add_column(col) + + self.set_default_column(col) + + def render_title(self, session): + return "Pools %s" % fmt_count(Pool.select().count()) + + class NameColumn(SqlTableColumn): + def render_title(self, session, data): + return "Name" + + def render_content(self, session, data): + pool = Identifiable(data["id"]) + branch = session.branch() + self.frame.show_pool(branch, pool).show_view(branch) + return fmt_olink(branch, pool, name=data["name"]) + +class PoolFrame(CuminFrame): + def __init__(self, app, name): + super(PoolFrame, self).__init__(app, name) + + self.object = PoolParameter(app, "id") + self.add_parameter(self.object) + + view = PoolView(app, "view") + self.add_mode(view) + self.set_view_mode(view) + +class PoolView(CuminView): + def __init__(self, app, name): + super(PoolView, self).__init__(app, name) + + status = PoolStatus(app, "status") + self.add_child(status) + + self.__tabs = TabbedModeSet(app, "tabs") + self.add_child(self.__tabs) + +class PoolStatus(CuminStatus): + pass + Added: mgmt/trunk/cumin/python/cumin/pool.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/pool.strings (rev 0) +++ mgmt/trunk/cumin/python/cumin/pool.strings 2008-08-12 21:37:06 UTC (rev 2287) @@ -0,0 +1,8 @@ +[PoolSet.sql] +select + p.id, + p.name +from pool as p + +[PoolSet.count_sql] +select count(*) from pool