From: Martin Winter Date: Thu, 16 Feb 2017 16:54:40 +0000 (+0700) Subject: ldp-topo1: Fix ordering of reference output to check against X-Git-Tag: frr-7.1-dev~151^2~348 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ff0d89dcfdf115b707c077eb38ba686db90c7079;p=matthieu%2Ffrr.git ldp-topo1: Fix ordering of reference output to check against Ordering of output is now done by LDP and should be consistent Signed-off-by: Martin Winter --- diff --git a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_discovery.ref b/tests/topotests/ldp-topo1/r2/show_mpls_ldp_discovery.ref index 539bdc890b..b1bebd7c46 100644 --- a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_discovery.ref +++ b/tests/topotests/ldp-topo1/r2/show_mpls_ldp_discovery.ref @@ -1,12 +1,12 @@ Local LDP Identifier: 2.2.2.2:0 Discovery Sources: Interfaces: - r2-eth1: xmit/recv - LDP Id: 4.4.4.4:0, Transport address: 4.4.4.4 + r2-eth0: xmit/recv + LDP Id: 1.1.1.1:0, Transport address: 1.1.1.1 Hold time: 15 sec + r2-eth1: xmit/recv LDP Id: 3.3.3.3:0, Transport address: 3.3.3.3 Hold time: 15 sec - r2-eth0: xmit/recv - LDP Id: 1.1.1.1:0, Transport address: 1.1.1.1 + LDP Id: 4.4.4.4:0, Transport address: 4.4.4.4 Hold time: 15 sec Targeted Hellos: diff --git a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_interface.ref b/tests/topotests/ldp-topo1/r2/show_mpls_ldp_interface.ref index 86e82b919e..f9fc98408c 100644 --- a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_interface.ref +++ b/tests/topotests/ldp-topo1/r2/show_mpls_ldp_interface.ref @@ -1,3 +1,3 @@ AF Interface State Uptime Hello Timers ac -ipv4 r2-eth1 ACTIVE xx:xx:xx 5/15 2 ipv4 r2-eth0 ACTIVE xx:xx:xx 5/15 1 +ipv4 r2-eth1 ACTIVE xx:xx:xx 5/15 2 diff --git a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_discovery.ref b/tests/topotests/ldp-topo1/r4/show_mpls_ldp_discovery.ref index 4fbf536f81..3ebddd606a 100644 --- a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_discovery.ref +++ b/tests/topotests/ldp-topo1/r4/show_mpls_ldp_discovery.ref @@ -2,8 +2,8 @@ Local LDP Identifier: 4.4.4.4:0 Discovery Sources: Interfaces: r4-eth0: xmit/recv - LDP Id: 3.3.3.3:0, Transport address: 3.3.3.3 - Hold time: 15 sec LDP Id: 2.2.2.2:0, Transport address: 2.2.2.2 Hold time: 15 sec + LDP Id: 3.3.3.3:0, Transport address: 3.3.3.3 + Hold time: 15 sec Targeted Hellos: