From edc7a5036ce704fbdc045d30706de88eb9cbdc40 Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Wed, 13 Jun 2018 19:37:40 -0300 Subject: [PATCH] ldp-topo1: fix ip mpls route output format Remove the different file as it is no longer needed. Signed-off-by: Rafael Zalamena --- tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1 | 5 ----- tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1 | 10 ---------- tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1 | 7 ------- tests/topotests/ldp-topo1/test_ldp_topo1.py | 2 +- 4 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1 delete mode 100644 tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1 delete mode 100644 tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1 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 index 79c9bb7191..0000000000 --- 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 index bffae1e40e..0000000000 --- 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 index f6dae1fad0..0000000000 --- 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 9952fd80c8..409a5f54c8 100755 --- 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): - 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() -- 2.39.5