Fixing the delete slice and lease feature.

[sfa.git] / sfa / senslab / slabdriver.py

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index 20270f7..8ab31d7 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -366,10 +366,10 @@ class SlabDriver(Driver):
                     #the lease to the requested leases list
                     duration_in_seconds = \
                             int(single_requested_lease['duration'])*60
-                    if duration_in_seconds > self.slab_api.GetLeaseGranularity():
+                    if duration_in_seconds > self.slab_api.GetMinExperimentDurationInSec() :
                         requested_lease_list.append(single_requested_lease)
                         
-                    return requested_lease_list
+        return requested_lease_list
                         
     @staticmethod                    
     def _group_leases_by_start_time(requested_lease_list):
@@ -394,8 +394,8 @@ class SlabDriver(Driver):
                 
             if lease['start_time'] not in requested_job_dict:
                 if isinstance(lease['hostname'], str):
-                    #lease['hostname'] = [lease['hostname']]
-                    lease['hostname'] =  list(lease['hostname'])
+                    lease['hostname'] = [lease['hostname']]
+
                     
                 requested_job_dict[lease['start_time']] = lease
                 
@@ -416,7 +416,11 @@ class SlabDriver(Driver):
         :rtype: dictionary 
         """
         requested_lease_list = self._get_requested_leases_list(rspec)
+        logger.debug("SLABDRIVER _process_requested_jobs requested_lease_list \
+        %s"%(requested_lease_list))
         job_dict =  self._group_leases_by_start_time(requested_lease_list) 
+        logger.debug("SLABDRIVER _process_requested_jobs  job_dict\
+        %s"%(job_dict))
         
         return job_dict