Fixing the delete slice and lease feature.

diff --git a/sfa/senslab/slabapi.py b/sfa/senslab/slabapi.py
index ca1aa3b..d028541 100644 (file)
--- 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 11d0ca1..8ab31d7 100644 (file)
--- 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