Fixing sfi.py slices : must print all the slices in the testbedd.

diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index 1d0a141..337f888 100644 (file)
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -338,8 +338,9 @@ class SlabAggregate:
             lease_option = options['list_leases']
         except KeyError:
             #If no options are specified, at least print the resources
-            if slice_xrn :
-                lease_option = 'all'
+            lease_option = 'all'
+           #if slice_xrn :
+               #lease_option = 'all'
             pass 
         
         if lease_option in ['all', 'resources']:

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index ca9b27a..1521668 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -891,15 +891,15 @@ class SlabDriver(Driver):
                         slicerec_dict.update({'hrn':\
                                     str(fixed_slicerec_dict['slice_hrn'])})
                         slicerec_dictlist.append(slicerec_dict)
-            
+                        fixed_slicerec_dict.update(slicerec_dict)
             logger.debug("SLABDRIVER.PY  \tGetSlices RETURN slices %s \
                         slice_filter %s " %(return_slice_list, slice_filter))
         
         #if return_fields_list:
             #return_slice_list  = parse_filter(sliceslist, \
                                 #slice_filter,'slice', return_fields_list)
-
-        return slicerec_dictlist
+        return return_slice_list
+        #return slicerec_dictlist
         
     
     def testbed_name (self): return self.hrn