git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code cleanup. Setting resource state through specific functions
[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
5b9d925
..
cae55b5
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccncontent.py
+++ b/
src/nepi/resources/linux/ccn/ccncontent.py
@@
-101,8
+101,7
@@
class LinuxCCNContent(LinuxApplication):
raise
self.debug("----- READY ---- ")
raise
self.debug("----- READY ---- ")
- self._ready_time = tnow()
- self._state = ResourceState.READY
+ self.set_ready()
def upload_start_command(self):
command = self.get("command")
def upload_start_command(self):
command = self.get("command")
@@
-128,22
+127,17
@@
class LinuxCCNContent(LinuxApplication):
raise RuntimeError, msg
def start(self):
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)
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)
else:
msg = " Failed to execute command '%s'" % command
self.error(msg, out, err)
- se
lf._state = ResourceState.FAILED
+ se
f.fail()
raise RuntimeError, msg
raise RuntimeError, msg
- @property
- def state(self):
- return self._state
-
@property
def _start_command(self):
command = ["ccnseqwriter"]
@property
def _start_command(self):
command = ["ccnseqwriter"]