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
ec_shutdown
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
ccn
/
ccnapplication.py
diff --git
a/src/nepi/resources/linux/ccn/ccnapplication.py
b/src/nepi/resources/linux/ccn/ccnapplication.py
index
740d366
..
46a3cc4
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccnapplication.py
+++ b/
src/nepi/resources/linux/ccn/ccnapplication.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-from nepi.execution.resource import
ResourceManager,
clsinit_copy, ResourceState, \
+from nepi.execution.resource import clsinit_copy, ResourceState, \
reschedule_delay
from nepi.resources.linux.application import LinuxApplication
from nepi.resources.linux.ccn.ccnd import LinuxCCND
reschedule_delay
from nepi.resources.linux.application import LinuxApplication
from nepi.resources.linux.ccn.ccnd import LinuxCCND
@@
-61,23
+61,15
@@
class LinuxCCNApplication(LinuxApplication):
self.provision()
except:
self.fail()
self.provision()
except:
self.fail()
- r
aise
+ r
eturn
self.debug("----- READY ---- ")
self.debug("----- READY ---- ")
- self._ready_time = tnow()
- self._state = ResourceState.READY
+ self.set_ready()
@property
def _environment(self):
return self.ccnd.path
@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
def valid_connection(self, guid):
# TODO: Validate!
return True