aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2020-06-01 12:28:58 +0200
committerDimitri Staessens <dimitri@ouroboros.rocks>2020-06-01 12:30:21 +0200
commitccbf22d67353b88ca18271584bc1b66c970a76a7 (patch)
tree4f24229b4e0f7413adc57a0adddfdc83735e2d55
parent788589ae595d7a757209556ae2ca4a789db0929d (diff)
downloadrumba-ccbf22d67353b88ca18271584bc1b66c970a76a7.tar.gz
rumba-ccbf22d67353b88ca18271584bc1b66c970a76a7.zip
prototypes: Update Rumba to Ouroboros 0.17
Registration CLI was revised to group name management under "irm name".
-rw-r--r--rumba/prototypes/ouroboros.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py
index b73e4b4..58c8ac2 100644
--- a/rumba/prototypes/ouroboros.py
+++ b/rumba/prototypes/ouroboros.py
@@ -63,7 +63,7 @@ class OurServer(sb.Server):
n_cmd = 'pid=$(%s) && ' % (o_cmd,)
# Build register command
- r_cmd = 'irm r n %s ' % (self.id,)
+ r_cmd = 'irm n r %s ' % (self.id,)
if len(self.difs) == 0:
r_cmd += ' '.join('ipcp %s' % (ipcp.name,) for ipcp in node.ipcps)
else:
@@ -214,13 +214,13 @@ class Experiment(mod.Experiment):
cmd += " " + comp + " " + pol
cmd += " layer " + ipcp.dif.name + " autobind"
- cmd2 = "irm r n " + ipcp.name
+ cmd2 = "irm n r " + ipcp.name
for dif_b in node.dif_registrations[ipcp.dif]:
for ipcp_b in node.ipcps:
if ipcp_b in dif_b.ipcps:
cmd2 += " ipcp " + ipcp_b.name
cmds2.append(cmd2)
- cmd2 = "irm r n " + ipcp.dif.name
+ cmd2 = "irm n r " + ipcp.dif.name
for dif_b in node.dif_registrations[ipcp.dif]:
for ipcp_b in node.ipcps:
if ipcp_b in dif_b.ipcps:
@@ -251,7 +251,7 @@ class Experiment(mod.Experiment):
time_out=None)
self.r_ipcps.pop(e['enroller'], None)
- cmd = "irm r n " + ipcp.name
+ cmd = "irm n r " + ipcp.name
for dif_b in e['enrollee'].node.dif_registrations[ipcp.dif]:
for ipcp_b in e['enrollee'].node.ipcps:
if ipcp_b in dif_b.ipcps:
@@ -260,7 +260,7 @@ class Experiment(mod.Experiment):
cmd = "irm i e n " + ipcp.name + " layer " + e['dif'].name + \
" autobind"
cmds.append(cmd)
- cmd = "irm r n " + ipcp.dif.name
+ cmd = "irm n r " + ipcp.dif.name
for dif_b in e['enrollee'].node.dif_registrations[ipcp.dif]:
for ipcp_b in e['enrollee'].node.ipcps:
if ipcp_b in dif_b.ipcps: