From b1c47901dd492a24926f2b9843c3ec15fc62393a Mon Sep 17 00:00:00 2001
From: Dimitri Staessens <dimitri.staessens@ugent.be>
Date: Thu, 7 Dec 2017 17:16:21 +0100
Subject: prototypes: Use autobind option for ouroboros

The ouroboros irm commands were updated to bind the ipcp instance to
the dif and ipcp names automatically.
---
 rumba/prototypes/ouroboros.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'rumba/prototypes/ouroboros.py')

diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py
index 050ec9c..8cfd68c 100644
--- a/rumba/prototypes/ouroboros.py
+++ b/rumba/prototypes/ouroboros.py
@@ -65,8 +65,9 @@ class Experiment(mod.Experiment):
                 "git clone -b be git://ouroboros.ilabt.imec.be/ouroboros " +
                 "~/ouroboros",
                 "cd ~/ouroboros && mkdir build && cd build && " +
-                "cmake -DCMAKE_BUILD_TYPE=Debug .. && sudo make install " +
-                "-j$(nproc)"]
+                "cmake -DCMAKE_BUILD_TYPE=Debug -DCONNECT_TIMEOUT=60000 " + \
+                "-DREG_TIMEOUT=60000 -DQUERY_TIMEOUT=4000 .. && " + \
+                "sudo make install -j$(nproc)"]
 
         names = []
         executors = []
@@ -85,7 +86,7 @@ class Experiment(mod.Experiment):
             for ipcp in node.ipcps:
                 cmds2 = list()
                 if ipcp.dif_bootstrapper:
-                    cmd = "irm i b n " + ipcp.name
+                    cmd = "irm i b n " + ipcp.name + " autobind"
                 else:
                     cmd = "irm i c n " + ipcp.name
 
@@ -99,8 +100,6 @@ class Experiment(mod.Experiment):
                     cmd += " type normal"
                     if ipcp.dif_bootstrapper:
                         cmd += " dif " + ipcp.dif.name
-                        cmd2 = "irm b i " + ipcp.name + " name " + ipcp.dif.name
-                        cmds2.append(cmd2)
                         cmd2 = "irm r n " + ipcp.name
                         for dif_b in node.dif_registrations[ipcp.dif]:
                             cmd2 += " dif " + dif_b.name
@@ -128,14 +127,13 @@ class Experiment(mod.Experiment):
         for e in el:
             ipcp = e['enrollee']
             cmds = list()
-            cmd = "irm i e n " + ipcp.name + " dif " + e['dif'].name
-            cmds.append(cmd)
-            cmd = "irm b i " + ipcp.name + " name " + ipcp.dif.name
-            cmds.append(cmd)
             cmd = "irm r n " + ipcp.name
             for dif_b in e['enrollee'].node.dif_registrations[ipcp.dif]:
                 cmd += " dif " + dif_b.name
             cmds.append(cmd)
+            cmd = "irm i e n " + ipcp.name + " dif " + e['dif'].name + \
+                  " autobind"
+            cmds.append(cmd)
             cmd = "irm r n " + ipcp.dif.name
             for dif_b in e['enrollee'].node.dif_registrations[ipcp.dif]:
                 cmd += " dif " + dif_b.name
-- 
cgit v1.2.3