From 6503ca2369a5cc876f33bcbc41b10972602571ea Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Wed, 25 Oct 2017 18:35:42 +0200 Subject: prototypes, testbeds, ssh_support: Add several fixes This adds several fixes in order for rlite to function on the exogeni testbed. --- rumba/prototypes/irati.py | 17 ++++++++--------- rumba/prototypes/rlite.py | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'rumba/prototypes') diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index 53c8b16..757a66e 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -82,15 +82,14 @@ class Experiment(mod.Experiment): def install(self): """Installs IRATI on the nodes.""" cmds = [self.sudo("apt-get update"), - self.sudo("apt-get install g++ gcc " - "protobuf-compiler libprotobuf-dev git --yes " - "pkg-config " - "libnl-3-dev libnl-genl-3-dev"), - self.sudo("rm -rf ~/irati"), - "cd ~; git clone https://github.com/IRATI/stack irati", - "cd ~/irati && git checkout arcfire", - "cd ~/irati && " - + self.sudo("./install-from-scratch")] + self.sudo("apt-get install g++ gcc libtool " + "linux-headers-$(uname -r) autoconf automake " + "protobuf-compiler=2.6.1-1 libprotobuf-dev=2.6.1-1 " + "git pkg-config libssl-dev=1.0.1k-3 --yes"), + self.sudo("rm -rf ~/stack"), + "cd ~; git clone -b arcfire https://github.com/IRATI/stack", + "cd ~/stack && " + + self.sudo("./configure && ") + self.sudo("make install")] for node in self.nodes: ssh.execute_proxy_commands(self.testbed, node.ssh_config, diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py index 3700640..6d28432 100644 --- a/rumba/prototypes/rlite.py +++ b/rumba/prototypes/rlite.py @@ -63,7 +63,7 @@ class Experiment(mod.Experiment): "modprobe rlite-shim-eth", "modprobe rlite-shim-udp4", "modprobe rlite-shim-loopback", - "rlite-uipcps -v DBG &> uipcp.log &"] + "rlite-uipcps -v DBG >uipcp.log 2>&1 &"] self.may_sudo(cmds) for node in self.nodes: -- cgit v1.2.3