test: Fix tests for zebra changes

Remove use of `ip multicast rpf-lookup-mode` from unrelated tests.
Looks like this test was just unlucky enough to pick that command as an
example for use here. Just changed it to something less likely to be
removed in the future.
Update route table output to include AFI SAFI output.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>

diff --git a/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref b/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
index 33c44780b4542a5198daf1668a6a09b2f6fdb1df..a188ad92fc4e4ff45382d14d3bfb258f6e5b7f11 100644 (file)
--- a/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
@@ -1,3 +1,4 @@
+IPv4 unicast VRF default:
 C>* 192.168.0.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
 C>* 192.168.1.0/26 is directly connected, r1-eth1, weight 1, XX:XX:XX
 C>* 192.168.2.0/26 is directly connected, r1-eth2, weight 1, XX:XX:XX

diff --git a/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref b/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
index f5c1d6d7d232e9f61e41a9984c0bba3b312d53c8..4cb8692f90c78b221f800781360636bd1178157b 100644 (file)
--- a/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
@@ -1,3 +1,4 @@
+IPv6 unicast VRF default:
 C>* fc00:0:0:1::/64 is directly connected, r1-eth1, weight 1, XX:XX:XX
 C>* fc00:0:0:2::/64 is directly connected, r1-eth2, weight 1, XX:XX:XX
 C>* fc00:0:0:3::/64 is directly connected, r1-eth3, weight 1, XX:XX:XX

diff --git a/tests/topotests/mgmt_config/r1/early-end-zebra.conf b/tests/topotests/mgmt_config/r1/early-end-zebra.conf
index 44a2f968253e2a5ab35b181b776d9ce46d1a54be..926540f9bcc60a769630f2da78685e78167ad11e 100644 (file)
--- a/tests/topotests/mgmt_config/r1/early-end-zebra.conf
+++ b/tests/topotests/mgmt_config/r1/early-end-zebra.conf
@@ -1,6 +1,6 @@
 allow-external-route-update
 end
-ip multicast rpf-lookup-mode urib-only
+router-id 1.2.3.4
 end
 ip table range 2 3
 end
\ No newline at end of file

diff --git a/tests/topotests/mgmt_config/r1/early-end2-zebra.conf b/tests/topotests/mgmt_config/r1/early-end2-zebra.conf
index 37619d52ace109e30da9bfcc4718347c89a3bb1b..b8514f324ff30261e6b5d117c97257844b9dfbf8 100644 (file)
--- a/tests/topotests/mgmt_config/r1/early-end2-zebra.conf
+++ b/tests/topotests/mgmt_config/r1/early-end2-zebra.conf
@@ -1,7 +1,7 @@
 conf t
 allow-external-route-update
 end
-ip multicast rpf-lookup-mode urib-only
+router-id 1.2.3.4
 end
 ip table range 2 3
 end
\ No newline at end of file

diff --git a/tests/topotests/mgmt_config/r1/early-exit-zebra.conf b/tests/topotests/mgmt_config/r1/early-exit-zebra.conf
index 44f202dbcbb62fd7253601eda803b40a3a7b0c6d..990351685b1f9aa556c5cf9ccb21db210e908d03 100644 (file)
--- a/tests/topotests/mgmt_config/r1/early-exit-zebra.conf
+++ b/tests/topotests/mgmt_config/r1/early-exit-zebra.conf
@@ -1,6 +1,6 @@
 allow-external-route-update
 exit
-ip multicast rpf-lookup-mode urib-only
+router-id 1.2.3.4
 exit
 ip table range 2 3
 exit
\ No newline at end of file

diff --git a/tests/topotests/mgmt_config/r1/early-exit2-zebra.conf b/tests/topotests/mgmt_config/r1/early-exit2-zebra.conf
index c7109bfd395d4bd17af9114eeb7f3a6fe96eff00..5a783f449244b07ca46138ef2faa66c11259e3c8 100644 (file)
--- a/tests/topotests/mgmt_config/r1/early-exit2-zebra.conf
+++ b/tests/topotests/mgmt_config/r1/early-exit2-zebra.conf
@@ -1,7 +1,7 @@
 conf t
 allow-external-route-update
 exit
-ip multicast rpf-lookup-mode urib-only
+router-id 1.2.3.4
 exit
 ip table range 2 3
 exit
