From: Alina Quereilhac Date: Thu, 29 May 2014 08:52:07 +0000 (+0200) Subject: Adding ccnpeek linux example X-Git-Tag: nepi-3.1.0~66 X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=ea9bd019c72d8ffc67143b9905186b1313fac85c Adding ccnpeek linux example --- diff --git a/src/nepi/resources/linux/ccn/ccnapplication.py b/src/nepi/resources/linux/ccn/ccnapplication.py index f79c7cf3..49b2bdc5 100644 --- a/src/nepi/resources/linux/ccn/ccnapplication.py +++ b/src/nepi/resources/linux/ccn/ccnapplication.py @@ -21,7 +21,6 @@ from nepi.execution.resource import clsinit_copy, ResourceState, \ reschedule_delay from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.ccn.ccnd import LinuxCCND -from nepi.util.timefuncs import tnow, tdiffsec import os diff --git a/src/nepi/resources/linux/ccn/ccnpeek.py b/src/nepi/resources/linux/ccn/ccnpeek.py new file mode 100644 index 00000000..b1deeca6 --- /dev/null +++ b/src/nepi/resources/linux/ccn/ccnpeek.py @@ -0,0 +1,66 @@ +# +# NEPI, a framework to manage network experiments +# Copyright (C) 2013 INRIA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Author: Alina Quereilhac + +from nepi.execution.attribute import Attribute, Flags, Types +from nepi.execution.resource import clsinit_copy, ResourceState, \ + reschedule_delay +from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication + +import os + +@clsinit_copy +class LinuxCCNPeek(LinuxCCNApplication): + _rtype = "LinuxCCNPeek" + + @classmethod + def _register_attributes(cls): + content_name = Attribute("contentName", + "Content name for the content to peek", + flags = Flags.Design) + + cls._register_attribute(content_name) + + def __init__(self, ec, guid): + super(LinuxCCNPeek, self).__init__(ec, guid) + self._home = "ccnpeek-%s" % self.guid + + def do_deploy(self): + if not self.ccnd or self.ccnd.state < ResourceState.READY: + self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) + self.ec.schedule(reschedule_delay, self.deploy) + else: + command = self.get("command") + if not command: + command = "ccnpeek %s" % self.get("contentName") + self.set("command", command) + + self.info("Deploying command '%s' " % command) + + if not self.get("env"): + self.set("env", self._environment) + + self.do_discover() + self.do_provision() + + self.set_ready() + + def valid_connection(self, guid): + # TODO: Validate! + return True + diff --git a/src/nepi/resources/linux/ccn/ccnpoke.py b/src/nepi/resources/linux/ccn/ccnpoke.py new file mode 100644 index 00000000..6fa5a2bf --- /dev/null +++ b/src/nepi/resources/linux/ccn/ccnpoke.py @@ -0,0 +1,74 @@ +# +# NEPI, a framework to manage network experiments +# Copyright (C) 2013 INRIA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Author: Alina Quereilhac + +from nepi.execution.attribute import Attribute, Flags, Types +from nepi.execution.resource import clsinit_copy, ResourceState, \ + reschedule_delay +from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication + +import os + +@clsinit_copy +class LinuxCCNPoke(LinuxCCNApplication): + _rtype = "LinuxCCNPoke" + + @classmethod + def _register_attributes(cls): + content_name = Attribute("contentName", + "Content name for the content to peek", + flags = Flags.Design) + + content = Attribute("content", + "Content to poke (as a text string)", + flags = Flags.Design) + + cls._register_attribute(content_name) + cls._register_attribute(content) + + def __init__(self, ec, guid): + super(LinuxCCNPoke, self).__init__(ec, guid) + self._home = "ccnpoke-%s" % self.guid + + def do_deploy(self): + if not self.ccnd or self.ccnd.state < ResourceState.READY: + self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) + self.ec.schedule(reschedule_delay, self.deploy) + else: + command = self.get("command") + if not command: + command = "ccnpoke %s" % self.get("contentName") + self.set("command", command) + + self.info("Deploying command '%s' " % command) + + if self.get("content"): + self.set("stdin", self.get("content")) + + if not self.get("env"): + self.set("env", self._environment) + + self.do_discover() + self.do_provision() + + self.set_ready() + + def valid_connection(self, guid): + # TODO: Validate! + return True + diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py index e8cf1088..cd7b0f60 100644 --- a/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py +++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnpeekdceapplication.py @@ -44,21 +44,4 @@ class LinuxNS3DceCCNPeek(LinuxNS3CCNDceApplication): super(LinuxNS3DceCCNPeek, self)._instantiate_object() - @property - def _arguments(self): - args = ["-v", "add"] - - if self.get("uri"): - args.append(self.get("uri")) - if self.get("protocol"): - args.append(self.get("protocol")) - if self.get("host"): - args.append(self.get("host")) - if self.get("port"): - args.append(self.get("port")) - if self.get("ip"): - args.append(self.get("ip")) - - return ";".join(args) - diff --git a/test/resources/linux/ccn/ccnpeek.py b/test/resources/linux/ccn/ccnpeek.py new file mode 100644 index 00000000..ec6f4f84 --- /dev/null +++ b/test/resources/linux/ccn/ccnpeek.py @@ -0,0 +1,78 @@ +#!/usr/bin/env python +# +# NEPI, a framework to manage network experiments +# Copyright (C) 2013 INRIA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Author: Alina Quereilhac + +from nepi.execution.resource import ResourceState, ResourceAction +from nepi.execution.ec import ExperimentController +from test_utils import skipIfAnyNotAlive + +import os +import time +import tempfile +import unittest + +class LinuxCCNPeekTestCase(unittest.TestCase): + def setUp(self): + #self.fedora_host = "nepi2.pl.sophia.inria.fr" + #self.fedora_user = "inria_nepi" + self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME']) + + self.fedora_host = "mimas.inria.fr" + self.fedora_user = "aquereil" + + @skipIfAnyNotAlive + def test_ccnpeek(self): + ec = ExperimentController(exp_id = "test-linux-ccnpeek") + + node = ec.register_resource("LinuxNode") + 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) + + ccnd = ec.register_resource("LinuxCCND") + ec.register_connection(ccnd, node) + + peek = ec.register_resource("LinuxCCNPeek") + ec.set(peek, "contentName", "ccnx:/chunk0") + ec.register_connection(peek, ccnd) + + poke = ec.register_resource("LinuxCCNPoke") + ec.set(poke, "contentName", "ccnx:/chunk0") + ec.set(poke, "content", "DATA") + ec.register_connection(poke, ccnd) + + ec.register_condition(peek, ResourceAction.START, poke, + ResourceState.STARTED) + + ec.deploy() + + ec.wait_finished(peek) + + stdout = ec.trace(peek, "stdout") + print stdout + expected = "DATA" + self.assertTrue(stdout.find(expected) > -1) + + ec.shutdown() + +if __name__ == '__main__': + unittest.main() +