diff options
| author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2017-11-15 00:03:05 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-11-15 17:06:01 +0100 |
| commit | 2e91ca33f90f7c74887013e08c95bb00cdd4fc00 (patch) | |
| tree | 7f12aa13b45eb9e91d495b8c67b313e24585701b /rumba/prototypes/irati.py | |
| parent | 0801eba70daacddd5692543dea013e85a82ef76b (diff) | |
| download | rumba-2e91ca33f90f7c74887013e08c95bb00cdd4fc00.tar.gz rumba-2e91ca33f90f7c74887013e08c95bb00cdd4fc00.zip | |
prototypes: Fix VLAN setup for IRATI on Ubuntu
Some exogeni nodes have scripts that auto-rename interfaces in a way
that causes conflicts with VLAN setup for IRATI. This removes those
scripts and restarts the network daemon for the changes to take
effect.
Diffstat (limited to 'rumba/prototypes/irati.py')
| -rw-r--r-- | rumba/prototypes/irati.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index 6a0b0f5..3a64ede 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -123,13 +123,13 @@ class Experiment(mod.Experiment): """ name = node.name - logger.info('Setting up vlans for node %s', node.name) + vlans = [] for ipcp in node.ipcps: if isinstance(ipcp, mod.ShimEthIPCP): - if_name = ipcp.ifname - vlan = self.shim2vlan[ipcp.dif.name] - ssh.setup_vlan(self.testbed, node, - vlan, if_name) + vlans.append([ipcp.ifname, self.shim2vlan[ipcp.dif.name]]) + + if vlans: + ssh.setup_vlans(self.testbed, node, vlans) gen_files_conf = self.conf_files[node] + ['da.map'] dir_path = os.path.dirname(os.path.abspath(__file__)) |