\ No newline at end of file

diff --git a/tests/topotests/mgmt_config/r1/one-exit-zebra.conf b/tests/topotests/mgmt_config/r1/one-exit-zebra.conf
index 0c38459702a6a9cdaaf7f6202c9f1bd330df43ee..c8396fec70398588b129d819e99e313c07afa9c9 100644 (file)
--- a/tests/topotests/mgmt_config/r1/one-exit-zebra.conf
+++ b/tests/topotests/mgmt_config/r1/one-exit-zebra.conf
@@ -1,3 +1,3 @@
 allow-external-route-update
 exit
-ip multicast rpf-lookup-mode urib-only
+router-id 1.2.3.4

diff --git a/tests/topotests/mgmt_config/r1/one-exit2-zebra.conf b/tests/topotests/mgmt_config/r1/one-exit2-zebra.conf
index 34acb76d92d9014eb398b4b6fd98bcd98984f593..3a50f6d13687a6397713f873433140f6500d3b9f 100644 (file)
--- a/tests/topotests/mgmt_config/r1/one-exit2-zebra.conf
+++ b/tests/topotests/mgmt_config/r1/one-exit2-zebra.conf
@@ -1,4 +1,4 @@
 conf t
 allow-external-route-update
 exit
-ip multicast rpf-lookup-mode urib-only
\ No newline at end of file
+router-id 1.2.3.4
\ No newline at end of file

diff --git a/tests/topotests/mgmt_config/test_config.py b/tests/topotests/mgmt_config/test_config.py
index 1d732223fff8cd8935233a80b6eb931f2a7411c9..627a564a6607e6ae6b8e2d3472c3180ab94e3508 100644 (file)
--- a/tests/topotests/mgmt_config/test_config.py
+++ b/tests/topotests/mgmt_config/test_config.py
@@ -153,7 +153,7 @@ def cleanup_config(r1, tempdir, logpath):
     yield
 
     r1.cmd_nostatus("vtysh -c 'conf t' -c 'no allow-external-route-update'")
-    r1.cmd_nostatus("vtysh -c 'conf t' -c 'no ip multicast rpf-lookup-mode urib-only'")
+    r1.cmd_nostatus("vtysh -c 'conf t' -c 'no router-id 1.2.3.4'")
     r1.cmd_nostatus("vtysh -c 'conf t' -c 'no ip table range 2 3'")
 
     logbuf = save_log_snippet(logpath, logbuf, "/dev/null")
@@ -290,9 +290,7 @@ def test_zebra_one_exit_file(r1, confdir, tempdir, logpath):
 
     showrun = r1.cmd_nostatus("vtysh -c 'show running'")
     assert "allow-external-route-update" in showrun, "zebra conf missing"
-    assert (
-        "ip multicast rpf-lookup-mode urib-only" not in showrun
-    ), "zebra second conf present, unexpected"
+    assert "router-id 1.2.3.4" not in showrun, "zebra second conf present, unexpected"
 
 
 def test_zebra_one_exit_redir(r1, confdir, tempdir, logpath):
@@ -307,9 +305,7 @@ def test_zebra_one_exit_redir(r1, confdir, tempdir, logpath):
     showrun = r1.cmd_nostatus("vtysh -c 'show running'")
 
     assert "allow-external-route-update" in showrun, "zebra conf missing"
-    assert (
-        "ip multicast rpf-lookup-mode urib-only" not in showrun
-    ), "zebra second conf present, unexpected"
+    assert "router-id 1.2.3.4" not in showrun, "zebra second conf present, unexpected"
 
 
 def test_zebra_early_exit_file(r1, confdir, tempdir, logpath):
@@ -324,9 +320,7 @@ def test_zebra_early_exit_file(r1, confdir, tempdir, logpath):
     showrun = r1.cmd_nostatus("vtysh -c 'show running'")
 
     assert "allow-external-route-update" in showrun, "zebra conf missing"
-    assert (
-        "ip multicast rpf-lookup-mode urib-only" not in showrun
-    ), "zebra second conf present, unexpected"
+    assert "router-id 1.2.3.4" not in showrun, "zebra second conf present, unexpected"
     assert "ip table range 2 3" not in showrun, "zebra third conf present, unexpected"
 
 
