[rhmessaging-commits] rhmessaging commits: r2437 - in mgmt/trunk/mint: sql and 1 other directory.

Author: justi9 Date: 2008-09-10 14:20:45 -0400 (Wed, 10 Sep 2008) New Revision: 2437 Modified: mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/sql/schema.sql Log: Update to newest schema Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2008-09-09 21:44:48 UTC (rev 2436) +++ mgmt/trunk/mint/python/mint/schema.py 2008-09-10 18:20:45 UTC (rev 2437) @@ -784,6 +784,7 @@ statsCurr = ForeignKey('JobStats', cascade='null', default=None) statsPrev = ForeignKey('JobStats', cascade='null', default=None) classInfos = dict() # brokerId => classInfo + scheduler = ForeignKey('Scheduler', cascade='null', default=None) AccountingGroup = StringCol(length=1000, default=None) Args = StringCol(length=4000, default=None) ClusterId = IntCol(default=None) @@ -816,6 +817,33 @@ conn.callMethod(originalId, classInfo, "GetAd", callback, args=actualArgs) + def Hold(self, model, callback, Reason): + actualArgs = dict() + actualArgs["Reason"] = Reason + conn = model.connections[self.managedBroker] + classInfo = self.classInfos[self.managedBroker] + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "Hold", + callback, args=actualArgs) + + def Release(self, model, callback, Reason): + actualArgs = dict() + actualArgs["Reason"] = Reason + conn = model.connections[self.managedBroker] + classInfo = self.classInfos[self.managedBroker] + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "Release", + callback, args=actualArgs) + + def Remove(self, model, callback, Reason): + actualArgs = dict() + actualArgs["Reason"] = Reason + conn = model.connections[self.managedBroker] + classInfo = self.classInfos[self.managedBroker] + originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) + conn.callMethod(originalId, classInfo, "Remove", + callback, args=actualArgs) + class JobStats(SQLObject): class sqlmeta: lazyUpdate = True @@ -1027,6 +1055,9 @@ classToSchemaNameMap['Job'] = 'Job' schemaNameToClassMap['Job'] = Job +Scheduler.sqlmeta.addJoin(SQLMultipleJoin('Job', joinMethodName='jobs')) + + Job.sqlmeta.addJoin(SQLMultipleJoin('JobStats', joinMethodName='stats')) classToSchemaNameMap['Scheduler'] = 'Scheduler' Modified: mgmt/trunk/mint/sql/schema.sql =================================================================== --- mgmt/trunk/mint/sql/schema.sql 2008-09-09 21:44:48 UTC (rev 2436) +++ mgmt/trunk/mint/sql/schema.sql 2008-09-10 18:20:45 UTC (rev 2437) @@ -243,6 +243,7 @@ managed_broker VARCHAR(1000), stats_curr_id INT, stats_prev_id INT, + scheduler_id INT, accounting_group VARCHAR(1000), args VARCHAR(4000), cluster_id INT, @@ -763,6 +764,8 @@ ALTER TABLE job ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES job_stats (id) ON DELETE SET NULL; +ALTER TABLE job ADD CONSTRAINT scheduler_id_exists FOREIGN KEY (scheduler_id) REFERENCES scheduler (id) ON DELETE SET NULL; + ALTER TABLE job_stats ADD CONSTRAINT job_id_exists FOREIGN KEY (job_id) REFERENCES job (id) ON DELETE SET NULL; ALTER TABLE journal ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES journal_stats (id) ON DELETE SET NULL;