From da2fe4312309e507c295409557f41ab9d4a86d37 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 13 Nov 2012 12:20:05 +0100 Subject: [PATCH 1/1] Fixing sfi.py slices : must print all the slices in the testbedd. --- sfa/senslab/slabaggregate.py | 5 +++-- sfa/senslab/slabdriver.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py index 1d0a141a..337f8889 100644 --- 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 ca9b27a9..1521668c 100644 --- 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 -- 2.43.0