diff options
Diffstat (limited to 'rumba')
| -rw-r--r-- | rumba/prototypes/ouroboros.py | 16 | ||||
| -rw-r--r-- | rumba/testbeds/dockertb.py | 2 | ||||
| -rw-r--r-- | rumba/testbeds/local.py | 3 | ||||
| -rw-r--r-- | rumba/testbeds/qemu.py | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py index 573e336..e72bcf1 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -150,11 +150,15 @@ class Experiment(mod.Experiment): cmd2 = "irm r n " + ipcp.name for dif_b in node.dif_registrations[ipcp.dif]: - cmd2 += " layer " + dif_b.name + 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 for dif_b in node.dif_registrations[ipcp.dif]: - cmd2 += " layer " + dif_b.name + for ipcp_b in node.ipcps: + if ipcp_b in dif_b.ipcps: + cmd2 += " ipcp " + ipcp_b.name cmds2.append(cmd2) elif isinstance(ipcp.dif, mod.ShimUDPDIF): # FIXME: Will fail, since we don't keep IPs yet @@ -183,14 +187,18 @@ class Experiment(mod.Experiment): cmd = "irm r n " + ipcp.name for dif_b in e['enrollee'].node.dif_registrations[ipcp.dif]: - cmd += " layer " + dif_b.name + for ipcp_b in e['enrollee'].node.ipcps: + if ipcp_b in dif_b.ipcps: + cmd += " ipcp " + ipcp_b.name cmds.append(cmd) 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 += " layer " + dif_b.name + for ipcp_b in e['enrollee'].node.ipcps: + if ipcp_b in dif_b.ipcps: + cmd += " ipcp " + ipcp_b.name cmds.append(cmd) e['enrollee'].node.execute_commands(cmds, time_out=None) diff --git a/rumba/testbeds/dockertb.py b/rumba/testbeds/dockertb.py index dca2b86..4079ffe 100644 --- a/rumba/testbeds/dockertb.py +++ b/rumba/testbeds/dockertb.py @@ -39,7 +39,7 @@ class Testbed(mod.Testbed): """ Represents a docker testbed. """ - def __init__(self, exp_name, base_image, pull_image=True, + def __init__(self, base_image, exp_name='foo', pull_image=True, use_ovs=False): """ Initializes the testbed class. diff --git a/rumba/testbeds/local.py b/rumba/testbeds/local.py index a3f4570..8b57ed2 100644 --- a/rumba/testbeds/local.py +++ b/rumba/testbeds/local.py @@ -38,7 +38,8 @@ class Testbed(mod.Testbed): processes locally. Also useful for debugging in the other plugins. """ - def __init__(self, exp_name, username, proj_name="ARCFIRE", password=""): + def __init__(self, exp_name='foo', username='bar', + proj_name="ARCFIRE", password=""): """ Initializes the parent class. diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index a09229b..2a42472 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -53,7 +53,7 @@ class Testbed(mod.Testbed): """ Represents a QEMU testbed. """ - def __init__(self, exp_name, bzimage_path=None, initramfs_path=None, + def __init__(self, exp_name='foo', bzimage_path=None, initramfs_path=None, proj_name="ARCFIRE", password="root", username="root", public_key_path=os.path.join(USER_HOME, '.ssh', 'id_rsa.pub'), use_vhost=True): |