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
Replacing _backend for _platform class attribute in ResourceManager
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
tunnel.py
diff --git
a/src/nepi/resources/linux/tunnel.py
b/src/nepi/resources/linux/tunnel.py
index
8e0760d
..
43c7f99
100644
(file)
--- a/
src/nepi/resources/linux/tunnel.py
+++ b/
src/nepi/resources/linux/tunnel.py
@@
-17,8
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-from nepi.execution.resource import clsinit_copy, ResourceState, \
- reschedule_delay
+from nepi.execution.resource import clsinit_copy, ResourceState
from nepi.resources.linux.application import LinuxApplication
from nepi.util.timefuncs import tnow, tdiffsec
from nepi.resources.linux.application import LinuxApplication
from nepi.util.timefuncs import tnow, tdiffsec
@@
-29,9
+28,8
@@
state_check_delay = 0.5
@clsinit_copy
class LinuxTunnel(LinuxApplication):
@clsinit_copy
class LinuxTunnel(LinuxApplication):
- _rtype = "abstract::
Linux
Tunnel"
+ _rtype = "abstract::
linux::
Tunnel"
_help = "Constructs a tunnel between two Linux endpoints"
_help = "Constructs a tunnel between two Linux endpoints"
- _backend = "linux"
def __init__(self, ec, guid):
super(LinuxTunnel, self).__init__(ec, guid)
def __init__(self, ec, guid):
super(LinuxTunnel, self).__init__(ec, guid)
@@
-113,7
+111,7
@@
class LinuxTunnel(LinuxApplication):
def do_deploy(self):
if (not self.endpoint1 or self.endpoint1.state < ResourceState.READY) or \
(not self.endpoint2 or self.endpoint2.state < ResourceState.READY):
def do_deploy(self):
if (not self.endpoint1 or self.endpoint1.state < ResourceState.READY) or \
(not self.endpoint2 or self.endpoint2.state < ResourceState.READY):
- self.ec.schedule(reschedule_delay, self.deploy)
+ self.ec.schedule(
self.
reschedule_delay, self.deploy)
else:
self.do_discover()
self.do_provision()
else:
self.do_discover()
self.do_provision()