From: Sandrine Avakian Date: Thu, 11 Jul 2013 13:59:21 +0000 (+0200) Subject: Moving update_jobs_in_iotlabdb in iotlabpostgres.py X-Git-Tag: sfa-2.1-27~48 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8e49f369f149c37f76fef3374c3eae98003f05dc;p=sfa.git Moving update_jobs_in_iotlabdb in iotlabpostgres.py --- diff --git a/sfa/iotlab/iotlabapi.py b/sfa/iotlab/iotlabapi.py index 2732dfc2..6a1e5c3f 100644 --- a/sfa/iotlab/iotlabapi.py +++ b/sfa/iotlab/iotlabapi.py @@ -937,7 +937,7 @@ class IotlabTestbedAPI(): reservation_list = unfiltered_reservation_list - self.update_jobs_in_iotlabdb(job_oar_list, jobs_psql_id_list) + self.iotlab_db.update_jobs_in_iotlabdb(job_oar_list, jobs_psql_id_list) logger.debug(" IOTLABDRIVER.PY \tGetLeases reservation_list %s"\ %(reservation_list)) diff --git a/sfa/iotlab/iotlabpostgres.py b/sfa/iotlab/iotlabpostgres.py index 1e6139da..78f4b210 100644 --- a/sfa/iotlab/iotlabpostgres.py +++ b/sfa/iotlab/iotlabpostgres.py @@ -158,7 +158,7 @@ class IotlabDB(object): self.iotlab_session.close() self.iotlab_session = None - def update_jobs_in_iotlabdb( job_oar_list, jobs_psql): + def update_jobs_in_iotlabdb(self, job_oar_list, jobs_psql): """ Cleans the iotlab db by deleting expired and cancelled jobs. Compares the list of job ids given by OAR with the job ids that are already in the database, deletes the jobs that are no longer in