iotlab driver: wip fixing Timur's bug when a user already has an account in LDAP...

[sfa.git] / sfa / iotlab / iotlabshell.py

diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py
index 25aba10..830da14 100644 (file)
--- a/sfa/iotlab/iotlabshell.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -69,8 +69,8 @@ class IotlabShell():
         :rtype: list of dicts
 
         """
-        logger.debug("IOTLAB_API \tGetPersons person_filter %s"
-                     % (person_filter))
+        logger.debug("IOTLAB_API \tGetPersons 1st person_filter %s"
+                     % (person_filter[0]['hrn']))
         person_list = []
         if person_filter and isinstance(person_filter, list):
         #If we are looking for a list of users (list of dict records)
@@ -498,7 +498,9 @@ class IotlabShell():
             # Put the duration in seconds first
             #desired_walltime = duration * 60
             desired_walltime = duration
-            total_walltime = desired_walltime + 240 #+4 min Update SA 23/10/12
+            # JORDAN : removed the 4 minutes added by default in iotlab
+            # XXX total_walltime = desired_walltime + 240 #+4 min Update SA 23/10/12
+            total_walltime = desired_walltime # Needed to have slots aligned in MySlice (temp fix) # JA 11/07/2014
             sleep_walltime = desired_walltime  # 0 sec added Update SA 23/10/12
             walltime = []
             #Put the walltime back in str form