ldp-topo1: fix ip mpls route output format

Remove the different file as it is no longer needed.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>

diff --git a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1 b/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1
deleted file mode 100644 (file)
index 79c9bb7..0000000
--- a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1
+++ /dev/null
@@ -1,5 +0,0 @@
-xx proto xx
-       nexthopvia inet 10.0.2.3 dev r2-eth1
-       nexthopvia inet 10.0.3.3 dev r2-eth2
-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-1 b/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1
deleted file mode 100644 (file)
index bffae1e..0000000
--- a/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1
+++ /dev/null
@@ -1,10 +0,0 @@
-xx proto xx
-       nexthopvia inet 10.0.2.2 dev r3-eth0
-       nexthopvia inet 10.0.3.2 dev r3-eth1
-xx proto xx
-       nexthopvia inet 10.0.2.2 dev r3-eth0
-       nexthopvia inet 10.0.3.2 dev r3-eth1
-xx proto xx
-       nexthopvia inet 10.0.2.2 dev r3-eth0
-       nexthopvia inet 10.0.3.2 dev r3-eth1
-xx via inet 10.0.2.4 dev r3-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
deleted file mode 100644 (file)
index f6dae1f..0000000
--- a/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1
+++ /dev/null
@@ -1,7 +0,0 @@
-xx proto xx
-       nexthopvia inet 10.0.2.2 dev r4-eth0
-       nexthopvia inet 10.0.2.3 dev r4-eth0
-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 9952fd80c8a10de1341953bb4865056bb3fb6876..409a5f54c84f4406e1fe482e184850b326048b25 100755 (executable)
--- a/tests/topotests/ldp-topo1/test_ldp_topo1.py
+++ b/tests/topotests/ldp-topo1/test_ldp_topo1.py
@@ -685,7 +685,7 @@ def test_linux_mpls_routes():
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):

-        refTableFile = '%s/r%s/ip_mpls_route.ref%s' % (thisDir, i, cli_version)
+        refTableFile = '%s/r%s/ip_mpls_route.ref' % (thisDir, i)

         if os.path.isfile(refTableFile):
             # Read expected result from file
             expected = open(refTableFile).read().rstrip()
         if os.path.isfile(refTableFile):
             # Read expected result from file
             expected = open(refTableFile).read().rstrip()