aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@ugent.be>2017-12-07 17:16:21 +0100
committerDimitri Staessens <dimitri.staessens@ugent.be>2017-12-07 18:38:46 +0100
commitb1c47901dd492a24926f2b9843c3ec15fc62393a (patch)
tree7e0d628d089f5c28356209174a3af74960dea6d0
parent9eba54236c54f0cd16be899ce254a38bec97af42 (diff)
downloadrumba-b1c47901dd492a24926f2b9843c3ec15fc62393a.tar.gz
rumba-b1c47901dd492a24926f2b9843c3ec15fc62393a.zip
prototypes: Use autobind option for ouroboros
The ouroboros irm commands were updated to bind the ipcp instance to the dif and ipcp names automatically.
-rw-r--r--rumba/prototypes/ouroboros.py16
1 files changed, 7 insertions, 9 deletions
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