Merge pull request #2701 from johannaengland/vlan-patterns-checkpoint

Associate checkpoint VLAN interfaces with VLANs
Uninett · Nov 1, 2023 · a5d5319 · a5d5319
2 parents e879e67 + fc4402b
commit a5d5319
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/python/nav/ipdevpoll/plugins/prefix.py b/python/nav/ipdevpoll/plugins/prefix.py
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2008-2012 Uninett AS
-# Copyright (C) 2022 Sikt
+# Copyright (C) 2022-2023 Sikt
 #
 # This file is part of Network Administration Visualized (NAV).
 #
@@ -51,7 +51,7 @@
 from nav.ipdevpoll import shadows
 
 VLAN_PATTERN = re.compile(
-    r"(Vl(an)?|irb\.|reth\d+\.)(?P<vlan>\d+)",
+    r"(Vl(an)?|irb\.|reth\d+\.|bond\d+\.)(?P<vlan>\d+)",
     re.IGNORECASE,
 )
 

diff --git a/tests/unittests/ipdevpoll/prefix_test.py b/tests/unittests/ipdevpoll/prefix_test.py
@@ -95,7 +95,12 @@ def test_cisco_short_names_should_match(self):
 
     def test_juniper_irb_names_should_match(self):
         match = prefix.VLAN_PATTERN.match("irb." + self.vlan)
+        self.assertEqual(match.group('vlan'), self.vlan)
 
     def test_juniper_reth_names_should_match(self):
         match = prefix.VLAN_PATTERN.match("reth0." + self.vlan)
         self.assertEqual(match.group('vlan'), self.vlan)
+
+    def test_checkpoint_vlan_names_should_match(self):
+        match = prefix.VLAN_PATTERN.match("bond0." + self.vlan)
+        self.assertEqual(match.group('vlan'), self.vlan)