From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 25 Jul 2011 13:19:39 +0000 (+0200)
Subject: Reconnection fix: testbed deserialization was completely borked
X-Git-Tag: nepi-3.0.0~349
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b5f62a5afc9d5859f1990d6e71db17b6091b1929;p=nepi.git

Reconnection fix: testbed deserialization was completely borked
---

diff --git a/src/nepi/core/execute.py b/src/nepi/core/execute.py
index 9ef91835..703eae00 100644
--- a/src/nepi/core/execute.py
+++ b/src/nepi/core/execute.py
@@ -405,10 +405,11 @@ class ExperimentController(object):
     
     def _load_testbed_proxies(self):
         TYPEMAP = {
-            STRING : 'get',
-            INTEGER : 'getint',
-            FLOAT : 'getfloat',
-            BOOLEAN : 'getboolean',
+            Attribute.STRING : 'get',
+            Attribute.BOOL : 'getboolean',
+            Attribute.ENUM : 'get',
+            Attribute.DOUBLE : 'getfloat',
+            Attribute.INTEGER : 'getint',
         }
         
         # deferred import because proxy needs
@@ -419,19 +420,14 @@ class ExperimentController(object):
         conf.read(os.path.join(self._root_dir, 'deployment_config.ini'))
         for testbed_guid in conf.sections():
             testbed_config = proxy.AccessConfiguration()
-            for attr in conf.options(testbed_guid):
-                testbed_config.set_attribute_value(attr, 
-                    conf.get(testbed_guid, attr) )
-                
             testbed_guid = str(testbed_guid)
-            conf.add_section(testbed_guid)
             for attr in testbed_config.get_attribute_list():
                 if attr not in TRANSIENT:
                     getter = getattr(conf, TYPEMAP.get(
                         testbed_config.get_attribute_type(attr),
                         'get') )
                     testbed_config.set_attribute_value(
-                        testbed_guid, attr, getter(attr))
+                        attr, getter(testbed_guid, attr))
     
     def _unpersist_testbed_proxies(self):
         try: