From e938e3eae8302678f15a3a6c8f6fb73e771f84e4 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 13 Dec 2012 16:39:33 +0100 Subject: [PATCH] Fixing bug in DeleteJobs. --- sfa/senslab/slabdriver.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index d9d69da1..fa64ab73 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -1292,8 +1292,8 @@ class SlabDriver(Driver): #Delete the jobs from job_senslab table def DeleteSliceFromNodes(self, slice_record): - - self.DeleteJobs(slice_record['oar_job_id'], slice_record['hrn']) + for job_id in slice_record['oar_job_id']: + self.DeleteJobs(job_id, slice_record['hrn']) return @@ -1814,10 +1814,11 @@ class SlabDriver(Driver): logger.warning("SLABDRIVER AddPersonKey EMPTY - DO NOTHING \r\n ") return - def DeleteLeases(self, leases_id_list, slice_hrn ): + def DeleteLeases(self, leases_id_list, slice_hrn ): + logger.debug("SLABDRIVER DeleteLeases leases_id_list %s slice_hrn %s \ + \r\n " %(leases_id_list, slice_hrn)) for job_id in leases_id_list: self.DeleteJobs(job_id, slice_hrn) - logger.debug("SLABDRIVER DeleteLeases leases_id_list %s slice_hrn %s \ - \r\n " %(leases_id_list, slice_hrn)) + return -- 2.47.0