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

[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 34d2e3f..452114f 100644 (file)
--- a/examples/omf/nitos_testbed_bootstrap.py
+++ b/examples/omf/nitos_testbed_bootstrap.py
@@ -36,19 +36,19 @@ from nepi.execution.resource import ResourceAction, ResourceState
 from optparse import OptionParser\r
 import os\r
 \r
-usage = ("usage: %prog -H <list-of-nitos-hosts> -u <nitos-username> -i <ssh-key> -g <nitos-gateway> -U <nitos-gateway-username>")\r
+usage = ("usage: %prog -H <list-of-nitos-hosts> -U <node-username> -i <ssh-key> -g <nitos-gateway> -u <slicename>")\r
 \r
 parser = OptionParser(usage = usage)\r
 parser.add_option("-H", "--hosts", dest="hosts", \r
         help="Space separated list of hosts", type="str")\r
-parser.add_option("-u", "--username", dest="username", \r
+parser.add_option("-U", "--username", dest="username", \r
         help="Username for the nitos hosts (usually root)", \r
         type="str", default="root" )\r
 parser.add_option("-g", "--gateway", dest="gateway", \r
         help="Nitos gateway hostname", \r
         type="str", default="nitlab.inf.uth.gr")\r
-parser.add_option("-U", "--gateway-user", dest="gateway_username", \r
-        help="Nitos gateway username", \r
+parser.add_option("-u", "--gateway-user", dest="gateway_username", \r
+        help="Nitos gateway username (slicename)", \r
         type="str", default="nitlab.inf.uth.gr")\r
 parser.add_option("-i", "--ssh-key", dest="ssh_key", \r
         help="Path to private SSH key to be used for connection", \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="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