diff options
| author | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2018-06-14 00:37:40 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-11-28 02:22:14 +0100 |
| commit | edc7a5036ce704fbdc045d30706de88eb9cbdc40 (patch) | |
| tree | 20ac5c3a2b4f4605bd6c2c718e0244b23e856422 /tests/topotests/ldp-topo1 | |
| parent | ospf6-topo1: make ip-route comparison more robust (diff) | |
| download | frr-edc7a5036ce704fbdc045d30706de88eb9cbdc40.tar.xz frr-edc7a5036ce704fbdc045d30706de88eb9cbdc40.zip | |
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>
Diffstat (limited to 'tests/topotests/ldp-topo1')
| -rw-r--r-- | tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1 | 5 | ||||
| -rw-r--r-- | tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1 | 10 | ||||
| -rw-r--r-- | tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1 | 7 | ||||
| -rwxr-xr-x | tests/topotests/ldp-topo1/test_ldp_topo1.py | 2 |
4 files changed, 1 insertions, 23 deletions
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 79c9bb719..000000000 --- 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 bffae1e40..000000000 --- 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 f6dae1fad..000000000 --- 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 9952fd80c..409a5f54c 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() |