Cleaning up ns-3 multi-host examples

[nepi.git] / examples / omf / nitos_testbed_bootstrap.py

diff --git a/examples/omf/nitos_testbed_bootstrap.py b/examples/omf/nitos_testbed_bootstrap.py
index 26e8774..30dcb7f 100644 (file)
--- a/examples/omf/nitos_testbed_bootstrap.py
+++ b/examples/omf/nitos_testbed_bootstrap.py
@@ -1,11 +1,11 @@
+#!/usr/bin/env python\r
 #\r
 #    NEPI, a framework to manage network experiments\r
-#    Copyright (C) 2014 INRIA\r
+#    Copyright (C) 2013 INRIA\r
 #\r
 #    This program is free software: you can redistribute it and/or modify\r
-#    it under the terms of the GNU General Public License as published by\r
-#    the Free Software Foundation, either version 3 of the License, or\r
-#    (at your option) any later version.\r
+#    it under the terms of the GNU General Public License version 2 as\r
+#    published by the Free Software Foundation;\r
 #\r
 #    This program is distributed in the hope that it will be useful,\r
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
@@ -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="60s") \r
 \r
 hosts = hosts.split(",")\r
 \r
@@ -96,13 +96,19 @@ 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
-    ec.register_connection(app, node)\r
-   \r
-    apps.append(app)\r
+    modprobe_app = ec.register_resource("linux::Application")\r
+    ec.set(modprobe_app, "command", "modprobe ath5k && ip a | grep wlan0")\r
+    ec.register_connection(modprobe_app, node)\r
+    apps.append(modprobe_app)\r
+\r
+    rc_app = ec.register_resource("linux::Application")\r
+    ec.set(rc_app, "command", "service omf_rc stop; service omf_rc start")\r
+    ec.register_connection(rc_app, node)\r
+    apps.append(rc_app)\r
+\r
+print "This might take time..."\r
 \r
 ec.deploy(wait_all_ready=False)\r
 \r