aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2017-09-12 08:36:25 +0000
committerSander Vrijders <sander.vrijders@intec.ugent.be>2017-09-12 08:36:25 +0000
commite7a0deed26ec4015e783742da0796a77c589ce55 (patch)
tree0aa3a6e20804414bc1ddfb86da3a4892525061e0
parent715292ba092ea12c1fdad8a369608e348bec26ce (diff)
parent29efe42e64f50c69a0622a8403de72882a2495fe (diff)
downloadrumba-e7a0deed26ec4015e783742da0796a77c589ce55.tar.gz
rumba-e7a0deed26ec4015e783742da0796a77c589ce55.zip
Merge branch 'qemu-fix' into 'master'
testbeds: qemu: Add dev option to ip link set See merge request !62
-rw-r--r--rumba/testbeds/qemu.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py
index fee989f..47f4670 100644
--- a/rumba/testbeds/qemu.py
+++ b/rumba/testbeds/qemu.py
@@ -102,7 +102,7 @@ class Testbed(mod.Testbed):
ipcp.ifname = output
ssh_support.execute_command(
self, node.ssh_config,
- "ip link set %(ifname)s up"
+ "ip link set dev %(ifname)s up"
% {'ifname': ipcp.ifname})
def swap_in(self, experiment):
@@ -158,7 +158,7 @@ class Testbed(mod.Testbed):
ipcps = shim.ipcps
command_list = []
command_list += ('sudo brctl addbr %(br)s\n'
- 'sudo ip link set %(br)s up'
+ 'sudo ip link set dev %(br)s up'
% {'br': shim.name}
).split('\n')
for node in shim.members: # type:mod.Node
@@ -168,7 +168,7 @@ class Testbed(mod.Testbed):
tap_id = '%s.%02x' % (name, port_id)
command_list += ('sudo ip tuntap add mode tap name %(tap)s\n'
- 'sudo ip link set %(tap)s up\n'
+ 'sudo ip link set dev %(tap)s up\n'
'sudo brctl addif %(br)s %(tap)s'
% {'tap': tap_id, 'br': shim.name}
).split('\n')
@@ -369,7 +369,7 @@ class Testbed(mod.Testbed):
commands = []
commands += ('sudo brctl delif %(br)s %(tap)s\n'
- 'sudo ip link set %(tap)s down\n'
+ 'sudo ip link set dev %(tap)s down\n'
'sudo ip tuntap del mode tap name %(tap)s'
% {'tap': tap, 'br': shim.name}
).split('\n')
@@ -407,7 +407,7 @@ class Testbed(mod.Testbed):
for shim in self.shims:
commands = []
- commands += ('sudo ip link set %(br)s down\n'
+ commands += ('sudo ip link set dev %(br)s down\n'
'sudo brctl delbr %(br)s'
% {'br': shim.name}
).split('\n')