From: fsaintma <frederic.saint-marcel@inria.fr>
Date: Thu, 11 Jun 2015 07:24:10 +0000 (+0200)
Subject: fix ASAP jobs with state != Waiting,Running
X-Git-Tag: sfa-3.1-21~46
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=468d984409e02e84d15eb35d3eb464f6a3059dd8

fix ASAP jobs with state != Waiting,Running
---

diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py
index becdbf50..c51a7d64 100644
--- a/sfa/iotlab/iotlabshell.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -109,7 +109,7 @@ class IotLABShell(object):
 
     def get_reserved_nodes(self):
         """
-        Get all OAR jobs with state Waiting or Running.
+        Get all OAR jobs not terminated.
 
         :Example:
         {"total":"1907",
@@ -128,7 +128,9 @@ class IotLABShell(object):
         """
         logger.warning("iotlashell get_reserved_nodes")
         reserved_nodes_dict = {}
-        request = 'admin/experiments?state=Running,Waiting'
+        request = ('admin/experiments?state='
+                   'Running,Waiting,toAckReservation,'
+                   'toLaunch,Launching')
         try:
             experiments = self.api.method(request)
         except HTTPError as err: