summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-27 17:49:36 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-27 17:49:36 +0100
commit6458f91735412fb2e6e7e37f7b3e6ca587a5a235 (patch)
tree35d6e35dc77894ed0fe77a802c85d80608beeac0
parentcda85a0ec7a74bd811d96714c02ba07ebf80b7e4 (diff)
downloadvyos-1x-6458f91735412fb2e6e7e37f7b3e6ca587a5a235.tar.gz
vyos-1x-6458f91735412fb2e6e7e37f7b3e6ca587a5a235.zip
vrf: vlan: T3438: do not automatically delete upper interface
Removing a VLAN (VIF) interface from the CLI always deleted all interfaces the kernel listed as "upper" in the /sys/class/net folder. This had the drawback that when deleting a VIF, also the VRF interface was simply deleted - killing all VRF related services.
-rw-r--r--python/vyos/ifconfig/interface.py21
1 files changed, 0 insertions, 21 deletions
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 5a1605a18..a61985da5 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -1325,27 +1325,6 @@ class VLANIf(Interface):
""" Specific class which abstracts 802.1q and 802.1ad (Q-in-Q) VLAN interfaces """
iftype = 'vlan'
- def remove(self):
- """
- Remove interface from operating system. Removing the interface
- deconfigures all assigned IP addresses and clear possible DHCP(v6)
- client processes.
-
- Example:
- >>> from vyos.ifconfig import Interface
- >>> VLANIf('eth0.10').remove
- """
- # Do we have sub interfaces (VLANs)? As interfaces need to be deleted
- # "in order" starting from Q-in-Q we delete them first.
- for upper in glob(f'/sys/class/net/{self.ifname}/upper*'):
- # an upper interface could be named: upper_bond0.1000.1100, thus
- # we need top drop the upper_ prefix
- vif_c = os.path.basename(upper)
- vif_c = vif_c.replace('upper_', '')
- VLANIf(vif_c).remove()
-
- super().remove()
-
def _create(self):
# bail out early if interface already exists
if self.exists(f'{self.ifname}'):