From: Renato Westphal Date: Thu, 15 Jun 2017 13:47:15 +0000 (-0300) Subject: ldp-topo1: sync with PR#710 in FRR X-Git-Tag: frr-7.1-dev~151^2~313 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fa05076643d39dacc7c7c5cd3ba28ed7b1fad4cb;p=matthieu%2Ffrr.git ldp-topo1: sync with PR#710 in FRR Now zebra is adding the ldpd implicit-null labels to the RIB as well. We don't want to hide them in the "show ip route" commands because knowing that a route is associated with an implicit-null label is an useful piece of information, specially when troubleshooting L2/L3 VPNs. Note: preserve the original output for cli version 1 (stable/2.0). Signed-off-by: Renato Westphal --- diff --git a/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref b/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref index ff99ff9866..aadf03aa49 100644 --- a/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref +++ b/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref @@ -1,7 +1,7 @@ O 1.1.1.1/32 [110/0] is directly connected, lo -O>* 2.2.2.2/32 [110/10] via 10.0.1.2, r1-eth0 +O>* 2.2.2.2/32 [110/10] via 10.0.1.2, r1-eth0, label xxx O>* 3.3.3.3/32 [110/20] via 10.0.1.2, r1-eth0, label xxx O>* 4.4.4.4/32 [110/20] via 10.0.1.2, r1-eth0, label xxx O 10.0.1.0/24 [110/10] is directly connected, r1-eth0 -O>* 10.0.2.0/24 [110/20] via 10.0.1.2, r1-eth0 -O>* 10.0.3.0/24 [110/20] via 10.0.1.2, r1-eth0 +O>* 10.0.2.0/24 [110/20] via 10.0.1.2, r1-eth0, label xxx +O>* 10.0.3.0/24 [110/20] via 10.0.1.2, r1-eth0, label xxx diff --git a/tests/topotests/ldp-topo1/r2/show_ipv4_route.ref b/tests/topotests/ldp-topo1/r2/show_ipv4_route.ref index eaec2f16b9..db997018ea 100644 --- a/tests/topotests/ldp-topo1/r2/show_ipv4_route.ref +++ b/tests/topotests/ldp-topo1/r2/show_ipv4_route.ref @@ -1,7 +1,7 @@ -O>* 1.1.1.1/32 [110/10] via 10.0.1.1, r2-eth0 +O>* 1.1.1.1/32 [110/10] via 10.0.1.1, r2-eth0, label xxx O 2.2.2.2/32 [110/0] is directly connected, lo -O>* 3.3.3.3/32 [110/10] via 10.0.2.3, r2-eth1 -O>* 4.4.4.4/32 [110/10] via 10.0.2.4, r2-eth1 +O>* 3.3.3.3/32 [110/10] via 10.0.2.3, r2-eth1, label xxx +O>* 4.4.4.4/32 [110/10] via 10.0.2.4, r2-eth1, label xxx O 10.0.1.0/24 [110/10] is directly connected, r2-eth0 O 10.0.2.0/24 [110/10] is directly connected, r2-eth1 O 10.0.3.0/24 [110/10] is directly connected, r2-eth2 diff --git a/tests/topotests/ldp-topo1/r3/show_ipv4_route.ref b/tests/topotests/ldp-topo1/r3/show_ipv4_route.ref index c8a29400b2..e5989a975f 100644 --- a/tests/topotests/ldp-topo1/r3/show_ipv4_route.ref +++ b/tests/topotests/ldp-topo1/r3/show_ipv4_route.ref @@ -1,7 +1,7 @@ O>* 1.1.1.1/32 [110/20] via 10.0.2.2, r3-eth0, label xxx -O>* 2.2.2.2/32 [110/10] via 10.0.2.2, r3-eth0 +O>* 2.2.2.2/32 [110/10] via 10.0.2.2, r3-eth0, label xxx O 3.3.3.3/32 [110/0] is directly connected, lo -O>* 4.4.4.4/32 [110/10] via 10.0.2.4, r3-eth0 -O>* 10.0.1.0/24 [110/20] via 10.0.2.2, r3-eth0 +O>* 4.4.4.4/32 [110/10] via 10.0.2.4, r3-eth0, label xxx +O>* 10.0.1.0/24 [110/20] via 10.0.2.2, r3-eth0, label xxx O 10.0.2.0/24 [110/10] is directly connected, r3-eth0 O 10.0.3.0/24 [110/10] is directly connected, r3-eth1 diff --git a/tests/topotests/ldp-topo1/r4/show_ipv4_route.ref b/tests/topotests/ldp-topo1/r4/show_ipv4_route.ref index df2a2b585f..5ffaf78504 100644 --- a/tests/topotests/ldp-topo1/r4/show_ipv4_route.ref +++ b/tests/topotests/ldp-topo1/r4/show_ipv4_route.ref @@ -1,7 +1,7 @@ O>* 1.1.1.1/32 [110/20] via 10.0.2.2, r4-eth0, label xxx -O>* 2.2.2.2/32 [110/10] via 10.0.2.2, r4-eth0 -O>* 3.3.3.3/32 [110/10] via 10.0.2.3, r4-eth0 +O>* 2.2.2.2/32 [110/10] via 10.0.2.2, r4-eth0, label xxx +O>* 3.3.3.3/32 [110/10] via 10.0.2.3, r4-eth0, label xxx O 4.4.4.4/32 [110/0] is directly connected, lo -O>* 10.0.1.0/24 [110/20] via 10.0.2.2, r4-eth0 +O>* 10.0.1.0/24 [110/20] via 10.0.2.2, r4-eth0, label xxx O 10.0.2.0/24 [110/10] is directly connected, r4-eth0 -O>* 10.0.3.0/24 [110/20] via 10.0.2.2, r4-eth0 +O>* 10.0.3.0/24 [110/20] via 10.0.2.2, r4-eth0, label xxx