@@ -342,9 +336,7 @@ def test_zebra_early_exit_redir(r1, confdir, tempdir, logpath):
     showrun = r1.cmd_nostatus("vtysh -c 'show running'")
 
     assert "allow-external-route-update" in showrun, "zebra conf missing"
-    assert (
-        "ip multicast rpf-lookup-mode urib-only" not in showrun
-    ), "zebra second conf present, unexpected"
+    assert "router-id 1.2.3.4" not in showrun, "zebra second conf present, unexpected"
     assert "ip table range 2 3" not in showrun, "zebra third conf present, unexpected"
 
 
@@ -360,9 +352,7 @@ def test_zebra_early_end_file(r1, confdir, tempdir, logpath):
     showrun = r1.cmd_nostatus("vtysh -c 'show running'")
 
     assert "allow-external-route-update" in showrun, "zebra conf missing"
-    assert (
-        "ip multicast rpf-lookup-mode urib-only" in showrun
-    ), "zebra second conf missing"
+    assert "router-id 1.2.3.4" in showrun, "zebra second conf missing"
     assert "ip table range 2 3" in showrun, "zebra third missing"
 
 
@@ -378,7 +368,5 @@ def test_zebra_early_end_redir(r1, confdir, tempdir, logpath):
     showrun = r1.cmd_nostatus("vtysh -c 'show running'")
 
     assert "allow-external-route-update" in showrun, "zebra conf missing"
-    assert (
-        "ip multicast rpf-lookup-mode urib-only" not in showrun
-    ), "zebra second conf present, unexpected"
+    assert "router-id 1.2.3.4" not in showrun, "zebra second conf present, unexpected"
     assert "ip table range 2 3" not in showrun, "zebra third conf present, unexpected"

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt
index 131085a47aa5f6223d59439e849b998711cd0001..e4787be3c986d0fd35d6cd7bab8b1b48471c0edc 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-default.txt
@@ -1,3 +1,4 @@
+IPv4 unicast VRF default:
 O   10.0.1.0/24 [110/10] is directly connected, r1-eth0, weight 1, XX:XX:XX
 C>* 10.0.1.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
 L>* 10.0.1.1/32 is directly connected, r1-eth0, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt
index 45ee1071d4068daae818a03f82b51358699e0762..2f893c3d96d587e26513a505fe2ba70c3df8240a 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/zebra-vrf-neno.txt
@@ -1,4 +1,4 @@
-VRF neno:
+IPv4 unicast VRF neno:
 O>* 10.0.3.0/24 [110/20] via 10.0.30.3, r1-eth2, weight 1, XX:XX:XX
 B>* 10.0.4.0/24 [110/20] via 10.0.20.2, r1-eth1 (vrf default), weight 1, XX:XX:XX
 O   10.0.30.0/24 [110/10] is directly connected, r1-eth2, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt
index f3724bbb9ffefba2045a0f07305a858de167048c..07ec7226fa79a0104761b941c61da30a72a8d430 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-default.txt
@@ -1,3 +1,4 @@
+IPv4 unicast VRF default:
 S>* 0.0.0.0/0 [1/0] via 10.0.20.1, r2-eth1, weight 1, XX:XX:XX
 O>* 10.0.1.0/24 [110/20] via 10.0.20.1, r2-eth1, weight 1, XX:XX:XX
 O   10.0.2.0/24 [110/10] is directly connected, r2-eth0, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt
index 0f8b12bdfab3797d78377c0f3bcbf1a664bcf14f..f409034b807c508b82825a4ae06aa6a65fd76e19 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/zebra-vrf-ray.txt
@@ -1,4 +1,4 @@
-VRF ray:
+IPv4 unicast VRF ray:
 B   10.0.1.0/24 [110/20] via 10.0.20.1, r2-eth1 (vrf default) inactive, weight 1, XX:XX:XX
 B   10.0.2.0/24 [20/0] is directly connected, r2-eth0 (vrf default) inactive, weight 1, XX:XX:XX
 B>* 10.0.3.0/24 [110/20] via 10.0.20.1, r2-eth1 (vrf default), weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt
