ec_shutdown

[nepi.git] / src / nepi / resources / linux / ccn / ccncontent.py

diff --git a/src/nepi/resources/linux/ccn/ccncontent.py b/src/nepi/resources/linux/ccn/ccncontent.py
index d4e9f39..1fa93cc 100644 (file)
--- a/src/nepi/resources/linux/ccn/ccncontent.py
+++ b/src/nepi/resources/linux/ccn/ccncontent.py
@@ -40,8 +40,17 @@ class LinuxCCNContent(LinuxApplication):
                 "The content to publish. It can be a path to a file or plain text ",
                 flags = Flags.ExecReadOnly)
 
+        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.ExecReadOnly)
+
         cls._register_attribute(content_name)
         cls._register_attribute(content)
+        cls._register_attribute(scope)
 
     def __init__(self, ec, guid):
         super(LinuxCCNContent, self).__init__(ec, guid)
@@ -63,7 +72,6 @@ class LinuxCCNContent(LinuxApplication):
         if self.ccnr: return self.ccnr.node
         return None
 
-
     def deploy(self):
         if not self.ccnr or self.ccnr.state < ResourceState.READY:
             self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state )
@@ -71,74 +79,77 @@ class LinuxCCNContent(LinuxApplication):
             # ccnr needs to wait until ccnd is deployed and running
             self.ec.schedule(reschedule_delay, self.deploy)
         else:
-            command = self._start_command
-            env = self._environment
+            try:
+                if not self.get("command"):
+                    self.set("command", self._start_command)
 
-            self.set("command", command)
-            self.set("env", env)
+                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"))
 
-            self.info("Deploying command '%s' " % command)
+                command = self.get("command")
 
-            # create run dir for application
-            self.node.mkdir(self.run_home)
+                self.info("Deploying command '%s' " % command)
 
-            # upload content 
-            self.upload_stdin()
+                self.discover()
+                self.provision()
+            except:
+                self.fail()
+                return 
 
-            # 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 )
-            (out, err), proc = self.execute_command(command, env)
+            self.debug("----- READY ---- ")
+            self.set_ready()
 
-            if proc.poll():
-                self._state = ResourceState.FAILED
-                msg = "Failed to execute command"
-                self.error(msg, out, err)
-                raise RuntimeError, msg
+    def upload_start_command(self):
+        command = self.get("command")
+        env = self.get("env")
 
-            self.debug("----- READY ---- ")
-            self._ready_time = tnow()
-            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 start(self):
-        if self._state == ResourceState.READY:
+        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
+            sef.fail()
 
     @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):
         return self.ccnd.path
        
-    def execute_command(self, command, env):
-        environ = self.node.format_environment(env, inline = True)
-        command = environ + command
-        command = self.replace_paths(command)
-
-        return self.node.execute(command)
-
     def valid_connection(self, guid):
         # TODO: Validate!
         return True