# 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
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
@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). "
"Note that a scope of 3 is encoded as the absence of any scope in the interest. ",
type = Types.Integer,
default = 1,
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
cls._register_attribute(content_name)
cls._register_attribute(content)
@property
def ccnr(self):
- ccnr = self.get_connected(LinuxCCNR.rtype())
+ ccnr = self.get_connected(LinuxCCNR.get_rtype())
if ccnr: return ccnr[0]
return None
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.set_ready()
def upload_start_command(self):
env, blocking = True)
if proc.poll():
- self.fail()
msg = "Failed to execute command"
self.error(msg, out, err)
- raise RuntimeError, msg
+ raise RuntimeError(msg)
- def start(self):
+ def do_start(self):
if self.state == ResourceState.READY:
command = self.get("command")
self.info("Starting command '%s'" % command)
else:
msg = " Failed to execute command '%s'" % command
self.error(msg, out, err)
- sef.fail()
- raise RuntimeError, msg
+ raise RuntimeError(msg)
@property
def _start_command(self):