From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 23 Jul 2012 12:49:28 +0000 (+0200)
Subject: Corrected bug in GetSlices. Now returns a list of dict of slice records
X-Git-Tag: sfa-2.1-24~3^2~113
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=178d5aaf7d9fc379c7355905b097ebccea28325c;hp=1ff877476be9e4a7e4a00e78648b189ec7d932b3;p=sfa.git

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).
---

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))