Added site in Slab RSpec format, for easier filtering

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

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index 41ba8c3..a8b6cd1 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -8,7 +8,6 @@ from sfa.util.sfalogging import logger
 from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord, RegUser, RegSlice
 from sqlalchemy.orm import joinedload
-from sfa.trust.credential import Credential
 
 
 from sfa.managers.driver import Driver
@@ -241,11 +240,14 @@ class SlabDriver(Driver):
                     single_requested_lease['start_time'] = \
                                                         lease.get('start_time')
                     single_requested_lease['duration'] = lease.get('duration')
-
-                    requested_lease_list.append(single_requested_lease)
-                
-        logger.debug("SLABDRIVER.PY \tcreate_sliver APRESLEASE" )       
-        #dCreate dict of leases by start_time, regrouping nodes reserved
+                    #Check the experiment's duration is valid before adding
+                    #the lease to the requested leases list
+                    duration_in_seconds = \
+                            int(single_requested_lease['duration'])*60
+                    if duration_in_seconds > self.GetLeaseGranularity():
+                        requested_lease_list.append(single_requested_lease)
+                     
+        #Create dict of leases by start_time, regrouping nodes reserved
         #at the same
         #time, for the same amount of time = one job on OAR
         requested_job_dict = {}
@@ -1314,9 +1316,10 @@ class SlabDriver(Driver):
     def GetLeaseGranularity(self):
         """ Returns the granularity of Senslab testbed.
         OAR returns seconds for experiments duration.
-        Defined in seconds. """
+        Defined in seconds. 
+        Experiments which last less than 10 min are invalid"""
         
-        grain = 60 
+        grain = 600 
         return grain
     
     def update_jobs_in_slabdb(self, job_oar_list, jobs_psql):