aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rumba/prototypes/ouroboros.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py
index 8cfd68c..055ed43 100644
--- a/rumba/prototypes/ouroboros.py
+++ b/rumba/prototypes/ouroboros.py
@@ -94,24 +94,24 @@ class Experiment(mod.Experiment):
# NOTE: Here to test with fake testbed
if ipcp.ifname is None:
ipcp.ifname = "eth0"
- cmd += " type shim-eth-llc if_name " + ipcp.ifname
- cmd += " dif " + ipcp.dif.name
+ cmd += " type eth-llc if_name " + ipcp.ifname
+ cmd += " layer " + ipcp.dif.name
elif isinstance(ipcp.dif, mod.NormalDIF):
cmd += " type normal"
if ipcp.dif_bootstrapper:
- cmd += " dif " + ipcp.dif.name
+ cmd += " layer " + ipcp.dif.name
cmd2 = "irm r n " + ipcp.name
for dif_b in node.dif_registrations[ipcp.dif]:
- cmd2 += " dif " + dif_b.name
+ cmd2 += " layer " + dif_b.name
cmds2.append(cmd2)
cmd2 = "irm r n " + ipcp.dif.name
for dif_b in node.dif_registrations[ipcp.dif]:
- cmd2 += " dif " + dif_b.name
+ cmd2 += " layer " + dif_b.name
cmds2.append(cmd2)
elif isinstance(ipcp.dif, mod.ShimUDPDIF):
# FIXME: Will fail, since we don't keep IPs yet
- cmd += " type shim-udp"
- cmd += " dif " + ipcp.dif.name
+ cmd += " type udp"
+ cmd += " layer " + ipcp.dif.name
else:
logger.error("Unsupported IPCP type")
continue
@@ -129,14 +129,14 @@ class Experiment(mod.Experiment):
cmds = list()
cmd = "irm r n " + ipcp.name
for dif_b in e['enrollee'].node.dif_registrations[ipcp.dif]:
- cmd += " dif " + dif_b.name
+ cmd += " layer " + dif_b.name
cmds.append(cmd)
- cmd = "irm i e n " + ipcp.name + " dif " + e['dif'].name + \
+ cmd = "irm i e n " + ipcp.name + " layer " + 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
+ cmd += " layer " + dif_b.name
cmds.append(cmd)
ssh.execute_commands(self.testbed,