index db4e268cb01806de2d94849afb2fb974e7535c33..2af9d2460d78cfc025fb12bb2d0f904517917799 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/zebra-vrf-default.txt
@@ -1,3 +1,4 @@
+IPv4 unicast VRF default:
 O   10.0.3.0/24 [110/10] is directly connected, r3-eth0, weight 1, XX:XX:XX
 C>* 10.0.3.0/24 is directly connected, r3-eth0, weight 1, XX:XX:XX
 L>* 10.0.3.3/32 is directly connected, r3-eth0, weight 1, XX:XX:XX
@@ -6,5 +7,3 @@ O   10.0.30.0/24 [110/10] is directly connected, r3-eth1, weight 1, XX:XX:XX
 C>* 10.0.30.0/24 is directly connected, r3-eth1, weight 1, XX:XX:XX
 L>* 10.0.30.3/32 is directly connected, r3-eth1, weight 1, XX:XX:XX
 O>* 10.0.40.0/24 [110/20] via 10.0.30.1, r3-eth1, weight 1, XX:XX:XX
-
-

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt
index 4865708578e2d4bee367c0b3c724d7480f740f8f..013073795b9dcb7433e4777ef4d41d747d011c9f 100644 (file)
--- a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt
+++ b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/zebra-vrf-default.txt
@@ -1,3 +1,4 @@
+IPv4 unicast VRF default:
 O>* 10.0.3.0/24 [110/20] via 10.0.40.2, r4-eth1, weight 1, XX:XX:XX
 O   10.0.4.0/24 [110/10] is directly connected, r4-eth0, weight 1, XX:XX:XX
 C>* 10.0.4.0/24 is directly connected, r4-eth0, weight 1, XX:XX:XX
@@ -6,4 +7,3 @@ O>* 10.0.30.0/24 [110/20] via 10.0.40.2, r4-eth1, weight 1, XX:XX:XX
 O   10.0.40.0/24 [110/10] is directly connected, r4-eth1, weight 1, XX:XX:XX
 C>* 10.0.40.0/24 is directly connected, r4-eth1, weight 1, XX:XX:XX
 L>* 10.0.40.4/32 is directly connected, r4-eth1, weight 1, XX:XX:XX
-

diff --git a/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
index 68fd30d4ccbad3dacb644d1ec17a34592c350de3..82cc2d9136f2b4d5d5436690dfb8cf637629e3dd 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/zebraroute.txt
@@ -1,4 +1,4 @@
-VRF r1-ospf-cust1:
+IPv4 unicast VRF r1-ospf-cust1:
 O   10.0.1.0/24 [110/10] is directly connected, r1-eth0, weight 1, XX:XX:XX
 C>* 10.0.1.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
 L>* 10.0.1.1/32 is directly connected, r1-eth0, weight 1, XX:XX:XX
@@ -7,4 +7,3 @@ O   10.0.3.0/24 [110/10] is directly connected, r1-eth1, weight 1, XX:XX:XX
 C>* 10.0.3.0/24 is directly connected, r1-eth1, weight 1, XX:XX:XX
 L>* 10.0.3.2/32 is directly connected, r1-eth1, weight 1, XX:XX:XX
 O>* 10.0.10.0/24 [110/20] via 10.0.3.1, r1-eth1, weight 1, XX:XX:XX
-

diff --git a/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
index f0bce905b1326879fc098ef8ee6fa2d1d0f55426..d6ad2a250000eafa2623420875c9180be32e9440 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r1/zebraroutedown.txt
@@ -1,4 +1,4 @@
-VRF r1-ospf-cust1:
+IPv4 unicast VRF r1-ospf-cust1:
 O   10.0.1.0/24 [110/10] is directly connected, r1-eth0, weight 1, XX:XX:XX
 C>* 10.0.1.0/24 is directly connected, r1-eth0, weight 1, XX:XX:XX
 L>* 10.0.1.1/32 is directly connected, r1-eth0, weight 1, XX:XX:XX
@@ -6,4 +6,3 @@ O>* 10.0.2.0/24 [110/20] via 10.0.3.3, r1-eth1, weight 1, XX:XX:XX
 O   10.0.3.0/24 [110/10] is directly connected, r1-eth1, weight 1, XX:XX:XX
 C>* 10.0.3.0/24 is directly connected, r1-eth1, weight 1, XX:XX:XX
 L>* 10.0.3.2/32 is directly connected, r1-eth1, weight 1, XX:XX:XX
