[rhmessaging-commits] rhmessaging commits: r1332 - in mgmt: misc and 1 other directory.

Author: justi9 Date: 2007-11-17 09:31:19 -0500 (Sat, 17 Nov 2007) New Revision: 1332 Modified: mgmt/cumin/python/cumin/__init__.py mgmt/cumin/python/cumin/broker.py mgmt/cumin/python/cumin/model.py mgmt/cumin/python/cumin/page.py mgmt/cumin/python/cumin/parameters.py mgmt/misc/mint-test.py Log: Checkpoint commit of changes to work with newest model. Modified: mgmt/cumin/python/cumin/__init__.py =================================================================== --- mgmt/cumin/python/cumin/__init__.py 2007-11-16 22:53:35 UTC (rev 1331) +++ mgmt/cumin/python/cumin/__init__.py 2007-11-17 14:31:19 UTC (rev 1332) @@ -34,10 +34,10 @@ self.mint = MintModel() try: - sys = MintSystem.get(1) + sys = System.get(1) except SQLObjectNotFound: - sys = MintSystem() - sys.set(sysIdent=0, idOriginal=0) + sys = System() + sys.set(id=0, idOriginal=0) self.model.sys = sys Modified: mgmt/cumin/python/cumin/broker.py =================================================================== --- mgmt/cumin/python/cumin/broker.py 2007-11-16 22:53:35 UTC (rev 1331) +++ mgmt/cumin/python/cumin/broker.py 2007-11-17 14:31:19 UTC (rev 1332) @@ -1,3 +1,4 @@ +import mint.schema as mint from wooly import * from wooly.widgets import * from random import random @@ -19,7 +20,7 @@ return "Brokers %s" % fmt_count(len(model.get_brokers())) def get_items(self, session, model): - return sorted_by(model.sys.brokers, "id") + return sorted_by(model.brokers(), "id") def render_item_link(self, session, broker): branch = session.branch() @@ -283,7 +284,7 @@ return "Queues %s" % fmt_count(len(vhost.queues)) def get_object(self, session, broker): - return MintVhost.selectBy(mintBrokerID=broker.id, name="/")[0] + return Vhost.selectBy(broker=broker, name="/")[0] class BrokerExchangeTab(ExchangeSet): def get_title(self, session, broker): @@ -291,7 +292,7 @@ return "Exchanges %s" % fmt_count(len(vhost.exchanges)) def get_object(self, session, broker): - return MintVhost.selectBy(mintBrokerID=broker.id, name="/")[0] + return Vhost.selectBy(broker=broker, name="/")[0] class BrokerClientTab(ClientSet): def get_title(self, session, broker): @@ -299,15 +300,15 @@ return "Clients %s" % fmt_count(len(vhost.clients)) def get_object(self, session, broker): - return MintVhost.selectBy(mintBrokerID=broker.id, name="/")[0] + return Vhost.selectBy(broker=broker, name="/")[0] class BrokerVirtualHostTab(VirtualHostSet): def get_title(self, session, broker): return "Functional Hosts %s" % \ - fmt_count(len(broker.virtual_host_items())) + fmt_count(len(broker.vhosts)) def get_items(self, session, broker): - return sorted_by(broker.virtual_host_items()) + return sorted_by(broker.vhosts) class BrokerConfigTab(ConfigPropertySet): def get_title(self, session, broker): @@ -558,8 +559,9 @@ names = self.names.get(session) addrs = self.addrs.get(session) groups = self.groups.get(session) - + for name, addr, group in zip(names, addrs, groups): - print name, addr, group + broker = mint.Broker() + broker.set( self.process_cancel(session, model) Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2007-11-16 22:53:35 UTC (rev 1331) +++ mgmt/cumin/python/cumin/model.py 2007-11-17 14:31:19 UTC (rev 1332) @@ -1,4 +1,4 @@ -from mint.schema import * +import mint.schema as mint from wooly import * from wooly.model import * @@ -47,23 +47,11 @@ self.link_cb = None self.highlow = False - def stats(self, object): - if isinstance(object, MintQueue): - stats = object.mintQueueStats - elif isinstance(object, MintExchange): - stats = object.mintExchangeStats - elif isinstance(object, MintClient): - stats = object.mintClientStats - else: - raise Exception() - - return stats - def value(self, object): - return getattr(self.stats(object), self.name) + return getattr(object.stats, self.name) def rate(self, object): - return getattr(self.stats(object), self.name) + return getattr(object.stats, self.name) def write_xml(self, object, writer): writer.write("<stat name=\"%s\" value=\"%i\" rate=\"%i\"/>" \ @@ -73,7 +61,7 @@ class CuminQueue(CuminClass): def __init__(self): - super(CuminQueue, self).__init__(MintQueue) + super(CuminQueue, self).__init__(mint.Queue) stat = CuminStat("consumers", "int") stat.title = "Consumers" @@ -436,6 +424,9 @@ def get_realm(self, id): return self.get_index(self.realm).get(id) + def brokers(self): + return list(mint.Broker.select()) + class DummyModelObject(ModelObject): def __init__(self, model, mclass): super(DummyModelObject, self).__init__(model, mclass) Modified: mgmt/cumin/python/cumin/page.py =================================================================== --- mgmt/cumin/python/cumin/page.py 2007-11-16 22:53:35 UTC (rev 1331) +++ mgmt/cumin/python/cumin/page.py 2007-11-17 14:31:19 UTC (rev 1332) @@ -183,7 +183,8 @@ class BrokerTab(BrokerBrowser): def get_title(self, session, model): - return "Brokers %s" % fmt_count(len(model.sys.brokers)) + print dir(model.sys) + return "Brokers %s" % fmt_count(len(model.brokers())) class BrokerProfileTab(BrokerProfileSet): def get_title(self, session, model): Modified: mgmt/cumin/python/cumin/parameters.py =================================================================== --- mgmt/cumin/python/cumin/parameters.py 2007-11-16 22:53:35 UTC (rev 1331) +++ mgmt/cumin/python/cumin/parameters.py 2007-11-17 14:31:19 UTC (rev 1332) @@ -17,7 +17,7 @@ class BrokerParameter(Parameter): def do_unmarshal(self, string): - return MintBroker.get(int(string)) + return Broker.get(int(string)) def do_marshal(self, broker): return str(broker.id) @@ -31,7 +31,7 @@ class ClientParameter(Parameter): def do_unmarshal(self, string): - return MintClient.get(int(string)) + return Client.get(int(string)) def do_marshal(self, client): return str(client.id) @@ -45,14 +45,14 @@ class ExchangeParameter(Parameter): def do_unmarshal(self, string): - return MintExchange.get(int(string)) + return Exchange.get(int(string)) def do_marshal(self, exchange): return str(exchange.id) class QueueParameter(Parameter): def do_unmarshal(self, string): - return MintQueue.get(int(string)) + return Queue.get(int(string)) def do_marshal(self, queue): return str(queue.id) Modified: mgmt/misc/mint-test.py =================================================================== --- mgmt/misc/mint-test.py 2007-11-16 22:53:35 UTC (rev 1331) +++ mgmt/misc/mint-test.py 2007-11-17 14:31:19 UTC (rev 1332) @@ -13,10 +13,10 @@ def getQueueByName(name, create=False): try: - queues = MintQueue.selectBy(name=name)[:1] + queues = Queue.selectBy(name=name)[:1] queue = queues[0] except IndexError: - if (create): queue = MintQueue() + if (create): queue = Queue() return queue def configCallback(broker, oid, list, timestamps):