Author: eallen Date: 2010-07-29 15:30:14 -0400 (Thu, 29 Jul 2010) New Revision: 4170 Modified: mgmt/newdata/cumin/python/cumin/grid/job.py Log: Used the new JobServer -> Scheduler linkage Modified: mgmt/newdata/cumin/python/cumin/grid/job.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-29 19:28:04 UTC (rev 4169) +++ mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-29 19:30:14 UTC (rev 4170) @@ -67,11 +67,8 @@ def get_scheduler(self, session, id): job_server = self.get_job_server(session, id) - pool = job_server.Pool - machine = job_server.Machine - cls = self.app.model.com_redhat_grid.Scheduler - return cls.get_object(session.cursor, Pool=pool, Machine=machine) + return cls.get_object(session.cursor, _id=job_server._schedulerRef_id) def get_href(self, session, id, job_id): branch = session.branch() @@ -286,11 +283,8 @@ cls = self.app.model.com_redhat_grid.JobServer job_server = cls.get_object(session.cursor, _id=submission._jobserverRef_id) - pool = job_server.Pool - machine = job_server.Machine - cls = self.app.model.com_redhat_grid.Scheduler - return cls.get_object(session.cursor, Pool=pool, Machine=machine) + return cls.get_object(session.cursor, _id=job_server._schedulerRef_id) class JobAdsSet(PropertySet): types = {0: "expression",