aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Capitani <m.capitani@nextworks.it>2017-06-08 16:37:16 +0200
committerMarco Capitani <m.capitani@nextworks.it>2017-06-08 16:37:16 +0200
commitfcdbe20a05764f84a7c95c4bf916a7569e373270 (patch)
tree61209d3d8cb312997fff99865df92d7bc3af940c
parent8432191cf9ed370aaf2a2e9792b546202dae0d07 (diff)
downloadrumba-fcdbe20a05764f84a7c95c4bf916a7569e373270.tar.gz
rumba-fcdbe20a05764f84a7c95c4bf916a7569e373270.zip
tools: democonf updated; irati: added sleep after ipcm start
-rw-r--r--rumba/prototypes/irati.py10
-rwxr-xr-xtools/democonf2rumba.py2
2 files changed, 3 insertions, 9 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py
index 1e75efc..2ae4723 100644
--- a/rumba/prototypes/irati.py
+++ b/rumba/prototypes/irati.py
@@ -88,12 +88,6 @@ class Experiment(mod.Experiment):
ssh.execute_proxy_commands(self.testbed, node.ssh_config,
cmds, time_out=None)
- def setup(self):
- for node in self.nodes:
- ssh.execute_command(self.testbed, node.ssh_config,
- "sudo nohup ipcm &> ipcm.log &",
- time_out=None)
-
def bootstrap_network(self):
"""Creates the network by enrolling and configuring the nodes"""
for node in self.nodes:
@@ -107,8 +101,6 @@ class Experiment(mod.Experiment):
def bootstrap_prototype(self):
logger.info("setting up")
- self.setup()
- logger.info("software initialized on all nodes")
self.conf_files = self.write_conf()
logger.info("configuration files generated for all nodes")
self.bootstrap_network()
@@ -178,6 +170,8 @@ class Experiment(mod.Experiment):
def enroll_nodes(self):
"""Runs the enrollments one by one, respecting dependencies"""
+ time.sleep(5)
+ logger.info("Waiting 5 seconds for the ipcm to start.")
for enrollment_list in self.enrollments:
for e in enrollment_list:
logger.info(
diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py
index 9c6d64f..dc2f0a4 100755
--- a/tools/democonf2rumba.py
+++ b/tools/democonf2rumba.py
@@ -210,7 +210,7 @@ if __name__ == '__main__':
required=True,
help='Certificate file')
jfed_p.add_argument('-H', '--exp_hours', metavar='HOURS', type=str,
- default=2, help='Experiment hours')
+ default="2", help='Experiment hours')
jfed_p.add_argument('-A', '--authority', metavar='AUTH', type=str,
default="wall2.ilabt.iminds.be",
help='Authority')