From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Tue, 17 May 2011 13:12:45 +0000 (+0200)
Subject: get methods of proxies should pickle data, they need to preserve the data types.
X-Git-Tag: nepi_v2~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=177b82b6a6d371c30f0dcc2b27404efaf9e4a0ec;p=nepi.git

get methods of proxies should pickle data, they need to preserve the data types.
---

diff --git a/src/nepi/util/proxy.py b/src/nepi/util/proxy.py
index db5ce058..90aa4857 100644
--- a/src/nepi/util/proxy.py
+++ b/src/nepi/util/proxy.py
@@ -596,9 +596,9 @@ class TestbedControllerServer(BaseServer):
 
     @Marshalling.handles(GET)
     @Marshalling.args(int, Marshalling.base64_data, str)
-    @Marshalling.retval()
+    @Marshalling.retval( Marshalling.pickled_data )
     def get(self, guid, name, time):
-        return str(self._testbed.get(guid, name, time))
+        return self._testbed.get(guid, name, time)
 
     @Marshalling.handles(SET)
     @Marshalling.args(int, Marshalling.base64_data, Marshalling.pickled_data, str)
@@ -667,9 +667,9 @@ class ExperimentControllerServer(BaseServer):
 
     @Marshalling.handles(EXPERIMENT_GET)
     @Marshalling.args(int, int, Marshalling.base64_data, str)
-    @Marshalling.retval()
+    @Marshalling.retval( Marshalling.pickled_data )
     def get(self, testbed_guid, guid, name, time):
-        return str(self._controller.get(testbed_guid, guid, name, time))
+        return self._controller.get(testbed_guid, guid, name, time)
 
     @Marshalling.handles(EXPERIMENT_SET)
     @Marshalling.args(int, int, Marshalling.base64_data, Marshalling.pickled_data, str)