Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

diff --git a/sfa/iotlab/iotlabaggregate.py b/sfa/iotlab/iotlabaggregate.py
index ee95299..a0edf3a 100644 (file)
--- a/sfa/iotlab/iotlabaggregate.py
+++ b/sfa/iotlab/iotlabaggregate.py
@@ -59,6 +59,7 @@ class IotLABAggregate(object):
         # rspec_node['boot_state'] = 'true'
         if node['state'] == 'Absent' or \
            node['state'] == 'Suspected' or \
+           node['state'] == 'Dead' or \
            node['state'] == 'Busy':
             rspec_node['available'] = 'false'
         else:

diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py
index c51a7d6..363e4b5 100644 (file)
--- a/sfa/iotlab/iotlabshell.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -138,11 +138,6 @@ class IotLABShell(object):
                            err.reason)
             return {'error': err.reason}
         for exp in experiments['items']:
-            # BUG IN OAR REST API : job with reservation didn't return
-            # resources attribute list. We use another request for
-            # finding job resources
-            exp_nodes = self.api.method('admin/experiments/%d' % exp['id'])
-            exp['resources'] = exp_nodes['nodes']
             # BUG ASAP jobs without date information
             if exp['date'] == "as soon as possible":
                 exp['date'] = 0