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 <mwinter@opensourcerouting.org>

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 539bdc890b6da98ed1a0dbc6de1cd1a3945bb1a9..b1bebd7c464f51d93a2c795b20b049292f24ccda 100644 (file)
--- 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 86e82b919e9a3904a131cf8ad5cf4b83985564cb..f9fc98408c1c653af9579e9f670c9db66ccdff03 100644 (file)
--- 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 4fbf536f8199157e3376399ef2034c522d561e56..3ebddd606acce0e1b78924c510cfda8b69df351a 100644 (file)
--- 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: