[rhmessaging-commits] rhmessaging commits: r2512 - in mgmt/trunk: mint/python/mint and 1 other directories.

Author: justi9 Date: 2008-09-21 14:21:58 -0400 (Sun, 21 Sep 2008) New Revision: 2512 Modified: mgmt/trunk/cumin/python/cumin/demo.py mgmt/trunk/cumin/python/cumin/model.py mgmt/trunk/cumin/python/cumin/parameters.py mgmt/trunk/cumin/python/cumin/pool.py mgmt/trunk/cumin/python/cumin/pool.strings mgmt/trunk/mint/python/mint/__init__.py mgmt/trunk/mint/sql/schema.sql Log: Rename Pool to CollectorRegistration (on the mint side), and add a collector ID property to it Modified: mgmt/trunk/cumin/python/cumin/demo.py =================================================================== --- mgmt/trunk/cumin/python/cumin/demo.py 2008-09-21 17:35:33 UTC (rev 2511) +++ mgmt/trunk/cumin/python/cumin/demo.py 2008-09-21 18:21:58 UTC (rev 2512) @@ -19,7 +19,7 @@ group = BrokerGroup(name=name) groups[name] = group - Pool(name="main") + CollectorRegistration(name="main", collectorId="") #profiles = list() Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-09-21 17:35:33 UTC (rev 2511) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-09-21 18:21:58 UTC (rev 2512) @@ -1467,11 +1467,24 @@ class CuminPool(CuminClass): def __init__(self, model): - super(CuminPool, self).__init__(model, "pool", Pool) + super(CuminPool, self).__init__ \ + (model, "collector_registration", CollectorRegistration) + prop = CuminProperty(self, "collectorId") + prop.title = "Collector ID" + prop.summary = True + def get_title(self, session): return "Pool" + def get_object_title(self, session, pool): + if pool.name == "main": + title = "Main Pool" + else: + title = super(CuminPool, self).get_object_title(session, pool) + + return title + def show_object(self, session, pool): return self.cumin_model.show_main(session).show_pool(session, pool) Modified: mgmt/trunk/cumin/python/cumin/parameters.py =================================================================== --- mgmt/trunk/cumin/python/cumin/parameters.py 2008-09-21 17:35:33 UTC (rev 2511) +++ mgmt/trunk/cumin/python/cumin/parameters.py 2008-09-21 18:21:58 UTC (rev 2512) @@ -95,7 +95,7 @@ class PoolParameter(Parameter): def do_unmarshal(self, string): - return Pool.get(int(string)) + return CollectorRegistration.get(int(string)) def do_marshal(self, pool): return str(pool.id) Modified: mgmt/trunk/cumin/python/cumin/pool.py =================================================================== --- mgmt/trunk/cumin/python/cumin/pool.py 2008-09-21 17:35:33 UTC (rev 2511) +++ mgmt/trunk/cumin/python/cumin/pool.py 2008-09-21 18:21:58 UTC (rev 2512) @@ -29,7 +29,7 @@ self.set_default_column(col) def render_title(self, session): - return "Pools %s" % fmt_count(Pool.select().count()) + return "Pools %s" % fmt_count(CollectorRegistration.select().count()) class NameColumn(SqlTableColumn): def render_title(self, session, data): Modified: mgmt/trunk/cumin/python/cumin/pool.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/pool.strings 2008-09-21 17:35:33 UTC (rev 2511) +++ mgmt/trunk/cumin/python/cumin/pool.strings 2008-09-21 18:21:58 UTC (rev 2512) @@ -1,8 +1,8 @@ [PoolSet.sql] select - p.id, - p.name -from pool as p + r.id, + r.name +from collector_registration as r [PoolSet.count_sql] -select count(*) from pool +select count(*) from collector_registration Modified: mgmt/trunk/mint/python/mint/__init__.py =================================================================== --- mgmt/trunk/mint/python/mint/__init__.py 2008-09-21 17:35:33 UTC (rev 2511) +++ mgmt/trunk/mint/python/mint/__init__.py 2008-09-21 18:21:58 UTC (rev 2512) @@ -110,11 +110,12 @@ value = StringCol(length=1000, default=None) type = StringCol(length=1, default="s") -class Pool(SQLObject): +class CollectorRegistration(SQLObject): class sqlmeta: lazyUpdate = True name = StringCol(length=1000, default=None) + collectorId = StringCol(length=1000, default=None) class Subject(SQLObject): class sqlmeta: Modified: mgmt/trunk/mint/sql/schema.sql =================================================================== --- mgmt/trunk/mint/sql/schema.sql 2008-09-21 17:35:33 UTC (rev 2511) +++ mgmt/trunk/mint/sql/schema.sql 2008-09-21 18:21:58 UTC (rev 2512) @@ -31,6 +31,12 @@ ); CREATE UNIQUE INDEX broker_registration_host_port_unique ON broker_registration (host, port); +CREATE TABLE collector_registration ( + id SERIAL PRIMARY KEY, + name VARCHAR(1000), + collector_id VARCHAR(1000) +); + CREATE TABLE config_property ( id SERIAL PRIMARY KEY, name VARCHAR(1000), @@ -43,11 +49,6 @@ version VARCHAR(1000) NOT NULL ); -CREATE TABLE pool ( - id SERIAL PRIMARY KEY, - name VARCHAR(1000) -); - CREATE TABLE role ( id SERIAL PRIMARY KEY, name VARCHAR(1000) NOT NULL UNIQUE