diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-28 18:14:18 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-28 18:14:18 +0100 |
| commit | bbfe367648be30a315db2fd69e197e1d63393327 (patch) | |
| tree | 45bc958d669f247839bb36457c84e867747ca07f /python/vyos/ifconfig/vxlan.py | |
| parent | 350180a60b9d80b189db51d8e643c9798192a812 (diff) | |
| download | vyos-1x-bbfe367648be30a315db2fd69e197e1d63393327.tar.gz vyos-1x-bbfe367648be30a315db2fd69e197e1d63393327.zip | |
vif: T3349: use fixed ordering when enabling parent and child interface
When a VIF/VLAN interface is placed in admin down state but the lower
interface, serving the vlan, is moved from admin down -> admin up, all its
vlan interfaces will be placed in admin up state, too.
This is bad as a VLAN interface will become admin up even if its specified as
admin down after a reboot.
To reproduce:
set interfaces ethernet eth1 vif 20 disable
set interfaces ethernet eth1 disable
commit
delete interfaces ethernet eth1 disable
commit
Now check the interface state and it returns UP,LOWER_UP
7: eth1.20@eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
link/ether 00:50:56:b3:09:07 brd ff:ff:ff:ff:ff:ff
inet6 fe80::250:56ff:feb3:907/64 scope link
valid_lft forever preferred_lft forever
(cherry picked from commit 49bc3f1e3ff8416908fc986bb60b444a75a1722d)
Diffstat (limited to 'python/vyos/ifconfig/vxlan.py')
| -rw-r--r-- | python/vyos/ifconfig/vxlan.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/python/vyos/ifconfig/vxlan.py b/python/vyos/ifconfig/vxlan.py index ad1f605ed..202e9d81c 100644 --- a/python/vyos/ifconfig/vxlan.py +++ b/python/vyos/ifconfig/vxlan.py @@ -94,22 +94,3 @@ class VXLANIf(Interface): cmd += ' {} {}'.format(self.mapping.get(key, key), value) self._cmd(cmd) - - def update(self, config): - """ General helper function which works on a dictionary retrived by - get_config_dict(). It's main intention is to consolidate the scattered - interface setup code and provide a single point of entry when workin - on any interface. """ - - # call base class first - super().update(config) - - # Enable/Disable of an interface must always be done at the end of the - # derived class to make use of the ref-counting set_admin_state() - # function. We will only enable the interface if 'up' was called as - # often as 'down'. This is required by some interface implementations - # as certain parameters can only be changed when the interface is - # in admin-down state. This ensures the link does not flap during - # reconfiguration. - state = 'down' if 'disable' in config else 'up' - self.set_admin_state(state) |