From 392caf57c8567c7198321f1414aee43ee31d1e42 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Fri, 30 May 2014 18:16:23 +0200 Subject: [PATCH] Fixing up DCE --- src/nepi/resources/all/collector.py | 2 +- src/nepi/resources/linux/ccn/ccncat.py | 10 +++++++++- src/nepi/resources/ns3/ns3dceapplication.py | 1 + test/resources/linux/ns3/ccn/ns3dceccnpeek.py | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/nepi/resources/all/collector.py b/src/nepi/resources/all/collector.py index f13a3923..58745e31 100644 --- a/src/nepi/resources/all/collector.py +++ b/src/nepi/resources/all/collector.py @@ -80,7 +80,7 @@ class Collector(ResourceManager): raise RuntimeError, msg store_dir = self.get("storeDir") - self._store_path = os.path.join(store_dir, self.ec.exp_id, self.ec.run_id) + self._store_path = os.path.join(store_dir, self.ec.run_id) subdir = self.get("subDir") if subdir: diff --git a/src/nepi/resources/linux/ccn/ccncat.py b/src/nepi/resources/linux/ccn/ccncat.py index c721c331..f5eb2690 100644 --- a/src/nepi/resources/linux/ccn/ccncat.py +++ b/src/nepi/resources/linux/ccn/ccncat.py @@ -34,7 +34,12 @@ class LinuxCCNCat(LinuxCCNApplication): "Content name for the content to peek", flags = Flags.Design) + pipeline = Attribute("pipeline", + "CCNCat pipeline", + flags = Flags.Design) + cls._register_attribute(content_name) + cls._register_attribute(pipeline) def __init__(self, ec, guid): super(LinuxCCNCat, self).__init__(ec, guid) @@ -48,7 +53,10 @@ class LinuxCCNCat(LinuxCCNApplication): command = self.get("command") if not command: command = "ccncat %s" % self.get("contentName") - self.set("command", command) + if self.get("pipeline"): + command += " -p %s " % self.get("pipeline") + + self.set("command", command) self.info("Deploying command '%s' " % command) diff --git a/src/nepi/resources/ns3/ns3dceapplication.py b/src/nepi/resources/ns3/ns3dceapplication.py index a3e97fae..1922bb1d 100644 --- a/src/nepi/resources/ns3/ns3dceapplication.py +++ b/src/nepi/resources/ns3/ns3dceapplication.py @@ -182,6 +182,7 @@ class NS3BaseDceApplication(NS3BaseApplication): with self.dce_application_lock: pid = self.simulation.invoke(self.dce_application_helper_uuid, "GetPid", self.uuid) + node_id = self.simulation.invoke(self.node.uuid, "GetId") self._trace_filename["stdout"] = "files-%s/var/log/%s/stdout" % (node_id, pid) self._trace_filename["stderr"] = "files-%s/var/log/%s/stderr" % (node_id, pid) diff --git a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py index 0664f84b..1d9accaa 100644 --- a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py +++ b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py @@ -61,8 +61,8 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase): ec.set(node, "hostname", self.fedora_host) ec.set(node, "username", self.fedora_user) ec.set(node, "identity", self.fedora_identity) - ec.set(node, "cleanProcesses", True) - ec.set(node, "cleanHome", True) + #ec.set(node, "cleanProcesses", True) + #ec.set(node, "cleanHome", True) simu = ec.register_resource("LinuxNS3Simulation") ec.set(simu, "verbose", True) -- 2.43.0