ldp-topo1: Remove check for protocol in installed LSPs

PR #1213 in FRR changed the protocol of installed LSPs. To avoid breaking
older outstanding Pull Requests, remove the protocol check.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref b/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref
index 053b08c3384623926cc99bb41d1ac561f73462ab..63b4043bf802788e7f00dcdc0c22a35e955e7260 100644 (file)
--- a/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref
+++ b/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref
@@ -1,5 +1,5 @@
-xx as to xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx as to xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx via inet 10.0.1.2 dev r1-eth0  proto zebra
+xx as to xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx as to xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx via inet 10.0.1.2 dev r1-eth0  proto xx

diff --git a/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref-1 b/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref-1
index 053b08c3384623926cc99bb41d1ac561f73462ab..63b4043bf802788e7f00dcdc0c22a35e955e7260 100644 (file)
--- a/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref-1
+++ b/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref-1
@@ -1,5 +1,5 @@
-xx as to xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx as to xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx via inet 10.0.1.2 dev r1-eth0  proto zebra
-xx via inet 10.0.1.2 dev r1-eth0  proto zebra
+xx as to xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx as to xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx via inet 10.0.1.2 dev r1-eth0  proto xx
+xx via inet 10.0.1.2 dev r1-eth0  proto xx

diff --git a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref b/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref
index 007ef6f0a5f3c872ef9705941b5357d6137490eb..7fe092cccd3682e23280e7c237575bdd008a868e 100644 (file)
--- a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref
+++ b/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref
@@ -1,5 +1,5 @@
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.3  dev r2-eth1 weight 1
        nexthopvia inet 10.0.3.3  dev r2-eth2 weight 1
-xx via inet 10.0.1.1 dev r2-eth0  proto zebra
-xx via inet 10.0.2.4 dev r2-eth1  proto zebra
+xx via inet 10.0.1.1 dev r2-eth0  proto xx
+xx via inet 10.0.2.4 dev r2-eth1  proto xx

diff --git a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1 b/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1
index 007ef6f0a5f3c872ef9705941b5357d6137490eb..7fe092cccd3682e23280e7c237575bdd008a868e 100644 (file)
--- a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1
+++ b/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1
@@ -1,5 +1,5 @@
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.3  dev r2-eth1 weight 1
        nexthopvia inet 10.0.3.3  dev r2-eth2 weight 1
-xx via inet 10.0.1.1 dev r2-eth0  proto zebra
-xx via inet 10.0.2.4 dev r2-eth1  proto zebra
+xx via inet 10.0.1.1 dev r2-eth0  proto xx
+xx via inet 10.0.2.4 dev r2-eth1  proto xx

diff --git a/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref b/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref
index 680fcf26fd711705bbd20808c58afbf372f1150a..2da9e06e5372d04173672a5a189d9da44ff5dad9 100644 (file)
--- a/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref
+++ b/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref
@@ -1,10 +1,10 @@
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r3-eth0 weight 1
        nexthopvia inet 10.0.3.2  dev r3-eth1 weight 1
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r3-eth0 weight 1
        nexthopvia inet 10.0.3.2  dev r3-eth1 weight 1
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r3-eth0 weight 1
        nexthopvia inet 10.0.3.2  dev r3-eth1 weight 1
-xx via inet 10.0.2.4 dev r3-eth0  proto zebra
+xx via inet 10.0.2.4 dev r3-eth0  proto xx

diff --git a/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1 b/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1
index 680fcf26fd711705bbd20808c58afbf372f1150a..2da9e06e5372d04173672a5a189d9da44ff5dad9 100644 (file)
--- a/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1
+++ b/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1
@@ -1,10 +1,10 @@
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r3-eth0 weight 1
        nexthopvia inet 10.0.3.2  dev r3-eth1 weight 1
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r3-eth0 weight 1
        nexthopvia inet 10.0.3.2  dev r3-eth1 weight 1
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r3-eth0 weight 1
        nexthopvia inet 10.0.3.2  dev r3-eth1 weight 1
-xx via inet 10.0.2.4 dev r3-eth0  proto zebra
+xx via inet 10.0.2.4 dev r3-eth0  proto xx

diff --git a/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref b/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref
index 7fdb057345b0bcb968ca5e8efc5430c4f55302c7..60b3ce1a2654fd425b8e695344886016cfc9e5aa 100644 (file)
--- a/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref
+++ b/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref
@@ -1,7 +1,7 @@
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r4-eth0 weight 1
        nexthopvia inet 10.0.2.3  dev r4-eth0 weight 1
-xx as to xx via inet 10.0.2.2 dev r4-eth0  proto zebra
-xx via inet 10.0.2.2 dev r4-eth0  proto zebra
-xx via inet 10.0.2.2 dev r4-eth0  proto zebra
-xx via inet 10.0.2.3 dev r4-eth0  proto zebra
+xx as to xx via inet 10.0.2.2 dev r4-eth0  proto xx
+xx via inet 10.0.2.2 dev r4-eth0  proto xx
+xx via inet 10.0.2.2 dev r4-eth0  proto xx
+xx via inet 10.0.2.3 dev r4-eth0  proto xx

diff --git a/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1 b/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1
index 7fdb057345b0bcb968ca5e8efc5430c4f55302c7..60b3ce1a2654fd425b8e695344886016cfc9e5aa 100644 (file)
--- a/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1
+++ b/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1
@@ -1,7 +1,7 @@
-xx  proto zebra
+xx  proto xx
        nexthopvia inet 10.0.2.2  dev r4-eth0 weight 1
        nexthopvia inet 10.0.2.3  dev r4-eth0 weight 1
-xx as to xx via inet 10.0.2.2 dev r4-eth0  proto zebra
-xx via inet 10.0.2.2 dev r4-eth0  proto zebra
-xx via inet 10.0.2.2 dev r4-eth0  proto zebra
-xx via inet 10.0.2.3 dev r4-eth0  proto zebra
+xx as to xx via inet 10.0.2.2 dev r4-eth0  proto xx
+xx via inet 10.0.2.2 dev r4-eth0  proto xx
+xx via inet 10.0.2.2 dev r4-eth0  proto xx
+xx via inet 10.0.2.3 dev r4-eth0  proto xx

diff --git a/tests/topotests/ldp-topo1/test_ldp_topo1.py b/tests/topotests/ldp-topo1/test_ldp_topo1.py
index e5545bce2b1bc24e980ab2fca76060e8817fa477..818e64723e1e9dde2014c26877a099e1b74d8b07 100755 (executable)
--- a/tests/topotests/ldp-topo1/test_ldp_topo1.py
+++ b/tests/topotests/ldp-topo1/test_ldp_topo1.py
@@ -688,9 +688,9 @@ def test_linux_mpls_routes():
             actual = net['r%s' % i].cmd('ip -family mpls route 2> /dev/null').rstrip()
              # Mask out label
             actual = re.sub(r"[0-9][0-9] via inet ", "xx via inet ", actual)
-            actual = re.sub(r"[0-9][0-9]  proto zebra", "xx  proto zebra", actual)
+            actual = re.sub(r"[0-9][0-9]  proto", "xx  proto", actual)
             actual = re.sub(r"[0-9][0-9] as to ", "xx as to ", actual)
-            actual = re.sub(r"proto zebra ", "proto zebra", actual)
+            actual = re.sub(r"proto \w+", "proto xx", actual)
  
             # Fix newlines (make them all the same)
             actual = ('\n'.join(actual.splitlines()) + '\n').splitlines(1)