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 26e8774..452114f 100644 (file)
--- 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)\r
 \r
 ec.register_condition(reboot_app, ResourceAction.START, load_app, \r
-            ResourceState.STOPPED, time="20s") \r
+            ResourceState.STOPPED, time="300s") \r
 \r
 hosts = hosts.split(",")\r
 \r
@@ -96,7 +96,7 @@ for hostname in hosts:
     ec.set(node, "gatewayUser", gateway_username)\r
     ec.set(node, "cleanExperiment", True)\r
     ec.register_condition(node, ResourceAction.DEPLOY, reboot_app, \r
-            ResourceState.STOPPED, time="30s") \r
+            ResourceState.STOPPED, time="300s") \r
  \r
     app = ec.register_resource("linux::Application")\r
     ec.set(app, "command", "modprobe ath5k && ip a | grep wlan0 && service omf_rc restart")\r
@@ -104,6 +104,8 @@ for hostname in hosts:
    \r
     apps.append(app)\r
 \r
+print "This might take time..."\r
+\r
 ec.deploy(wait_all_ready=False)\r
 \r
 ec.wait_finished(apps)\r

diff --git a/src/nepi/resources/linux/tap.py b/src/nepi/resources/linux/tap.py
index be80ee0..81fbe56 100644 (file)
--- 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"),