Adding asbtract topology diagram for documentation
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Fri, 12 Sep 2014 14:42:04 +0000 (16:42 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Fri, 12 Sep 2014 14:42:04 +0000 (16:42 +0200)
doc/user_manual/abstract_topology_vs_executable_description.odg [new file with mode: 0644]
doc/user_manual/abstract_topology_vs_executable_description.png [new file with mode: 0644]
src/nepi/util/parsers/xml_parser.py

diff --git a/doc/user_manual/abstract_topology_vs_executable_description.odg b/doc/user_manual/abstract_topology_vs_executable_description.odg
new file mode 100644 (file)
index 0000000..0876b0e
Binary files /dev/null and b/doc/user_manual/abstract_topology_vs_executable_description.odg differ
diff --git a/doc/user_manual/abstract_topology_vs_executable_description.png b/doc/user_manual/abstract_topology_vs_executable_description.png
new file mode 100644 (file)
index 0000000..a305838
Binary files /dev/null and b/doc/user_manual/abstract_topology_vs_executable_description.png differ
index ca68be1..f6ac957 100644 (file)
@@ -267,12 +267,18 @@ class ECXMLParser(object):
                 os.environ["NEPI_NTHREADS"] = nthreads
 
                 # Deserialize netgraph
+                topology = None
+                topo_type = None
+
                 netgraph = self._netgraph_from_xml(doc, ecnode)
-                topo_type = netgraph.topo_type if netgraph else None
+                
+                if netgraph:
+                    topo_type = netgraph.topo_type
+                    topology = netgraph.topology
 
                 # Instantiate EC
                 ec = ExperimentController(exp_id = exp_id, local_dir = local_dir, 
-                        topology = netgraph.topology, topo_type = topo_type)
+                        topology = topology, topo_type = topo_type)
 
                 connections = set()