diff options
| author | vmaffione <v.maffione@gmail.com> | 2017-04-19 17:28:16 +0000 |
|---|---|---|
| committer | vmaffione <v.maffione@gmail.com> | 2017-04-19 17:28:16 +0000 |
| commit | a4879434ae2fc47f1514d1af180ed2191be7cb53 (patch) | |
| tree | 4c2a4be14e1aa82cacc6041b28054478087b2284 /rumba/testbeds | |
| parent | 558682e5b59e1a62b92368a37d90cd2249e313c3 (diff) | |
| parent | 91d22038f85b1f8a9e20772d5f6a6f7ad37963f2 (diff) | |
| download | rumba-a4879434ae2fc47f1514d1af180ed2191be7cb53.tar.gz rumba-a4879434ae2fc47f1514d1af180ed2191be7cb53.zip | |
Merge branch 'irati-issues' into 'master'
Fixes for issues #4 and #5 (irati plugin and vlans)
See merge request !34
Diffstat (limited to 'rumba/testbeds')
| -rw-r--r-- | rumba/testbeds/qemu.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index d998625..40899d7 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -95,16 +95,10 @@ class Testbed(mod.Testbed): node.ssh_config, 'mac2ifname ' + mac) ipcp.ifname = output - try: - vlan = int(port['shim'].name) - except ValueError: - vlan = assigned_vlan.get(port['shim'].name, None) - if vlan is None: - vlan = next_vlan - next_vlan += 10 - assigned_vlan[port['shim'].name] = vlan - ssh_support.setup_vlan(self, node, - vlan, ipcp.ifname) + ssh_support.execute_command( + self, node.ssh_config, + "ip link set %(ifname)s up" + % {'ifname': ipcp.ifname}) def swap_in(self, experiment): """ |