From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 6 Jul 2011 15:02:30 +0000 (+0200)
Subject: bugfix: can_cross and must_cross platform fixed in connetot.py
X-Git-Tag: nepi-3.0.0~381^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d7dde31a6fac6fd3283196f81345ccfe209e1fac;p=nepi.git

bugfix: can_cross and must_cross platform fixed in connetot.py
---

diff --git a/src/nepi/core/connector.py b/src/nepi/core/connector.py
index a62d3049..2fb450f8 100644
--- a/src/nepi/core/connector.py
+++ b/src/nepi/core/connector.py
@@ -81,18 +81,14 @@ class ConnectorType(object):
         testbed_id, factory_id, name = connector_type_id
         
         # the key is always a candidate
-        #print " 1 - ", connector_type_id
         yield connector_type_id
         
         # Try wildcard combinations
         if (testbed_id, None, name) != connector_type_id:
-            #print " 2 - ", (testbed_id, None, name)
             yield (testbed_id, None, name)
         if (None, factory_id, name) != connector_type_id:
-            #print " 3 - ", (None, factory_id, name)
             yield (None, factory_id, name)
         if (None, None, name) != connector_type_id:
-            #print " 4 - ", (None, None, name)
             yield (None, None, name)
 
     def add_from_connection(self, testbed_id, factory_id, name, can_cross, 
@@ -117,7 +113,7 @@ class ConnectorType(object):
         for lookup_type_id in self._type_resolution_order(connector_type_id):
             if lookup_type_id in self._to_connections:
                 (can_cross, init_code, compl_code) = self._to_connections[lookup_type_id]
-                if not must_cross or can_cross:
+                if must_cross == can_cross:
                     return (init_code, compl_code)
         else:
             return (False, False)
diff --git a/src/nepi/core/execute.py b/src/nepi/core/execute.py
index 9e7b8dcb..5e88e1c2 100644
--- a/src/nepi/core/execute.py
+++ b/src/nepi/core/execute.py
@@ -268,7 +268,6 @@ class ExperimentController(object):
     def start(self):
         parser = XmlExperimentParser()
         data = parser.from_xml_to_data(self._experiment_xml)
-        
         self._init_testbed_controllers(data)
         
         # persist testbed connection data, for potential recovery