Merge pull request #2874 from vyos/mergify/bp/sagitta/pr-2867

ethernet: T4638: add smoketests verifying there are no stale VLAN interfaces left (backport #2867)

1 files changed, 8 insertions, 5 deletions

diff --git a/smoketest/scripts/cli/test_interfaces_ethernet.py b/smoketest/scripts/cli/test_interfaces_ethernet.py
index a39b81348..e414f18cb 100755
--- a/smoketest/scripts/cli/test_interfaces_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_ethernet.py
@@ -141,15 +141,18 @@ class EthernetInterfaceTest(BasicInterfaceTest.TestCase):
 
         # Verify that no address remains on the system as this is an eternal
         # interface.
-        for intf in self._interfaces:
-            self.assertNotIn(AF_INET, ifaddresses(intf))
+        for interface in self._interfaces:
+            self.assertNotIn(AF_INET, ifaddresses(interface))
             # required for IPv6 link-local address
-            self.assertIn(AF_INET6, ifaddresses(intf))
-            for addr in ifaddresses(intf)[AF_INET6]:
+            self.assertIn(AF_INET6, ifaddresses(interface))
+            for addr in ifaddresses(interface)[AF_INET6]:
                 # checking link local addresses makes no sense
                 if is_ipv6_link_local(addr['addr']):
                     continue
-                self.assertFalse(is_intf_addr_assigned(intf, addr['addr']))
+                self.assertFalse(is_intf_addr_assigned(interface, addr['addr']))
+            # Ensure no VLAN interfaces are left behind
+            tmp = [x for x in Section.interfaces('ethernet') if x.startswith(f'{interface}.')]
+            self.assertListEqual(tmp, [])
 
     def test_offloading_rps(self):
         # enable RPS on all available CPUs, RPS works with a CPU bitmask,