bgp_multiview_topo1: Mask out BGP Table version in comparison

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref
index 0e8bf842fd5544f126c921d628e08b7c649cd89d..6f1b1a10369dd2a3633715e775861e11b94faefc 100644 (file)
--- a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref
+++ b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref
@@ -1,4 +1,4 @@
-BGP table version is 0, local router ID is 172.30.1.1
+BGP table version is XXX, local router ID is 172.30.1.1
 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath,
               i internal, r RIB-failure, S Stale, R Removed
 Origin codes: i - IGP, e - EGP, ? - incomplete

diff --git a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref
index cfdbaeb99de007ed7caba4c40a17ef0de4243ab0..0230d25f539c45b0eb3b5e6bda90f7d94e38ce0d 100644 (file)
--- a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref
+++ b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref
@@ -1,4 +1,4 @@
-BGP table version is 0, local router ID is 172.30.1.1
+BGP table version is XXX, local router ID is 172.30.1.1
 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath,
               i internal, r RIB-failure, S Stale, R Removed
 Origin codes: i - IGP, e - EGP, ? - incomplete

diff --git a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref
index f0f471db8e3dff38ff6f16092a22613f9c94c876..b7e8c79d3c65720dfb60c80715f3f44ba2e5a7fe 100644 (file)
--- a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref
+++ b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref
@@ -1,4 +1,4 @@
-BGP table version is 0, local router ID is 172.30.1.1
+BGP table version is XXX, local router ID is 172.30.1.1
 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath,
               i internal, r RIB-failure, S Stale, R Removed
 Origin codes: i - IGP, e - EGP, ? - incomplete

diff --git a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
index 9ada8422cc4b0ec639b5e98065937f5280ffb849..3e548d6ff5e12cb392ec984dd23f3a9e396d60cd 100755 (executable)
--- a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
+++ b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
@@ -286,6 +286,8 @@ def test_bgp_routingTable():
                 actual = re.sub(r'Total number.*', '', actual)
                 actual = re.sub(r'Displayed.*', '', actual)
                 actual = actual.rstrip()
+                # Fix table version (ignore it)
+                actual = re.sub(r'(BGP table version is )[0-9]+', r'\1XXX', actual)
 
                 # Fix newlines (make them all the same)
                 actual = ('\n'.join(actual.splitlines()) + '\n').splitlines(1)