get methods of proxies should pickle data, they need to preserve the data types.
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 17 May 2011 13:12:45 +0000 (15:12 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 17 May 2011 13:12:45 +0000 (15:12 +0200)
src/nepi/util/proxy.py

index db5ce05..90aa485 100644 (file)
@@ -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)