From 8a0f19bbbe07c95a87233d7b2f66be4ebabae305 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 4 Jun 2013 15:32:39 +0200 Subject: [PATCH] Fixing the delete slice and lease feature. --- sfa/senslab/slabapi.py | 4 ++-- sfa/senslab/slabdriver.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sfa/senslab/slabapi.py b/sfa/senslab/slabapi.py index ca1aa3b9..d0285419 100644 --- a/sfa/senslab/slabapi.py +++ b/sfa/senslab/slabapi.py @@ -1232,8 +1232,8 @@ class SlabTestbedAPI(): #Now we have the slice record fixed_slicerec_dict, get the #jobs associated to this slice leases_list = [] - if login is not None: - leases_list = self.GetLeases(login = login) + + leases_list = self.GetLeases(login = login) #If no job is running or no job scheduled #return only the slice record if leases_list == [] and fixed_slicerec_dict: diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index 11d0ca17..8ab31d76 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -366,7 +366,7 @@ class SlabDriver(Driver): #the lease to the requested leases list duration_in_seconds = \ int(single_requested_lease['duration'])*60 - if duration_in_seconds > GetMinExperimentDurationInSec() : + if duration_in_seconds > self.slab_api.GetMinExperimentDurationInSec() : requested_lease_list.append(single_requested_lease) return requested_lease_list -- 2.47.0