From f6c44df78f5350a711254c449425d8912ee99a45 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Wed, 26 Apr 2017 05:30:50 -0700 Subject: [PATCH] ospf6-topo1: Update to ignore the proto type in linux kernel table Signed-off-by: Martin Winter --- .../topotests/ospf6-topo1/r1/ip_6_address.ref | 26 ++++++++--------- .../topotests/ospf6-topo1/r2/ip_6_address.ref | 26 ++++++++--------- .../topotests/ospf6-topo1/r3/ip_6_address.ref | 28 +++++++++---------- .../topotests/ospf6-topo1/r4/ip_6_address.ref | 26 ++++++++--------- .../topotests/ospf6-topo1/test_ospf6_topo1.py | 2 ++ 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/tests/topotests/ospf6-topo1/r1/ip_6_address.ref b/tests/topotests/ospf6-topo1/r1/ip_6_address.ref index 2f7e246c15..e0600a5ba1 100644 --- a/tests/topotests/ospf6-topo1/r1/ip_6_address.ref +++ b/tests/topotests/ospf6-topo1/r1/ip_6_address.ref @@ -1,13 +1,13 @@ -fc00:1:1:1::/64 dev r1-stubnet proto kernel metric 256 pref medium -fc00:2:2:2::/64 via fe80::__(r2-sw5)__ dev r1-sw5 proto zebra metric 20 pref medium -fc00:3:3:3::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto zebra metric 20 pref medium -fc00:4:4:4::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto zebra metric 20 pref medium -fc00:a:a:a::/64 dev r1-sw5 proto kernel metric 256 pref medium -fc00:b:b:b::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto zebra metric 20 pref medium -fc00:1111:1111:1111::/64 via fc00:1:1:1::1234 dev r1-stubnet proto zebra metric 20 pref medium -fc00:2222:2222:2222::/64 via fe80::__(r2-sw5)__ dev r1-sw5 proto zebra metric 20 pref medium -fc00:3333:3333:3333::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto zebra metric 20 pref medium -fc00:4444:4444:4444::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto zebra metric 20 pref medium -unreachable fe80::/64 dev lo proto kernel metric 256 error -101 pref medium -fe80::/64 dev r1-stubnet proto kernel metric 256 pref medium -fe80::/64 dev r1-sw5 proto kernel metric 256 pref medium +fc00:1:1:1::/64 dev r1-stubnet proto XXXX metric 256 pref medium +fc00:2:2:2::/64 via fe80::__(r2-sw5)__ dev r1-sw5 proto XXXX metric 20 pref medium +fc00:3:3:3::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto XXXX metric 20 pref medium +fc00:4:4:4::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto XXXX metric 20 pref medium +fc00:a:a:a::/64 dev r1-sw5 proto XXXX metric 256 pref medium +fc00:b:b:b::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto XXXX metric 20 pref medium +fc00:1111:1111:1111::/64 via fc00:1:1:1::1234 dev r1-stubnet proto XXXX metric 20 pref medium +fc00:2222:2222:2222::/64 via fe80::__(r2-sw5)__ dev r1-sw5 proto XXXX metric 20 pref medium +fc00:3333:3333:3333::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto XXXX metric 20 pref medium +fc00:4444:4444:4444::/64 via fe80::__(r3-sw5)__ dev r1-sw5 proto XXXX metric 20 pref medium +unreachable fe80::/64 dev lo proto XXXX metric 256 error -101 pref medium +fe80::/64 dev r1-stubnet proto XXXX metric 256 pref medium +fe80::/64 dev r1-sw5 proto XXXX metric 256 pref medium diff --git a/tests/topotests/ospf6-topo1/r2/ip_6_address.ref b/tests/topotests/ospf6-topo1/r2/ip_6_address.ref index 5dd539f038..24bc071d12 100644 --- a/tests/topotests/ospf6-topo1/r2/ip_6_address.ref +++ b/tests/topotests/ospf6-topo1/r2/ip_6_address.ref @@ -1,13 +1,13 @@ -fc00:1:1:1::/64 via fe80::__(r1-sw5)__ dev r2-sw5 proto zebra metric 20 pref medium -fc00:2:2:2::/64 dev r2-stubnet proto kernel metric 256 pref medium -fc00:3:3:3::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto zebra metric 20 pref medium -fc00:4:4:4::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto zebra metric 20 pref medium -fc00:a:a:a::/64 dev r2-sw5 proto kernel metric 256 pref medium -fc00:b:b:b::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto zebra metric 20 pref medium -fc00:1111:1111:1111::/64 via fe80::__(r1-sw5)__ dev r2-sw5 proto zebra metric 20 pref medium -fc00:2222:2222:2222::/64 via fc00:2:2:2::1234 dev r2-stubnet proto zebra metric 20 pref medium -fc00:3333:3333:3333::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto zebra metric 20 pref medium -fc00:4444:4444:4444::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto zebra metric 20 pref medium -unreachable fe80::/64 dev lo proto kernel metric 256 error -101 pref medium -fe80::/64 dev r2-stubnet proto kernel metric 256 pref medium -fe80::/64 dev r2-sw5 proto kernel metric 256 pref medium +fc00:1:1:1::/64 via fe80::__(r1-sw5)__ dev r2-sw5 proto XXXX metric 20 pref medium +fc00:2:2:2::/64 dev r2-stubnet proto XXXX metric 256 pref medium +fc00:3:3:3::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto XXXX metric 20 pref medium +fc00:4:4:4::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto XXXX metric 20 pref medium +fc00:a:a:a::/64 dev r2-sw5 proto XXXX metric 256 pref medium +fc00:b:b:b::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto XXXX metric 20 pref medium +fc00:1111:1111:1111::/64 via fe80::__(r1-sw5)__ dev r2-sw5 proto XXXX metric 20 pref medium +fc00:2222:2222:2222::/64 via fc00:2:2:2::1234 dev r2-stubnet proto XXXX metric 20 pref medium +fc00:3333:3333:3333::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto XXXX metric 20 pref medium +fc00:4444:4444:4444::/64 via fe80::__(r3-sw5)__ dev r2-sw5 proto XXXX metric 20 pref medium +unreachable fe80::/64 dev lo proto XXXX metric 256 error -101 pref medium +fe80::/64 dev r2-stubnet proto XXXX metric 256 pref medium +fe80::/64 dev r2-sw5 proto XXXX metric 256 pref medium diff --git a/tests/topotests/ospf6-topo1/r3/ip_6_address.ref b/tests/topotests/ospf6-topo1/r3/ip_6_address.ref index ce54ceced9..eda7c4fc9b 100644 --- a/tests/topotests/ospf6-topo1/r3/ip_6_address.ref +++ b/tests/topotests/ospf6-topo1/r3/ip_6_address.ref @@ -1,14 +1,14 @@ -fc00:1:1:1::/64 via fe80::__(r1-sw5)__ dev r3-sw5 proto zebra metric 20 pref medium -fc00:2:2:2::/64 via fe80::__(r2-sw5)__ dev r3-sw5 proto zebra metric 20 pref medium -fc00:3:3:3::/64 dev r3-stubnet proto kernel metric 256 pref medium -fc00:4:4:4::/64 via fe80::__(r4-sw6)__ dev r3-sw6 proto zebra metric 20 pref medium -fc00:a:a:a::/64 dev r3-sw5 proto kernel metric 256 pref medium -fc00:b:b:b::/64 dev r3-sw6 proto kernel metric 256 pref medium -fc00:1111:1111:1111::/64 via fe80::__(r1-sw5)__ dev r3-sw5 proto zebra metric 20 pref medium -fc00:2222:2222:2222::/64 via fe80::__(r2-sw5)__ dev r3-sw5 proto zebra metric 20 pref medium -fc00:3333:3333:3333::/64 via fc00:3:3:3::1234 dev r3-stubnet proto zebra metric 20 pref medium -fc00:4444:4444:4444::/64 via fe80::__(r4-sw6)__ dev r3-sw6 proto zebra metric 20 pref medium -unreachable fe80::/64 dev lo proto kernel metric 256 error -101 pref medium -fe80::/64 dev r3-stubnet proto kernel metric 256 pref medium -fe80::/64 dev r3-sw5 proto kernel metric 256 pref medium -fe80::/64 dev r3-sw6 proto kernel metric 256 pref medium +fc00:1:1:1::/64 via fe80::__(r1-sw5)__ dev r3-sw5 proto XXXX metric 20 pref medium +fc00:2:2:2::/64 via fe80::__(r2-sw5)__ dev r3-sw5 proto XXXX metric 20 pref medium +fc00:3:3:3::/64 dev r3-stubnet proto XXXX metric 256 pref medium +fc00:4:4:4::/64 via fe80::__(r4-sw6)__ dev r3-sw6 proto XXXX metric 20 pref medium +fc00:a:a:a::/64 dev r3-sw5 proto XXXX metric 256 pref medium +fc00:b:b:b::/64 dev r3-sw6 proto XXXX metric 256 pref medium +fc00:1111:1111:1111::/64 via fe80::__(r1-sw5)__ dev r3-sw5 proto XXXX metric 20 pref medium +fc00:2222:2222:2222::/64 via fe80::__(r2-sw5)__ dev r3-sw5 proto XXXX metric 20 pref medium +fc00:3333:3333:3333::/64 via fc00:3:3:3::1234 dev r3-stubnet proto XXXX metric 20 pref medium +fc00:4444:4444:4444::/64 via fe80::__(r4-sw6)__ dev r3-sw6 proto XXXX metric 20 pref medium +unreachable fe80::/64 dev lo proto XXXX metric 256 error -101 pref medium +fe80::/64 dev r3-stubnet proto XXXX metric 256 pref medium +fe80::/64 dev r3-sw5 proto XXXX metric 256 pref medium +fe80::/64 dev r3-sw6 proto XXXX metric 256 pref medium diff --git a/tests/topotests/ospf6-topo1/r4/ip_6_address.ref b/tests/topotests/ospf6-topo1/r4/ip_6_address.ref index e7307f0088..a9c597756d 100644 --- a/tests/topotests/ospf6-topo1/r4/ip_6_address.ref +++ b/tests/topotests/ospf6-topo1/r4/ip_6_address.ref @@ -1,13 +1,13 @@ -fc00:1:1:1::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto zebra metric 20 pref medium -fc00:2:2:2::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto zebra metric 20 pref medium -fc00:3:3:3::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto zebra metric 20 pref medium -fc00:4:4:4::/64 dev r4-stubnet proto kernel metric 256 pref medium -fc00:a:a:a::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto zebra metric 20 pref medium -fc00:b:b:b::/64 dev r4-sw6 proto kernel metric 256 pref medium -fc00:1111:1111:1111::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto zebra metric 20 pref medium -fc00:2222:2222:2222::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto zebra metric 20 pref medium -fc00:3333:3333:3333::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto zebra metric 20 pref medium -fc00:4444:4444:4444::/64 via fc00:4:4:4::1234 dev r4-stubnet proto zebra metric 20 pref medium -unreachable fe80::/64 dev lo proto kernel metric 256 error -101 pref medium -fe80::/64 dev r4-stubnet proto kernel metric 256 pref medium -fe80::/64 dev r4-sw6 proto kernel metric 256 pref medium +fc00:1:1:1::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto XXXX metric 20 pref medium +fc00:2:2:2::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto XXXX metric 20 pref medium +fc00:3:3:3::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto XXXX metric 20 pref medium +fc00:4:4:4::/64 dev r4-stubnet proto XXXX metric 256 pref medium +fc00:a:a:a::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto XXXX metric 20 pref medium +fc00:b:b:b::/64 dev r4-sw6 proto XXXX metric 256 pref medium +fc00:1111:1111:1111::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto XXXX metric 20 pref medium +fc00:2222:2222:2222::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto XXXX metric 20 pref medium +fc00:3333:3333:3333::/64 via fe80::__(r3-sw6)__ dev r4-sw6 proto XXXX metric 20 pref medium +fc00:4444:4444:4444::/64 via fc00:4:4:4::1234 dev r4-stubnet proto XXXX metric 20 pref medium +unreachable fe80::/64 dev lo proto XXXX metric 256 error -101 pref medium +fe80::/64 dev r4-stubnet proto XXXX metric 256 pref medium +fe80::/64 dev r4-sw6 proto XXXX metric 256 pref medium diff --git a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py index 963e49e719..10256bc4a6 100755 --- a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py +++ b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py @@ -342,6 +342,8 @@ def test_linux_ipv6_kernel_routingTable(): # Mask out Link-Local mac addresses for ll in linklocals: 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) # Fix newlines (make them all the same) actual = ('\n'.join(actual.splitlines())).splitlines(1) -- 2.39.5