Fixing RM.DEPLOY being executed after/during RM.RELEASE by adding a release_lock...

[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 9d531de..2595eda 100644 (file)
--- a/src/nepi/resources/linux/ccn/ccncontent.py
+++ b/src/nepi/resources/linux/ccn/ccncontent.py
@@ -72,37 +72,32 @@ 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)
         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")
@@ -118,32 +113,25 @@ class LinuxCCNContent(LinuxApplication):
         env = self.replace_paths(env)
         command = self.replace_paths(command)
 
-        (out, err), proc = self.execute_command(command, env, 
-                blocking = True)
+        (out, err), proc = self.execute_command(command, 
+                env, blocking = True)
 
         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:
+    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
-
     @property
     def _start_command(self):
         command = ["ccnseqwriter"]