X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Ftunnel.py;h=43c7f997876eee3d124c429e3090e6d0785c4a85;hb=23d041fe2f0d9badf6d637009e2d42a4794325c1;hp=8e0760d96482e09760d5f12c4471f753431e87bb;hpb=bae7c6b1d62f85c7fc4eed2806f5f07931f4881c;p=nepi.git diff --git a/src/nepi/resources/linux/tunnel.py b/src/nepi/resources/linux/tunnel.py index 8e0760d9..43c7f997 100644 --- a/src/nepi/resources/linux/tunnel.py +++ b/src/nepi/resources/linux/tunnel.py @@ -17,8 +17,7 @@ # # Author: Alina Quereilhac -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 @@ -29,9 +28,8 @@ state_check_delay = 0.5 @clsinit_copy class LinuxTunnel(LinuxApplication): - _rtype = "abstract::LinuxTunnel" + _rtype = "abstract::linux::Tunnel" _help = "Constructs a tunnel between two Linux endpoints" - _backend = "linux" 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): - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: self.do_discover() self.do_provision()