From c0e1e9cf66dab2b22953e9076aaebb2caada1007 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Thu, 26 Apr 2012 17:36:34 +0200 Subject: [PATCH] Bugfix in AddSlicetoNodes. --- sfa/senslab/slabdriver.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index 740b996a..5742da81 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -674,9 +674,8 @@ class SlabDriver(Driver): except KeyError: #Running on default parameters #XP immediate , 10 mins - slot = {'date':None,'start_time':None, 'timezone':None,'duration':'00:10:00' }#10 min - reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20 - reqdict['script_path'] = "/bin/sleep 620" #+20 sec + slot = {'date':None,'start_time':None, 'timezone':None,'duration':None }#10 min + reqdict['property'] ="network_address in (" for node in added_nodes: @@ -721,7 +720,9 @@ class SlabDriver(Driver): reqdict['resource']+= ",walltime=" + str(walltime[0]) + ":" + str(walltime[1]) + ":" + str(walltime[2]) reqdict['script_path'] = "/bin/sleep " + str(sleep_walltime) - + else: + reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20 + reqdict['script_path'] = "/bin/sleep 620" #+20 sec #In case of a scheduled experiment (not immediate) #To run an XP immediately, don't specify date and time in RSpec #They will be set to None. -- 2.45.2