From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 5 Jun 2013 13:07:23 +0000 (+0200)
Subject: Fix duration in seconds and sliver_status.
X-Git-Tag: sfa-2.1-26~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=847b9028f3a27657da85590d27cd6185a063c098;p=sfa.git

Fix duration in seconds and sliver_status.
---

diff --git a/sfa/senslab/slabapi.py b/sfa/senslab/slabapi.py
index 5f11006b..839a4278 100644
--- a/sfa/senslab/slabapi.py
+++ b/sfa/senslab/slabapi.py
@@ -611,9 +611,11 @@ class SlabTestbedAPI():
             #  additional delay for /bin/sleep command to
             # take in account  prologue and epilogue scripts execution
             # int walltimeAdditionalDelay = 240;  additional delay
+            #for prologue/epilogue execution = $SERVER_PROLOGUE_EPILOGUE_TIMEOUT 
+            #in oar.conf
             # Put the duration in seconds first
-            desired_walltime = duration * 60
-            
+            #desired_walltime = duration * 60
+            desired_walltime = duration
             total_walltime = desired_walltime + 240 #+4 min Update SA 23/10/12
             sleep_walltime = desired_walltime  # 0 sec added Update SA 23/10/12
             walltime = []
diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index 8ab31d76..776eb863 100644
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -218,9 +218,9 @@ class SlabDriver(Driver):
         #for single_slice in slice_list:
             #for node in single_slice['node_ids']:
                 #slice_nodes_list.append(node['hostname'])
-        for node in one_slice:
-            slice_nodes_list.append(node['hostname'])
-            
+        #for node in one_slice:
+            #slice_nodes_list.append(node['hostname'])
+        slice_nodes_list = one_slice['list_node_ids']['hostname']   
         #Get all the corresponding nodes details    
         nodes_all = self.slab_api.GetNodes({'hostname':slice_nodes_list},
                                 ['node_id', 'hostname','site','boot_state'])
@@ -365,7 +365,7 @@ class SlabDriver(Driver):
                     #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
+                            int(single_requested_lease['duration'])
                     if duration_in_seconds > self.slab_api.GetMinExperimentDurationInSec() :
                         requested_lease_list.append(single_requested_lease)