X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fccn%2Fccncontent.py;h=da8c2ab062bbd380bef7d695fc5bd45dcb661d0b;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=febcefca90f36d2f49cef06a874745252bc42d1f;hpb=3ec952ecb376f66a3c083249c6deec2f19b82947;p=nepi.git diff --git a/src/nepi/resources/linux/ccn/ccncontent.py b/src/nepi/resources/linux/ccn/ccncontent.py index febcefca..da8c2ab0 100644 --- a/src/nepi/resources/linux/ccn/ccncontent.py +++ b/src/nepi/resources/linux/ccn/ccncontent.py @@ -3,9 +3,8 @@ # 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. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +18,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import clsinit_copy, ResourceState, \ - ResourceAction, reschedule_delay + ResourceAction from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.ccn.ccnr import LinuxCCNR from nepi.util.timefuncs import tnow @@ -28,20 +27,29 @@ import os @clsinit_copy class LinuxCCNContent(LinuxApplication): - _rtype = "LinuxCCNContent" + _rtype = "linux::CCNContent" @classmethod def _register_attributes(cls): content_name = Attribute("contentName", "The name of the content to publish (e.g. ccn:/VIDEO) ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) content = Attribute("content", "The content to publish. It can be a path to a file or plain text ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) + + scope = Attribute("scope", + "Use the given scope on the start-write request (if -r specified). " + "scope can be 1 (local), 2 (neighborhood), or 3 (unlimited). " + "Note that a scope of 3 is encoded as the absence of any scope in the interest. ", + type = Types.Integer, + default = 1, + flags = Flags.Design) cls._register_attribute(content_name) cls._register_attribute(content) + cls._register_attribute(scope) def __init__(self, ec, guid): super(LinuxCCNContent, self).__init__(ec, guid) @@ -49,7 +57,7 @@ class LinuxCCNContent(LinuxApplication): @property def ccnr(self): - ccnr = self.get_connected(LinuxCCNR.rtype()) + ccnr = self.get_connected(LinuxCCNR.get_rtype()) if ccnr: return ccnr[0] return None @@ -63,80 +71,74 @@ class LinuxCCNContent(LinuxApplication): if self.ccnr: return self.ccnr.node return None - def deploy(self): + def do_deploy(self): if not self.ccnr or self.ccnr.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) # ccnr needs to wait until ccnd is deployed and running - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: - try: - if not self.get("command"): - self.set("command", self._start_command) + if not self.get("command"): + self.set("command", self._start_command) + + if not self.get("env"): + self.set("env", self._environment) - if not self.get("env"): - self.set("env", self._environment) + # set content to stdin, so the content will be + # uploaded during provision + self.set("stdin", self.get("content")) - # set content to stdin, so the content will be - # uploaded during provision - self.set("stdin", self.get("content")) + command = self.get("command") - command = self.get("command") + self.info("Deploying command '%s' " % command) - self.info("Deploying command '%s' " % command) + self.do_discover() + self.do_provision() - self.discover() - self.provision() - except: - self.fail() - raise - - self.debug("----- READY ---- ") - self._ready_time = tnow() - self._state = ResourceState.READY + self.set_ready() def upload_start_command(self): command = self.get("command") env = self.get("env") - if command: - # We want to make sure the content is published - # before the experiment starts. - # Run the command as a bash script in the background, - # in the host ( but wait until the command has - # finished to continue ) - env = self.replace_paths(env) - command = self.replace_paths(command) - - (out, err), proc = self.execute_command(command, env) - - if proc.poll(): - self.fail() - msg = "Failed to execute command" - self.error(msg, out, err) - raise RuntimeError, msg - - def start(self): - if self._state == ResourceState.READY: + self.info("Uploading command '%s'" % command) + + # We want to make sure the content is published + # before the experiment starts. + # Run the command as a bash script in the background, + # in the host ( but wait until the command has + # finished to continue ) + env = self.replace_paths(env) + command = self.replace_paths(command) + + (out, err), proc = self.execute_command(command, + env, blocking = True) + + if proc.poll(): + msg = "Failed to execute command" + self.error(msg, out, err) + raise RuntimeError(msg) + + def do_start(self): + if self.state == ResourceState.READY: command = self.get("command") self.info("Starting command '%s'" % command) - self._start_time = tnow() - self._state = ResourceState.STARTED + self.set_started() else: msg = " Failed to execute command '%s'" % command self.error(msg, out, err) - self._state = ResourceState.FAILED - raise RuntimeError, msg - - @property - def state(self): - return self._state + raise RuntimeError(msg) @property def _start_command(self): - return "ccnseqwriter -r %s < %s" % (self.get("contentName"), - os.path.join(self.app_home, 'stdin')) + command = ["ccnseqwriter"] + command.append("-r %s" % self.get("contentName")) + command.append("-s %d" % self.get("scope")) + command.append("< %s" % os.path.join(self.app_home, 'stdin')) + + command = " ".join(command) + return command @property def _environment(self):