X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fomf%2Fnitos_testbed_bootstrap.py;h=014d3eb6db281ab4249770a6a3ce225e49f91d71;hb=9908367cf532a7bac74288c23c2024dacb3683c8;hp=34d2e3f89ffd950facbc70c5d2a284d4b93af890;hpb=04b471c90f38afe8dc0018f1b2c4e5d3dc9f4384;p=nepi.git

diff --git a/examples/omf/nitos_testbed_bootstrap.py b/examples/omf/nitos_testbed_bootstrap.py
index 34d2e3f8..014d3eb6 100644
--- a/examples/omf/nitos_testbed_bootstrap.py
+++ b/examples/omf/nitos_testbed_bootstrap.py
@@ -1,11 +1,11 @@
+#!/usr/bin/env python
 #
 #    NEPI, a framework to manage network experiments
-#    Copyright (C) 2014 INRIA
+#    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,7 +27,7 @@
 # Example of how to run this experiment (replace with your information):
 #
 # $ cd <path-to-nepi>
-# python examples/linux/nitos_testbed_bootstrap.py -H <omf.nitos.node0XX,omf.nitos.node0ZZ,..> -u <nitos-username> -i <ssh-key> -g <nitos-gateway> -U <nitos-gateway-username>
+# python examples/linux/nitos_testbed_bootstrap.py -H <omf.nitos.node0XX,omf.nitos.node0ZZ,..> -U <node-username> -i <ssh-key> -g <nitos-gateway> -u <nitos-slice>
 #
 
 from nepi.execution.ec import ExperimentController
@@ -36,19 +36,19 @@ from nepi.execution.resource import ResourceAction, ResourceState
 from optparse import OptionParser
 import os
 
-usage = ("usage: %prog -H <list-of-nitos-hosts> -u <nitos-username> -i <ssh-key> -g <nitos-gateway> -U <nitos-gateway-username>")
+usage = ("usage: %prog -H <list-of-nitos-hosts> -U <node-username> -i <ssh-key> -g <nitos-gateway> -u <slicename>")
 
 parser = OptionParser(usage = usage)
 parser.add_option("-H", "--hosts", dest="hosts", 
         help="Space separated list of hosts", type="str")
-parser.add_option("-u", "--username", dest="username", 
+parser.add_option("-U", "--username", dest="username", 
         help="Username for the nitos hosts (usually root)", 
         type="str", default="root" )
 parser.add_option("-g", "--gateway", dest="gateway", 
         help="Nitos gateway hostname", 
         type="str", default="nitlab.inf.uth.gr")
-parser.add_option("-U", "--gateway-user", dest="gateway_username", 
-        help="Nitos gateway username", 
+parser.add_option("-u", "--gateway-user", dest="gateway_username", 
+        help="Nitos gateway username (slicename)", 
         type="str", default="nitlab.inf.uth.gr")
 parser.add_option("-i", "--ssh-key", dest="ssh_key", 
         help="Path to private SSH key to be used for connection", 
@@ -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="60s") 
 
 hosts = hosts.split(",")
 
@@ -96,13 +96,19 @@ 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")
-    ec.register_connection(app, node)
-   
-    apps.append(app)
+    modprobe_app = ec.register_resource("linux::Application")
+    ec.set(modprobe_app, "command", "modprobe ath5k && ip a | grep wlan0")
+    ec.register_connection(modprobe_app, node)
+    apps.append(modprobe_app)
+
+    rc_app = ec.register_resource("linux::Application")
+    ec.set(rc_app, "command", "service omf_rc stop; service omf_rc start")
+    ec.register_connection(rc_app, node)
+    apps.append(rc_app)
+
+print "This might take time..."
 
 ec.deploy(wait_all_ready=False)