]> git.puffer.fish Git - matthieu/frr.git/commitdiff
ospf6_topo1: Remove ff00:/8 routes from Linux Table compare
authorMartin Winter <mwinter@opensourcerouting.org>
Wed, 31 May 2017 03:01:55 +0000 (20:01 -0700)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 28 Nov 2018 01:22:11 +0000 (20:22 -0500)
Some Ubuntu VM setups show ff00:/8 kernel routes, not a FRR issue

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
tests/topotests/ospf6-topo1/test_ospf6_topo1.py

index 8c2b80382dd5396cbff44a2548c0c843a58062a2..f72a8082e3de4498175d0b238f282eb1f76e5e82 100755 (executable)
@@ -333,6 +333,12 @@ def test_linux_ipv6_kernel_routingTable():
                 actual = actual.replace(ll[1], "fe80::__(%s)__" % ll[0])
             # Mask out protocol name or number
             actual = re.sub(r" proto [0-9a-z]+ ", " proto XXXX ", actual)
+            # Remove ff00::/8 routes (seen on some kernels - not from FRR)
+            actual = re.sub(r'ff00::/8.*', '', actual)
+
+            # Strip empty lines
+            actual = actual.lstrip()
+            actual = actual.rstrip()
 
             # Fix newlines (make them all the same)
             actual = ('\n'.join(actual.splitlines())).splitlines(1)