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 <renato@opensourcerouting.org>

diff --git a/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref b/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref
index ff99ff9866ed18bd61bac286c06b2c08003621d2..aadf03aa4930b8e998991c50fc79256ac41a962c 100644 (file)
--- 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 eaec2f16b946bec32ffde4bb169a80ddc310c0ae..db997018ea36a65aa7a337e49aebbec34ae429bb 100644 (file)
--- 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 c8a29400b230bc0eb30da82ef259badfa7ce8567..e5989a975fddb6240519018177c6f86d296bce53 100644 (file)
--- 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 df2a2b585fc7212bb1124c0d147bfc8e80e34b5f..5ffaf78504e0f5ca0d8fdb993dbcaf4331b55f26 100644 (file)
--- 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