ec_shutdown

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

diff --git a/src/nepi/resources/linux/ccn/fibentry.py b/src/nepi/resources/linux/ccn/fibentry.py
index 62d9049..48c2d6d 100644 (file)
--- a/src/nepi/resources/linux/ccn/fibentry.py
+++ b/src/nepi/resources/linux/ccn/fibentry.py
@@ -136,11 +136,10 @@ class LinuxFIBEntry(LinuxApplication):
                 self.configure()
             except:
                 self.fail()
-                raise
- 
+                return
+
             self.debug("----- READY ---- ")
-            self._ready_time = tnow()
-            self._state = ResourceState.READY
+            self.set_ready()
 
     def upload_start_command(self):
         command = self.get("command")
@@ -160,7 +159,6 @@ class LinuxFIBEntry(LinuxApplication):
                 env, blocking = True)
 
         if proc.poll():
-            self._state = ResourceState.FAILED
             msg = "Failed to execute command"
             self.error(msg, out, err)
             raise RuntimeError, msg
@@ -197,17 +195,15 @@ class LinuxFIBEntry(LinuxApplication):
             self.ec.deploy(guids=[self._traceroute], group = self.deployment_group)
 
     def start(self):
-        if self._state in [ResourceState.READY, ResourceState.STARTED]:
+        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
+            self.fail()
 
     def stop(self):
         command = self.get('command')
@@ -217,17 +213,15 @@ class LinuxFIBEntry(LinuxApplication):
             self.info("Stopping command '%s'" % command)
 
             command = self._stop_command
-            (out, err), proc = self.execute_command(command, env)
-
-            if proc.poll():
-                pass
+            (out, err), proc = self.execute_command(command, env,
+                    blocking = True)
 
-            self._stop_time = tnow()
-            self._state = ResourceState.STOPPED
+            self.set_stopped()
 
-    @property
-    def state(self):
-        return self._state
+            if err:
+                msg = " Failed to execute command '%s'" % command
+                self.error(msg, out, err)
+                self.fail()
 
     @property
     def _start_command(self):