summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-05-15 17:03:23 +0200
committerChristian Poessinger <christian@poessinger.com>2021-05-15 17:03:23 +0200
commitcd504035015dca62149b57bc07d8e002bd8723b1 (patch)
treed4b3502d25c1eaeb4db17c18dd36df9a7c2cf96a
parentf931d316a6360e8b0e760d60a0c8fcc01e3ded13 (diff)
downloadvyos-1x-cd504035015dca62149b57bc07d8e002bd8723b1.tar.gz
vyos-1x-cd504035015dca62149b57bc07d8e002bd8723b1.zip
vyos.ifconfig: T3532: re-create Q-in-Q interface on protocol change
It is not possible to change the VLAN encapsulation protocol "on-the-fly". For this "quirk" we need to actively delete and re-create the VIF-S interface.
-rw-r--r--python/vyos/ifconfig/interface.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index a08872509..048a2cd19 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -36,6 +36,7 @@ from vyos.template import render
from vyos.util import mac2eui64
from vyos.util import dict_search
from vyos.util import read_file
+from vyos.util import get_interface_config
from vyos.template import is_ipv4
from vyos.validate import is_intf_addr_assigned
from vyos.validate import is_ipv6_link_local
@@ -1308,6 +1309,16 @@ class Interface(Control):
vif_s_ifname = f'{ifname}.{vif_s_id}'
vif_s_config['ifname'] = vif_s_ifname
+
+ # It is not possible to change the VLAN encapsulation protocol
+ # "on-the-fly". For this "quirk" we need to actively delete and
+ # re-create the VIF-S interface.
+ if self.exists(vif_s_ifname):
+ cur_cfg = get_interface_config(vif_s_ifname)
+ protocol = dict_search('linkinfo.info_data.protocol', cur_cfg).lower()
+ if protocol != vif_s_config['protocol']:
+ VLANIf(vif_s_ifname).remove()
+
s_vlan = VLANIf(vif_s_ifname, **tmp)
s_vlan.update(vif_s_config)