From 178d5aaf7d9fc379c7355905b097ebccea28325c Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 23 Jul 2012 14:49:28 +0200 Subject: [PATCH 1/1] Corrected bug in GetSlices. Now returns a list of dict of slice records if no slice filter is provided (instead of a list of SQLAlchmey objects). --- sfa/senslab/slabdriver.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index 555cd0f0..84e2a7e4 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -289,8 +289,9 @@ class SlabDriver(Driver): #return slices # get data from db - logger.debug("SLABDRIVER.PY \tlist_slices") - slices = self.GetSlices() + + slices = self.GetSlices() + logger.debug("SLABDRIVER.PY \tlist_slices %s" %(slices)) slice_hrns = [slicename_to_hrn(self.hrn, slab_slice['slice_hrn']) \ for slab_slice in slices] slice_urns = [hrn_to_urn(slice_hrn, 'slice') \ @@ -795,8 +796,11 @@ class SlabDriver(Driver): else: - return_slice_list = slab_dbsession.query(SliceSenslab).all() - + slice_list = slab_dbsession.query(SliceSenslab).all() + return_slice_list = [] + for record in slice_list: + return_slice_list.append(record.dump_sqlalchemyobj_to_dict()) + logger.debug("SLABDRIVER.PY \tGetSlices slices %s \ slice_filter %s " %(return_slice_list, slice_filter)) -- 2.43.0