-

diff --git a/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
index 098eceb28bedfe83c4c859f2dd0ffd4e529f5954..effcbc46345cc16a67a171c7bb368f12297d9bb6 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/zebraroute.txt
@@ -1,4 +1,4 @@
-VRF r2-ospf-cust1:
+IPv4 unicast VRF r2-ospf-cust1:
 O>* 10.0.1.0/24 [110/20] via 10.0.3.2, r2-eth1, weight 1, XX:XX:XX
 O   10.0.2.0/24 [110/10] is directly connected, r2-eth0, weight 1, XX:XX:XX
 C>* 10.0.2.0/24 is directly connected, r2-eth0, weight 1, XX:XX:XX
@@ -7,4 +7,3 @@ O   10.0.3.0/24 [110/10] is directly connected, r2-eth1, weight 1, XX:XX:XX
 C>* 10.0.3.0/24 is directly connected, r2-eth1, weight 1, XX:XX:XX
 L>* 10.0.3.3/32 is directly connected, r2-eth1, weight 1, XX:XX:XX
 O>* 10.0.10.0/24 [110/20] via 10.0.3.1, r2-eth1, weight 1, XX:XX:XX
-

diff --git a/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
index a9300f8dfafba4104d36ee7443c1bb343817b530..7321b184a391b2d4dae41dfd8c29485f52b31960 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r2/zebraroutedown.txt
@@ -1,4 +1,4 @@
-VRF r2-ospf-cust1:
+IPv4 unicast VRF r2-ospf-cust1:
 O>* 10.0.1.0/24 [110/20] via 10.0.3.2, r2-eth1, weight 1, XX:XX:XX
 O   10.0.2.0/24 [110/10] is directly connected, r2-eth0, weight 1, XX:XX:XX
 C>* 10.0.2.0/24 is directly connected, r2-eth0, weight 1, XX:XX:XX
@@ -6,4 +6,3 @@ L>* 10.0.2.1/32 is directly connected, r2-eth0, weight 1, XX:XX:XX
 O   10.0.3.0/24 [110/10] is directly connected, r2-eth1, weight 1, XX:XX:XX
 C>* 10.0.3.0/24 is directly connected, r2-eth1, weight 1, XX:XX:XX
 L>* 10.0.3.3/32 is directly connected, r2-eth1, weight 1, XX:XX:XX
-

diff --git a/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
index f58beb81a729fe188f1cc4303e159f8ba97c8340..3fea04bd19669285615939dda7f102ef57f71477 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/zebraroute.txt
@@ -1,4 +1,4 @@
-VRF r3-ospf-cust1:
+IPv4 unicast VRF r3-ospf-cust1:
 O>* 10.0.1.0/24 [110/20] via 10.0.3.2, r3-eth0, weight 1, XX:XX:XX
 O>* 10.0.2.0/24 [110/20] via 10.0.3.3, r3-eth0, weight 1, XX:XX:XX
 O   10.0.3.0/24 [110/10] is directly connected, r3-eth0, weight 1, XX:XX:XX
@@ -7,4 +7,3 @@ L>* 10.0.3.1/32 is directly connected, r3-eth0, weight 1, XX:XX:XX
 O   10.0.10.0/24 [110/10] is directly connected, r3-eth1, weight 1, XX:XX:XX
 C>* 10.0.10.0/24 is directly connected, r3-eth1, weight 1, XX:XX:XX
 L>* 10.0.10.1/32 is directly connected, r3-eth1, weight 1, XX:XX:XX
-

diff --git a/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
index cfedf8fcb47284d039fc118586d36768da76d2bd..3287355ce0f162583be4b6b0ecf5664e51c8925a 100644 (file)
--- a/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
+++ b/tests/topotests/ospf_netns_vrf/r3/zebraroutedown.txt
@@ -1,5 +1,4 @@
-VRF r3-ospf-cust1:
+IPv4 unicast VRF r3-ospf-cust1:
 O   10.0.10.0/24 [110/10] is directly connected, r3-eth1, weight 1, XX:XX:XX
 C>* 10.0.10.0/24 is directly connected, r3-eth1, weight 1, XX:XX:XX
 L>* 10.0.10.1/32 is directly connected, r3-eth1, weight 1, XX:XX:XX
-