jfed-irati small fixes for compatibility

2 files changed, 15 insertions, 14 deletions

diff --git a/rumba/prototypes/enroll.py b/rumba/prototypes/enroll.py
index 458736a..99b49a6 100755
--- a/rumba/prototypes/enroll.py
+++ b/rumba/prototypes/enroll.py
@@ -78,8 +78,8 @@ if connected:
         get_response(s)
 
         # Send the IPCP list command
-        cmd = 'list-ipcps\n'
-        s.sendall(bytes(cmd, 'ascii'))
+        cmd = u'list-ipcps\n'
+        s.sendall(cmd.encode('ascii'))
 
         # Get the list of IPCPs and parse it to look for the enroller ID
         print('Looking up identifier for IPCP %s' % args.enrollee_name)
@@ -98,11 +98,11 @@ if connected:
             raise Exception()
 
         # Send the enroll command
-        cmd = 'enroll-to-dif %s %s %s %s 1\n' \
+        cmd = u'enroll-to-dif %s %s %s %s 1\n' \
                 % (enrollee_id, args.dif, args.lower_dif, args.enroller_name)
         print(cmd)
 
-        s.sendall(bytes(cmd, 'ascii'))
+        s.sendall(cmd.encode('ascii'))
 
         # Get the enroll command answer
         lines = get_response(s)
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py
index b2f54d9..c630a94 100644
--- a/rumba/prototypes/irati.py
+++ b/rumba/prototypes/irati.py
@@ -21,8 +21,6 @@
 import copy
 import json
 
-import subprocess
-
 import os
 import time
 
@@ -69,14 +67,17 @@ class Experiment(mod.Experiment):
 
     def install(self):
         """Installs IRATI on the nodes."""
-        cmds = list()
-
-        cmds.append("sudo apt-get update")
-        cmds.append("sudo apt-get install g++ gcc "
-                    "protobuf-compiler libprotobuf-dev git --yes")
-        cmds.append("sudo rm -rf ~/irati")
-        cmds.append("cd && git clone https://github.com/IRATI/stack irati")
-        cmds.append("cd ~/irati && sudo ./install-from-scratch")
+        cmds = ["sudo apt-get update",
+                "export https_proxy=\"https://proxy.atlantis.ugent.be:8080\"; "
+                "sudo apt-get install g++ gcc "
+                "protobuf-compiler libprotobuf-dev git --yes",
+                "sudo rm -rf ~/irati",
+                "cd ~; "
+                "export https_proxy=\"https://proxy.atlantis.ugent.be:8080\"; "
+                "git clone https://github.com/IRATI/stack irati",
+                "cd ~/irati; git checkout arcfire",
+                "cd ~/irati; cp linux/config-IRATI linux/.config",
+                "cd ~/irati && sudo ./install-from-scratch"]
 
         for node in self.nodes:
             ssh.execute_commands(self.testbed, node.ssh_config,