From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 28 Jan 2015 12:20:45 +0000 (+0100)
Subject: examples/omf/nitos_testbed_bootstrap.py leaving more time between operations
X-Git-Tag: nepi-3.2.0~9
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=d60ce2041ab0d3053490c5c3d36c64cb164b1d1e

examples/omf/nitos_testbed_bootstrap.py leaving more time between operations
---

diff --git a/examples/omf/nitos_testbed_bootstrap.py b/examples/omf/nitos_testbed_bootstrap.py
index 26e87743..452114fa 100644
--- a/examples/omf/nitos_testbed_bootstrap.py
+++ b/examples/omf/nitos_testbed_bootstrap.py
@@ -82,7 +82,7 @@ ec.set(reboot_app, "command", reboot_cmd)
 ec.register_connection(reboot_app, gw_node)
 
 ec.register_condition(reboot_app, ResourceAction.START, load_app, 
-            ResourceState.STOPPED, time="20s") 
+            ResourceState.STOPPED, time="300s") 
 
 hosts = hosts.split(",")
 
@@ -96,7 +96,7 @@ for hostname in hosts:
     ec.set(node, "gatewayUser", gateway_username)
     ec.set(node, "cleanExperiment", True)
     ec.register_condition(node, ResourceAction.DEPLOY, reboot_app, 
-            ResourceState.STOPPED, time="30s") 
+            ResourceState.STOPPED, time="300s") 
  
     app = ec.register_resource("linux::Application")
     ec.set(app, "command", "modprobe ath5k && ip a | grep wlan0 && service omf_rc restart")
@@ -104,6 +104,8 @@ for hostname in hosts:
    
     apps.append(app)
 
+print "This might take time..."
+
 ec.deploy(wait_all_ready=False)
 
 ec.wait_finished(apps)
diff --git a/src/nepi/resources/linux/tap.py b/src/nepi/resources/linux/tap.py
index be80ee0b..81fbe562 100644
--- a/src/nepi/resources/linux/tap.py
+++ b/src/nepi/resources/linux/tap.py
@@ -493,7 +493,7 @@ class LinuxTap(LinuxApplication):
     def _start_gre_command(self):
         command = []
         command.append("sudo -S modprobe ip_gre")
-        command.append("sudo -S ip tunnel add %s mode gre remote %s local %s ttl 64 csum key %s" % (
+        command.append("sudo -S ip tunnel add %s mode gre remote %s local %s ttl 255 csum key %s" % (
                 self.get("deviceName"),
                 self.get("greRemote"),
                 self.node.get("ip"),