From: Alina Quereilhac Date: Fri, 12 Sep 2014 14:42:04 +0000 (+0200) Subject: Adding asbtract topology diagram for documentation X-Git-Tag: nepi-3.2.0~85 X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=b3271c629a0e152c48538924e588a80a2b1cd939 Adding asbtract topology diagram for documentation --- 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 index 00000000..0876b0e8 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 index 00000000..a305838c Binary files /dev/null and b/doc/user_manual/abstract_topology_vs_executable_description.png differ diff --git a/src/nepi/util/parsers/xml_parser.py b/src/nepi/util/parsers/xml_parser.py index ca68be1d..f6ac9575 100644 --- a/src/nepi/util/parsers/xml_parser.py +++ b/src/nepi/util/parsers/xml_parser.py @@ -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()