proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 02:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldp-topo1: Remove check for protocol in installed LSPs

Browse Source 
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>
This commit is contained in:
Renato Westphal 2017-09-22 09:51:58 -03:00 committed by Donald Sharp
parent ad59d1f5bb
commit 13e8bc063f
9 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/topotests/ldp-topo1/r1/ip_mpls_route.ref
View File

@ -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

10
tests/topotests/ldp-topo1/r1/ip_mpls_route.ref-1
View File

@ -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

6
tests/topotests/ldp-topo1/r2/ip_mpls_route.ref
View File

@ -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

6
tests/topotests/ldp-topo1/r2/ip_mpls_route.ref-1
View File

@ -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

8
tests/topotests/ldp-topo1/r3/ip_mpls_route.ref
View File

@ -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

8
tests/topotests/ldp-topo1/r3/ip_mpls_route.ref-1
View File

@ -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

10
tests/topotests/ldp-topo1/r4/ip_mpls_route.ref
View File

@ -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

10
tests/topotests/ldp-topo1/r4/ip_mpls_route.ref-1
View File

@ -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

4
tests/topotests/ldp-topo1/test_ldp_topo1.py
View File

@ -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)