Author: justi9 Date: 2007-11-29 12:20:49 -0500 (Thu, 29 Nov 2007) New Revision: 1397 Modified: mgmt/cumin/bin/cumin-test mgmt/cumin/python/cumin/__init__.py mgmt/cumin/python/cumin/demo.py mgmt/cumin/python/cumin/model.py mgmt/mint/python/mint/__init__.py Log: Updates demo data to use the new mint model objects. Modified: mgmt/cumin/bin/cumin-test =================================================================== --- mgmt/cumin/bin/cumin-test 2007-11-29 17:20:24 UTC (rev 1396) +++ mgmt/cumin/bin/cumin-test 2007-11-29 17:20:49 UTC (rev 1397) @@ -66,18 +66,13 @@ from cumin.demo import * from cumin.model import * -def do_main(port, broker, bench_hits, debug=True, demodata=True): +def do_main(port, broker, bench_hits, debug=True): model = DummyModel() app = Cumin(model) if broker: app.add_managed_broker(broker) - if demodata: - data = DemoData(model) - data.load() - data.start_updates() - if debug or bench_hits: app.enable_debug() @@ -94,7 +89,6 @@ in_profile = "profile" in args in_debug = "no-debug" not in args in_bench = "bench" in args and int(args.get("bench", None) or 1000) or 0 - in_demodata = "no-demo-data" not in args if in_profile: from profile import Profile @@ -104,7 +98,7 @@ try: statement = "do_main(%i, %i, %r, %r)" % \ - (in_port, in_bench, in_debug, in_demodata) + (in_port, in_bench, in_debug) prof.run(statement) @@ -127,7 +121,7 @@ stats.strip_dirs() else: try: - do_main(in_port, in_broker, in_bench, in_debug, in_demodata) + do_main(in_port, in_broker, in_bench, in_debug) except KeyboardInterrupt: pass Modified: mgmt/cumin/python/cumin/__init__.py =================================================================== --- mgmt/cumin/python/cumin/__init__.py 2007-11-29 17:20:24 UTC (rev 1396) +++ mgmt/cumin/python/cumin/__init__.py 2007-11-29 17:20:49 UTC (rev 1397) @@ -61,11 +61,6 @@ class CuminServer(WebServer): def __init__(self, port=9090): model = DummyModel() - - data = DemoData(model) - data.load() - data.start_updates() - app = Cumin(model) super(CuminServer, self).__init__(app, port) Modified: mgmt/cumin/python/cumin/demo.py =================================================================== --- mgmt/cumin/python/cumin/demo.py 2007-11-29 17:20:24 UTC (rev 1396) +++ mgmt/cumin/python/cumin/demo.py 2007-11-29 17:20:49 UTC (rev 1397) @@ -2,165 +2,65 @@ from threading import Thread from random import sample, random, randint -from model import * +#from model import * +from mint import * def fmt(str_, int_): return "%s%02i" % (str_, int_) class DemoData(object): - def __init__(self, model, mult=5): - self.model = model + def __init__(self, mult=5): self.mult = mult def load(self): - # XXX need some locking in here - - gtypes = dict() groups = dict() - for name in ("Geography", "Department"): - sgtype = BrokerGroupType(self.model) - sgtype.name = name - gtypes[name] = sgtype - - for name in ("West Coast", "East Coast"): - group = BrokerGroup(self.model) + for name in ("West Coast", "East Coast", "Marketing", "Sales"): + group = BrokerGroup() group.name = name - group.set_type(gtypes["Geography"]) groups[name] = group - for name in ("Marketing", "Sales"): - group = BrokerGroup(self.model) - group.name = name - group.set_type(gtypes["Department"]) - groups[name] = group - profiles = list() for name in ("4S Xserve", "2S ProLiant"): - profile = BrokerProfile(self.model) + profile = BrokerProfile() profile.name = name profiles.append(profile) - self.load_props(profile) + #self.load_props(profile) - # vhost templates - for name in ("test", "devel"): - vhost = VirtualHost(self.model) - vhost.name = name - - self.load_vhost(vhost) - clusters = list() for cluster_count in range(3): - cluster = BrokerCluster(self.model) + cluster = BrokerCluster() cluster.name = fmt("cluster", cluster_count) clusters.append(cluster) - vhost = VirtualHost(self.model) - vhost.name = "default" - vhost.set_broker_cluster(cluster) - - for name in ("test", "devel"): - vhost = VirtualHost(self.model) - vhost.name = name - vhost.set_broker_cluster(cluster) - - self.load_vhost(vhost) - - for broker_count in range(12): - broker = Broker(self.model) - broker.name = fmt("broker", broker_count) - - self.load_props(broker) - - index = broker_count % 4 - if index < 3: - broker.set_broker_cluster(clusters[index]) - - index = broker_count % 3 - if index < 2: - broker.set_broker_profile(profiles[index]) - - if broker_count % 2: - groups["East Coast"].add_broker(broker) - else: - groups["West Coast"].add_broker(broker) - - if broker_count % 4 < 2: - groups["Marketing"].add_broker(broker) - else: - groups["Sales"].add_broker(broker) - - vhost = VirtualHost(self.model) - vhost.name = "default" - vhost.set_broker(broker) - broker.default_virtual_host = vhost - - for name in ("test", "devel"): - vhost = VirtualHost(self.model) - vhost.name = name - vhost.set_broker(broker) - - for vhost in broker.virtual_host_items(): - self.load_vhost(vhost) - def load_props(self, obj): - prop = ConfigProperty(self.model) + prop = ConfigProperty() prop.name = "max_threads" prop.value = 1000 prop.broker_value = 1000 prop.type = "integer" obj.add_config_property(prop) - prop = ConfigProperty(self.model) + prop = ConfigProperty() prop.name = "max_memory" prop.value = 1000000 prop.broker_value = 2000000 prop.type = "integer" obj.add_config_property(prop) - prop = ConfigProperty(self.model) + prop = ConfigProperty() prop.name = "ssl_enabled" prop.value = True prop.broker_value = True prop.type = "boolean" obj.add_config_property(prop) - def load_vhost(self, vhost): - for name in ("amq.direct", "amq.fanout", - "amq.topic", "amq.match"): - exchange = Exchange(self.model) - exchange.name = name - vhost.add_exchange(exchange) - - for producer_count in range(self.mult): - producer = Producer(self.model) - producer.name = fmt("producer", producer_count) - exchange.add_producer(producer) - - for queue_count in range(self.mult): - queue = Queue(self.model) - queue.name = fmt("queue", queue_count) - vhost.add_queue(queue) - - for consumer_count in range(self.mult): - consumer = Consumer(self.model) - consumer.name = fmt("consumer", consumer_count) - queue.add_consumer(consumer) - - for num in range(100, 100 + self.mult * 10, 10): - client = Client(self.model) - client.address = "192.168.0.%i:16565" % num - vhost.add_client(client) - - for session_count in range(self.mult): - session = Session(self.model) - session.name = fmt("session", session_count) - client.add_session(session) - def start_updates(self): + raise Exception() + thread = UpdateThread(self.model) thread.start() @@ -239,15 +139,21 @@ if __name__ == "__main__": import sys - - model = DummyModel() - data = DemoData(model) + try: + connuri = sys.argv[1] + conn = connectionForURI(connuri) + sqlhub.processConnection = conn + except IndexError: + print "Usage: demo.py DATABASE-URI" + sys.exit(1) + + data = DemoData() data.load() - sys.stdout.write("<?xml version=\"1.0\"?><model>") + #sys.stdout.write("<?xml version=\"1.0\"?><model>") - for broker in model.get_brokers(): - broker.write_xml(sys.stdout) + #for broker in model.get_brokers(): + # broker.write_xml(sys.stdout) - sys.stdout.write("</model>") + #sys.stdout.write("</model>") Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2007-11-29 17:20:24 UTC (rev 1396) +++ mgmt/cumin/python/cumin/model.py 2007-11-29 17:20:49 UTC (rev 1397) @@ -523,12 +523,6 @@ for measure in self.measurements: measure.write_xml(writer) -class BrokerCluster(DummyModelObject): - def __init__(self, model): - super(BrokerCluster, self).__init__(model, model.broker_cluster) - - self.name = None - class Broker(DummyModelObject): def __init__(self, model): super(Broker, self).__init__(model, model.broker) Modified: mgmt/mint/python/mint/__init__.py =================================================================== --- mgmt/mint/python/mint/__init__.py 2007-11-29 17:20:24 UTC (rev 1396) +++ mgmt/mint/python/mint/__init__.py 2007-11-29 17:20:49 UTC (rev 1397) @@ -16,30 +16,30 @@ pass class BrokerRegistration(SQLObject): - name = StringCol(length=1000) - host = StringCol(length=1000) - port = SmallIntCol() + name = StringCol(length=1000, default=None) + host = StringCol(length=1000, default=None) + port = SmallIntCol(default=None) broker = ForeignKey("Broker", cascade="null", default=None) class BrokerGroup(SQLObject): - name = StringCol(length=1000) + name = StringCol(length=1000, default=None) BrokerGroup.sqlmeta.addJoin(MultipleJoin("Broker", joinMethodName="brokers")) class BrokerCluster(SQLObject): - name = StringCol(length=1000) + name = StringCol(length=1000, default=None) BrokerCluster.sqlmeta.addJoin(MultipleJoin("Broker", joinMethodName="brokers")) class BrokerProfile(SQLObject): - name = StringCol(length=1000) + name = StringCol(length=1000, default=None) BrokerProfile.sqlmeta.addJoin(MultipleJoin("Broker", joinMethodName="brokers")) class ConfigProperty(SQLObject): - name = StringCol(length=1000) - value = StringCol(length=1000) - type = StringCol(length=1) + name = StringCol(length=1000, default=None) + value = StringCol(length=1000, default=None) + type = StringCol(length=1, default="s") class OriginalIdDict: def __init__(self):