From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 26 Jul 2013 10:12:56 +0000 (+0200)
Subject: fixing getslices (sfi show node_ids was empty when done on a slice)
X-Git-Tag: sfa-2.1-27~43
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a087abe1800b3e9dbcd4cc470f25d8b90885d930;p=sfa.git

fixing getslices (sfi show node_ids was empty when done on a slice)
and fixing create lease broken return Rspec.
---

diff --git a/sfa/iotlab/iotlabaggregate.py b/sfa/iotlab/iotlabaggregate.py
index 77859e59..cffc1eff 100644
--- a/sfa/iotlab/iotlabaggregate.py
+++ b/sfa/iotlab/iotlabaggregate.py
@@ -172,6 +172,7 @@ class IotlabAggregate:
         # are part of this slice
         # but what is the role of the slivers parameter ?
         # So i assume that slice['node_ids'] will be the same as slivers for us
+        slice_nodes_list = []
         if slices is not None:
             for one_slice in slices:
                 try:
@@ -194,7 +195,7 @@ class IotlabAggregate:
         # Make a list of all the nodes in the slice before getting their
         #attributes
         rspec_nodes = []
-        slice_nodes_list = []
+
         logger.debug("IOTLABAGGREGATE api get_nodes slice_nodes_list  %s "
                      % (slices))
 
@@ -423,4 +424,6 @@ class IotlabAggregate:
         if lease_option in ['all','leases']:
             leases = self.get_all_leases()
             rspec.version.add_leases(leases)
+            logger.debug("IotlabAggregate \tget_rspec **** \
+                       FINAL RSPEC %s \r\n" % (rspec.toxml()))
         return rspec.toxml()
diff --git a/sfa/iotlab/iotlabapi.py b/sfa/iotlab/iotlabapi.py
index cbf7b680..74e44dc1 100644
--- a/sfa/iotlab/iotlabapi.py
+++ b/sfa/iotlab/iotlabapi.py
@@ -1306,6 +1306,14 @@ class IotlabTestbedAPI():
                         \t lease['slice_hrn'] %s"
                              % (slice_filter, lease['slice_hrn']))
                 if lease['slice_hrn'] == slice_hrn:
+                    #Update lease dict with the slice record
+                    if fixed_slicerec_dict:
+                        fixed_slicerec_dict['oar_job_id'] = []
+                        fixed_slicerec_dict['oar_job_id'].append(
+                            slicerec_dict['oar_job_id'])
+                        slicerec_dict.update(fixed_slicerec_dict)
+                        #slicerec_dict.update({'hrn':\
+                                        #str(fixed_slicerec_dict['slice_hrn'])})
                     slicerec_dict['slice_hrn'] = lease['slice_hrn']
                     slicerec_dict['hrn'] = lease['slice_hrn']
                     slicerec_dict['user'] = lease['user']
@@ -1315,14 +1323,7 @@ class IotlabTestbedAPI():
                         {'hostname': lease['reserved_nodes']}})
                     slicerec_dict.update({'node_ids': lease['reserved_nodes']})
 
-                    #Update lease dict with the slice record
-                    if fixed_slicerec_dict:
-                        fixed_slicerec_dict['oar_job_id'] = []
-                        fixed_slicerec_dict['oar_job_id'].append(
-                            slicerec_dict['oar_job_id'])
-                        slicerec_dict.update(fixed_slicerec_dict)
-                        #slicerec_dict.update({'hrn':\
-                                        #str(fixed_slicerec_dict['slice_hrn'])})
+
 
                     return_slicerec_dictlist.append(slicerec_dict)
                     logger.debug("IOTLABDRIVER.PY  \tGetSlices  \