diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2020-11-20 04:54:41 +0100 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2020-11-23 19:22:36 +0100 |
| commit | 50ec21859f73da787e790ee271e922402d41d31a (patch) | |
| tree | e790316c51fdd19b3b1b8d92bbdf60be74601d4c /tests/topotests | |
| parent | isisd: check vertex type before checking its data (diff) | |
| download | frr-50ec21859f73da787e790ee271e922402d41d31a.tar.xz frr-50ec21859f73da787e790ee271e922402d41d31a.zip | |
isisd, tests: fix bug when sending TI-LFA repair paths to zebra
Commit 4c75f7c7730220b fixed a bug in which the TI-LFA repair paths
weren't preserving the original Prefix-SID of the routes. That
commit, however, didn't update the zebra interface code to account
for backup nexthops that don't have a repair list but do have a
SR label. As a consequence, backup nexthops that didn't have any
repair label were not preserving the original Prefix-SID of the
corresponding routes. Fix this and update the TI-LFA topotest
accordingly.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'tests/topotests')
113 files changed, 1360 insertions, 534 deletions
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_mpls_table.ref b/tests/topotests/isis-tilfa-topo1/rt1/step1/show_mpls_table.ref index e3ed7c20b..aa0357d75 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_mpls_table.ref +++ b/tests/topotests/isis-tilfa-topo1/rt1/step1/show_mpls_table.ref @@ -103,13 +103,13 @@ "type":"SR (IS-IS)", "outLabel":16060, "installed":true, - "nexthop":"10.0.1.2" + "nexthop":"10.0.1.3" }, { "type":"SR (IS-IS)", "outLabel":16060, "installed":true, - "nexthop":"10.0.1.3" + "nexthop":"10.0.1.2" } ] }, diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff index 1a9307ddb..10b336f5b 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step3/show_ip_route.ref 2020-09-25 17:48:05.062911204 -0300 -+++ rt1/step4/show_ip_route.ref 2020-09-25 17:49:01.563647190 -0300 +--- a/rt1/step3/show_ip_route.ref ++++ b/rt1/step4/show_ip_route.ref @@ -60,10 +60,7 @@ "ip":"10.0.1.2", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff index f5036aeda..904aaa1ce 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step3/show_ipv6_route.ref 2020-09-25 17:48:06.358928078 -0300 -+++ rt1/step4/show_ipv6_route.ref 2020-09-25 17:49:02.791663194 -0300 +--- a/rt1/step3/show_ipv6_route.ref ++++ b/rt1/step4/show_ipv6_route.ref @@ -57,10 +57,7 @@ "fib":true, "afi":"ipv6", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff index 30c612b54..d7d875313 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step3/show_mpls_table.ref 2020-09-25 17:48:03.782894539 -0300 -+++ rt1/step4/show_mpls_table.ref 2020-09-25 17:49:00.343631290 -0300 +--- a/rt1/step3/show_mpls_table.ref ++++ b/rt1/step4/show_mpls_table.ref @@ -47,30 +47,6 @@ } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff index 79a452ef6..b583fa97b 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step4/show_ip_route.ref 2020-09-25 17:49:01.563647190 -0300 -+++ rt1/step5/show_ip_route.ref 2020-09-25 17:50:12.144567593 -0300 +--- a/rt1/step4/show_ip_route.ref ++++ b/rt1/step5/show_ip_route.ref @@ -60,7 +60,10 @@ "ip":"10.0.1.2", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff index 805266aaa..d608abec9 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step4/show_ipv6_route.ref 2020-09-25 17:49:02.791663194 -0300 -+++ rt1/step5/show_ipv6_route.ref 2020-09-25 17:50:13.428584346 -0300 +--- a/rt1/step4/show_ipv6_route.ref ++++ b/rt1/step5/show_ipv6_route.ref @@ -57,7 +57,10 @@ "fib":true, "afi":"ipv6", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff index d7ab66ee1..b5161fcd5 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step4/show_mpls_table.ref 2020-09-25 17:49:00.343631290 -0300 -+++ rt1/step5/show_mpls_table.ref 2020-09-25 17:50:10.868550944 -0300 +--- a/rt1/step4/show_mpls_table.ref ++++ b/rt1/step5/show_mpls_table.ref @@ -47,6 +47,30 @@ } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff index 9aa0cd2e3..726aed514 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step6/show_ip_route.ref 2020-09-25 17:51:15.105389461 -0300 -+++ rt1/step7/show_ip_route.ref 2020-09-25 17:52:02.014002243 -0300 +--- a/rt1/step6/show_ip_route.ref ++++ b/rt1/step7/show_ip_route.ref @@ -83,10 +83,7 @@ "ip":"10.0.1.3", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff index 52fd7caf9..2049f6fa1 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step6/show_ipv6_route.ref 2020-09-25 17:51:16.345405655 -0300 -+++ rt1/step7/show_ipv6_route.ref 2020-09-25 17:52:03.230018133 -0300 +--- a/rt1/step6/show_ipv6_route.ref ++++ b/rt1/step7/show_ipv6_route.ref @@ -79,10 +79,7 @@ "fib":true, "afi":"ipv6", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff index 53332be56..22301ba1f 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step6/show_mpls_table.ref 2020-09-25 17:51:13.861373215 -0300 -+++ rt1/step7/show_mpls_table.ref 2020-09-25 17:52:00.769985988 -0300 +--- a/rt1/step6/show_mpls_table.ref ++++ b/rt1/step7/show_mpls_table.ref @@ -71,30 +71,6 @@ } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff index af9f72e71..4a1d4805a 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step7/show_ip_route.ref 2020-09-25 17:52:02.014002243 -0300 -+++ rt1/step8/show_ip_route.ref 2020-09-25 17:53:20.003021800 -0300 +--- a/rt1/step7/show_ip_route.ref ++++ b/rt1/step8/show_ip_route.ref @@ -83,7 +83,10 @@ "ip":"10.0.1.3", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff index b733b33ed..eaece74e4 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step7/show_ipv6_route.ref 2020-09-25 17:52:03.230018133 -0300 -+++ rt1/step8/show_ipv6_route.ref 2020-09-25 17:53:21.239037966 -0300 +--- a/rt1/step7/show_ipv6_route.ref ++++ b/rt1/step8/show_ipv6_route.ref @@ -79,7 +79,10 @@ "fib":true, "afi":"ipv6", diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff index b6f8c962f..46c17de01 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step7/show_mpls_table.ref 2020-09-25 17:52:00.769985988 -0300 -+++ rt1/step8/show_mpls_table.ref 2020-09-25 17:53:18.671004379 -0300 +--- a/rt1/step7/show_mpls_table.ref ++++ b/rt1/step8/show_mpls_table.ref @@ -71,6 +71,30 @@ } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff index 1d9634155..06efdc96c 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step8/show_ip_route.ref 2020-09-25 17:53:20.003021800 -0300 -+++ rt1/step9/show_ip_route.ref 2020-09-25 17:54:37.700038367 -0300 +--- a/rt1/step8/show_ip_route.ref ++++ b/rt1/step9/show_ip_route.ref @@ -85,7 +85,7 @@ "interfaceName":"eth-sw1", "active":true, diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff index 232b823ac..a58f2d447 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step8/show_ipv6_route.ref 2020-09-25 17:53:21.239037966 -0300 -+++ rt1/step9/show_ipv6_route.ref 2020-09-25 17:54:38.912054230 -0300 +--- a/rt1/step8/show_ipv6_route.ref ++++ b/rt1/step9/show_ipv6_route.ref @@ -81,7 +81,7 @@ "interfaceName":"eth-sw1", "active":true, diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff index 7f0d50f5f..c0a1ac592 100644 --- a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt1/step8/show_mpls_table.ref 2020-09-25 17:53:18.671004379 -0300 -+++ rt1/step9/show_mpls_table.ref 2020-09-25 17:54:36.428021718 -0300 +--- a/rt1/step8/show_mpls_table.ref ++++ b/rt1/step9/show_mpls_table.ref @@ -71,30 +71,6 @@ } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref b/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref index 23e07b7cd..7e1ccd10a 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref @@ -233,7 +233,10 @@ "ip":"10.0.1.3", "afi":"ipv4", "interfaceName":"eth-sw1", - "active":true + "active":true, + "labels":[ + 16060 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref b/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref index d9bd04ef3..6d31f6f26 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref @@ -104,7 +104,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-rt4-1", "active":true, "backupIndex":[ 0 @@ -116,7 +116,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", "active":true, "backupIndex":[ 0 @@ -152,7 +152,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-sw1", + "interfaceName":"eth-rt4-1", "active":true, "labels":[ 16051 @@ -161,7 +161,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-sw1", "active":true, "labels":[ 16051 @@ -170,7 +170,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", "active":true, "labels":[ 16051 @@ -192,7 +192,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-rt4-1", "active":true, "backupIndex":[ 0 @@ -204,7 +204,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", "active":true, "backupIndex":[ 0 @@ -218,7 +218,10 @@ { "afi":"ipv6", "interfaceName":"eth-sw1", - "active":true + "active":true, + "labels":[ + 16061 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref b/tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref index cd2f87959..b9b906a31 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref +++ b/tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref @@ -247,7 +247,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16060, "nexthop":"10.0.1.3" } ] @@ -278,7 +278,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16061, "interface":"eth-sw1" } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff index 22b896f68..90e089563 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step1/show_ip_route.ref 2020-09-25 17:46:27.537642781 -0300 -+++ rt2/step2/show_ip_route.ref 2020-09-25 17:46:57.306029668 -0300 +--- a/rt2/step1/show_ip_route.ref ++++ b/rt2/step2/show_ip_route.ref @@ -15,36 +15,10 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -74,7 +74,7 @@ ] } ], -@@ -248,40 +196,12 @@ +@@ -251,40 +199,12 @@ { "ip":"10.0.1.1", "afi":"ipv4", @@ -117,7 +117,7 @@ } ] } -@@ -377,24 +297,6 @@ +@@ -380,24 +300,6 @@ "ip":"10.0.1.3", "afi":"ipv4", "interfaceName":"eth-sw1", @@ -142,7 +142,7 @@ "active":true } ] -@@ -415,24 +317,6 @@ +@@ -418,24 +320,6 @@ "ip":"10.0.1.3", "afi":"ipv4", "interfaceName":"eth-sw1", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff index 08c7d2b1f..2d19f20f6 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step1/show_ipv6_route.ref 2020-09-25 17:46:28.865660035 -0300 -+++ rt2/step2/show_ipv6_route.ref 2020-09-25 17:46:58.514045373 -0300 +--- a/rt2/step1/show_ipv6_route.ref ++++ b/rt2/step2/show_ipv6_route.ref @@ -14,34 +14,10 @@ "afi":"ipv6", "interfaceName":"eth-sw1", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff index 4feb92715..01fc74a60 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step1/show_mpls_table.ref 2020-09-25 17:46:26.261626203 -0300 -+++ rt2/step2/show_mpls_table.ref 2020-09-25 17:46:56.086013807 -0300 +--- a/rt2/step1/show_mpls_table.ref ++++ b/rt2/step2/show_mpls_table.ref @@ -7,23 +7,7 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff index af1cebc76..d93f03622 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step2/show_ip_route.ref 2020-09-25 17:46:57.306029668 -0300 -+++ rt2/step3/show_ip_route.ref 2020-09-25 17:48:05.274913964 -0300 +--- a/rt2/step2/show_ip_route.ref ++++ b/rt2/step3/show_ip_route.ref @@ -15,10 +15,36 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -74,7 +74,7 @@ ] } ], -@@ -196,12 +248,40 @@ +@@ -199,12 +251,40 @@ { "ip":"10.0.1.1", "afi":"ipv4", @@ -117,7 +117,7 @@ } ] } -@@ -297,6 +377,24 @@ +@@ -300,6 +380,24 @@ "ip":"10.0.1.3", "afi":"ipv4", "interfaceName":"eth-sw1", @@ -142,7 +142,7 @@ "active":true } ] -@@ -317,6 +415,24 @@ +@@ -320,6 +418,24 @@ "ip":"10.0.1.3", "afi":"ipv4", "interfaceName":"eth-sw1", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff index 9809c316e..68b618e91 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step2/show_ipv6_route.ref 2020-09-25 17:46:58.514045373 -0300 -+++ rt2/step3/show_ipv6_route.ref 2020-09-25 17:48:06.570930838 -0300 +--- a/rt2/step2/show_ipv6_route.ref ++++ b/rt2/step3/show_ipv6_route.ref @@ -14,10 +14,34 @@ "afi":"ipv6", "interfaceName":"eth-sw1", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff index 180323e4c..966e153a6 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step2/show_mpls_table.ref 2020-09-25 17:46:56.086013807 -0300 -+++ rt2/step3/show_mpls_table.ref 2020-09-25 17:48:03.994897300 -0300 +--- a/rt2/step2/show_mpls_table.ref ++++ b/rt2/step3/show_mpls_table.ref @@ -7,7 +7,23 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff index 12d45bbe0..dd75d76b9 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step3/show_ip_route.ref 2020-09-25 17:48:05.274913964 -0300 -+++ rt2/step4/show_ip_route.ref 2020-09-25 17:49:01.763649797 -0300 +--- a/rt2/step3/show_ip_route.ref ++++ b/rt2/step4/show_ip_route.ref @@ -15,36 +15,10 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -147,7 +147,7 @@ ] } ], -@@ -248,40 +177,12 @@ +@@ -251,40 +180,12 @@ { "ip":"10.0.1.1", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff index fdf658d59..63731237e 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step3/show_ipv6_route.ref 2020-09-25 17:48:06.570930838 -0300 -+++ rt2/step4/show_ipv6_route.ref 2020-09-25 17:49:02.995665853 -0300 +--- a/rt2/step3/show_ipv6_route.ref ++++ b/rt2/step4/show_ipv6_route.ref @@ -14,34 +14,10 @@ "afi":"ipv6", "interfaceName":"eth-sw1", @@ -100,10 +100,10 @@ ] } ] -@@ -162,19 +107,13 @@ +@@ -153,10 +98,7 @@ "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-rt4-1", - "active":true, - "labels":[ - 16051 @@ -112,8 +112,10 @@ }, { "fib":true, +@@ -171,10 +113,7 @@ + "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", - "active":true, - "labels":[ - 16051 diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff index a78f79c57..3872ce498 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step3/show_mpls_table.ref 2020-09-25 17:48:03.994897300 -0300 -+++ rt2/step4/show_mpls_table.ref 2020-09-25 17:49:00.551634001 -0300 +--- a/rt2/step3/show_mpls_table.ref ++++ b/rt2/step4/show_mpls_table.ref @@ -7,23 +7,7 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff index 7d20fad3f..4d5636436 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step4/show_ip_route.ref 2020-09-25 17:49:01.763649797 -0300 -+++ rt2/step5/show_ip_route.ref 2020-09-25 17:50:12.360570411 -0300 +--- a/rt2/step4/show_ip_route.ref ++++ b/rt2/step5/show_ip_route.ref @@ -15,10 +15,36 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -147,7 +147,7 @@ ] } ], -@@ -177,12 +248,40 @@ +@@ -180,12 +251,40 @@ { "ip":"10.0.1.1", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff index 933096433..f9e0276f8 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step4/show_ipv6_route.ref 2020-09-25 17:49:02.995665853 -0300 -+++ rt2/step5/show_ipv6_route.ref 2020-09-25 17:50:13.636587060 -0300 +--- a/rt2/step4/show_ipv6_route.ref ++++ b/rt2/step5/show_ipv6_route.ref @@ -14,10 +14,34 @@ "afi":"ipv6", "interfaceName":"eth-sw1", @@ -100,10 +100,10 @@ ] } ] -@@ -107,13 +162,19 @@ +@@ -98,7 +153,10 @@ "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-rt4-1", - "active":true + "active":true, + "labels":[ @@ -112,8 +112,10 @@ }, { "fib":true, +@@ -113,7 +171,10 @@ + "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", - "active":true + "active":true, + "labels":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff index b1e44a727..6aebbd6c8 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step4/show_mpls_table.ref 2020-09-25 17:49:00.551634001 -0300 -+++ rt2/step5/show_mpls_table.ref 2020-09-25 17:50:11.068553553 -0300 +--- a/rt2/step4/show_mpls_table.ref ++++ b/rt2/step5/show_mpls_table.ref @@ -7,7 +7,23 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff index c92195d70..5e73b9784 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step6/show_ip_route.ref 2020-09-25 17:51:15.313392177 -0300 -+++ rt2/step7/show_ip_route.ref 2020-09-25 17:52:02.210004805 -0300 +--- a/rt2/step6/show_ip_route.ref ++++ b/rt2/step7/show_ip_route.ref @@ -15,36 +15,10 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -144,7 +144,7 @@ } ] } -@@ -248,40 +169,12 @@ +@@ -251,40 +172,12 @@ { "ip":"10.0.1.1", "afi":"ipv4", @@ -187,7 +187,7 @@ } ] } -@@ -296,30 +189,13 @@ +@@ -299,30 +192,13 @@ { "ip":"10.0.2.4", "afi":"ipv4", @@ -220,7 +220,7 @@ } ] } -@@ -335,29 +211,12 @@ +@@ -338,29 +214,12 @@ "ip":"10.0.2.4", "afi":"ipv4", "interfaceName":"eth-rt4-1", @@ -252,7 +252,7 @@ } ] } -@@ -494,31 +353,14 @@ +@@ -497,31 +356,14 @@ "ip":"10.0.2.4", "afi":"ipv4", "interfaceName":"eth-rt4-1", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff index 140c7b08b..5dc4e5915 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step6/show_ipv6_route.ref 2020-09-25 17:51:16.549408319 -0300 -+++ rt2/step7/show_ipv6_route.ref 2020-09-25 17:52:03.438020851 -0300 +--- a/rt2/step6/show_ipv6_route.ref ++++ b/rt2/step7/show_ipv6_route.ref @@ -14,34 +14,10 @@ "afi":"ipv6", "interfaceName":"eth-sw1", @@ -72,7 +72,7 @@ ], @@ -106,9 +58,6 @@ "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-rt4-1", "active":true, - "backupIndex":[ - 0 @@ -82,7 +82,7 @@ ] @@ -118,24 +67,10 @@ "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", "active":true, - "backupIndex":[ - 0 @@ -108,7 +108,7 @@ @@ -153,28 +88,19 @@ "fib":true, "afi":"ipv6", - "interfaceName":"eth-sw1", + "interfaceName":"eth-rt4-1", - "active":true, - "labels":[ - 16051 @@ -118,7 +118,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-sw1", - "active":true, - "labels":[ - 16051 @@ -128,7 +128,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", - "active":true, - "labels":[ - 16051 diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff index f8476cd0b..6c0d7392f 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step6/show_mpls_table.ref 2020-09-25 17:51:14.073375985 -0300 -+++ rt2/step7/show_mpls_table.ref 2020-09-25 17:52:00.973988653 -0300 +--- a/rt2/step6/show_mpls_table.ref ++++ b/rt2/step7/show_mpls_table.ref @@ -7,23 +7,7 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff index 7d5237e74..f5df60761 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step7/show_ip_route.ref 2020-09-25 17:52:02.210004805 -0300 -+++ rt2/step8/show_ip_route.ref 2020-09-25 17:53:20.207024469 -0300 +--- a/rt2/step7/show_ip_route.ref ++++ b/rt2/step8/show_ip_route.ref @@ -15,10 +15,36 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -144,7 +144,7 @@ } ] } -@@ -169,12 +248,40 @@ +@@ -172,12 +251,40 @@ { "ip":"10.0.1.1", "afi":"ipv4", @@ -187,7 +187,7 @@ } ] } -@@ -189,13 +296,30 @@ +@@ -192,13 +299,30 @@ { "ip":"10.0.2.4", "afi":"ipv4", @@ -220,7 +220,7 @@ } ] } -@@ -211,12 +335,29 @@ +@@ -214,12 +338,29 @@ "ip":"10.0.2.4", "afi":"ipv4", "interfaceName":"eth-rt4-1", @@ -252,7 +252,7 @@ } ] } -@@ -353,14 +494,31 @@ +@@ -356,14 +497,31 @@ "ip":"10.0.2.4", "afi":"ipv4", "interfaceName":"eth-rt4-1", diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff index 45322214e..125f36b1b 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step7/show_ipv6_route.ref 2020-09-25 17:52:03.438020851 -0300 -+++ rt2/step8/show_ipv6_route.ref 2020-09-25 17:53:21.443040633 -0300 +--- a/rt2/step7/show_ipv6_route.ref ++++ b/rt2/step8/show_ipv6_route.ref @@ -14,10 +14,34 @@ "afi":"ipv6", "interfaceName":"eth-sw1", @@ -72,7 +72,7 @@ ], @@ -58,6 +106,9 @@ "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-rt4-1", "active":true, + "backupIndex":[ + 0 @@ -82,7 +82,7 @@ ] @@ -67,10 +118,24 @@ "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", "active":true, + "backupIndex":[ + 0 @@ -108,7 +108,7 @@ @@ -88,19 +153,28 @@ "fib":true, "afi":"ipv6", - "interfaceName":"eth-sw1", + "interfaceName":"eth-rt4-1", - "active":true + "active":true, + "labels":[ @@ -118,7 +118,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-sw1", - "active":true + "active":true, + "labels":[ @@ -128,7 +128,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", - "active":true + "active":true, + "labels":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff index 083c64780..a1d5d795c 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step7/show_mpls_table.ref 2020-09-25 17:52:00.973988653 -0300 -+++ rt2/step8/show_mpls_table.ref 2020-09-25 17:53:18.923007676 -0300 +--- a/rt2/step7/show_mpls_table.ref ++++ b/rt2/step8/show_mpls_table.ref @@ -7,7 +7,23 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff index 15370a0a6..2475c639c 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step8/show_ip_route.ref 2020-09-25 17:53:20.207024469 -0300 -+++ rt2/step9/show_ip_route.ref 2020-09-25 17:54:37.908041089 -0300 +--- a/rt2/step8/show_ip_route.ref ++++ b/rt2/step9/show_ip_route.ref @@ -31,7 +31,7 @@ "interfaceName":"eth-rt4-1", "active":true, @@ -72,7 +72,7 @@ ] } ] -@@ -271,7 +271,7 @@ +@@ -274,7 +274,7 @@ "interfaceName":"eth-rt4-1", "active":true, "labels":[ @@ -81,7 +81,7 @@ ] }, { -@@ -280,7 +280,7 @@ +@@ -283,7 +283,7 @@ "interfaceName":"eth-rt4-2", "active":true, "labels":[ @@ -90,7 +90,7 @@ ] } ] -@@ -318,7 +318,7 @@ +@@ -321,7 +321,7 @@ "interfaceName":"eth-sw1", "active":true, "labels":[ @@ -99,7 +99,7 @@ ] } ] -@@ -356,7 +356,7 @@ +@@ -359,7 +359,7 @@ "interfaceName":"eth-sw1", "active":true, "labels":[ @@ -108,7 +108,7 @@ ] } ] -@@ -517,7 +517,7 @@ +@@ -520,7 +520,7 @@ "interfaceName":"eth-sw1", "active":true, "labels":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff index 2585f3259..2d21fbcde 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step8/show_ipv6_route.ref 2020-09-25 17:53:21.443040633 -0300 -+++ rt2/step9/show_ipv6_route.ref 2020-09-25 17:54:39.112056848 -0300 +--- a/rt2/step8/show_ipv6_route.ref ++++ b/rt2/step9/show_ipv6_route.ref @@ -29,7 +29,7 @@ "interfaceName":"eth-rt4-1", "active":true, @@ -46,7 +46,7 @@ ] } @@ -155,7 +155,7 @@ - "interfaceName":"eth-sw1", + "interfaceName":"eth-rt4-1", "active":true, "labels":[ - 16051 @@ -55,7 +55,7 @@ }, { @@ -164,7 +164,7 @@ - "interfaceName":"eth-rt4-2", + "interfaceName":"eth-sw1", "active":true, "labels":[ - 16051 @@ -64,7 +64,7 @@ }, { @@ -173,7 +173,7 @@ - "interfaceName":"eth-rt4-1", + "interfaceName":"eth-rt4-2", "active":true, "labels":[ - 16051 diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff index b90b889eb..bc0ec3157 100644 --- a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt2/step8/show_mpls_table.ref 2020-09-25 17:53:18.923007676 -0300 -+++ rt2/step9/show_mpls_table.ref 2020-09-25 17:54:36.640024493 -0300 +--- a/rt2/step8/show_mpls_table.ref ++++ b/rt2/step9/show_mpls_table.ref @@ -17,12 +17,12 @@ "backupNexthops":[ { diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref b/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref index 8c37180da..d70e9fe88 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref @@ -233,7 +233,10 @@ "ip":"10.0.1.2", "afi":"ipv4", "interfaceName":"eth-sw1", - "active":true + "active":true, + "labels":[ + 16060 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref b/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref index 5ddb24af5..058d33609 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref @@ -104,7 +104,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-sw1", + "interfaceName":"eth-rt5-1", "active":true, "labels":[ 16041 @@ -113,7 +113,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-2", + "interfaceName":"eth-sw1", "active":true, "labels":[ 16041 @@ -122,7 +122,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", "active":true, "labels":[ 16041 @@ -144,7 +144,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-2", + "interfaceName":"eth-rt5-1", "active":true, "backupIndex":[ 0 @@ -156,7 +156,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", "active":true, "backupIndex":[ 0 @@ -192,7 +192,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-2", + "interfaceName":"eth-rt5-1", "active":true, "backupIndex":[ 0 @@ -204,7 +204,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", "active":true, "backupIndex":[ 0 @@ -218,7 +218,10 @@ { "afi":"ipv6", "interfaceName":"eth-sw1", - "active":true + "active":true, + "labels":[ + 16061 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref b/tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref index f68d1f424..1912df3f0 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref +++ b/tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref @@ -247,7 +247,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16060, "nexthop":"10.0.1.2" } ] @@ -278,7 +278,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16061, "interface":"eth-sw1" } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff index 707f95495..9ba73b057 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step3/show_ip_route.ref 2020-09-25 17:48:05.506916984 -0300 -+++ rt3/step4/show_ip_route.ref 2020-09-25 17:49:01.963652403 -0300 +--- a/rt3/step3/show_ip_route.ref ++++ b/rt3/step4/show_ip_route.ref @@ -15,36 +15,10 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -144,7 +144,7 @@ ] } ], -@@ -248,40 +169,12 @@ +@@ -251,40 +172,12 @@ { "ip":"10.0.1.1", "afi":"ipv4", @@ -187,7 +187,7 @@ } ] } -@@ -372,30 +265,13 @@ +@@ -375,30 +268,13 @@ { "ip":"10.0.4.5", "afi":"ipv4", @@ -220,7 +220,7 @@ } ] } -@@ -411,29 +287,12 @@ +@@ -414,29 +290,12 @@ "ip":"10.0.4.5", "afi":"ipv4", "interfaceName":"eth-rt5-1", @@ -252,7 +252,7 @@ } ] } -@@ -528,31 +387,14 @@ +@@ -531,31 +390,14 @@ "ip":"10.0.4.5", "afi":"ipv4", "interfaceName":"eth-rt5-1", diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff index 76d0ebc91..04f61c4eb 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step3/show_ipv6_route.ref 2020-09-25 17:48:06.790933702 -0300 -+++ rt3/step4/show_ipv6_route.ref 2020-09-25 17:49:03.199668512 -0300 +--- a/rt3/step3/show_ipv6_route.ref ++++ b/rt3/step4/show_ipv6_route.ref @@ -14,34 +14,10 @@ "afi":"ipv6", "interfaceName":"eth-sw1", @@ -73,7 +73,7 @@ @@ -105,28 +57,19 @@ "fib":true, "afi":"ipv6", - "interfaceName":"eth-sw1", + "interfaceName":"eth-rt5-1", - "active":true, - "labels":[ - 16041 @@ -83,7 +83,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-2", + "interfaceName":"eth-sw1", - "active":true, - "labels":[ - 16041 @@ -93,7 +93,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", - "active":true, - "labels":[ - 16041 @@ -104,7 +104,7 @@ } @@ -146,9 +89,6 @@ "afi":"ipv6", - "interfaceName":"eth-rt5-2", + "interfaceName":"eth-rt5-1", "active":true, - "backupIndex":[ - 0 @@ -114,7 +114,7 @@ ] @@ -158,24 +98,10 @@ "afi":"ipv6", - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", "active":true, - "backupIndex":[ - 0 diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff index b888c9d27..b3588ca79 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step3/show_mpls_table.ref 2020-09-25 17:48:04.214900164 -0300 -+++ rt3/step4/show_mpls_table.ref 2020-09-25 17:49:00.759636711 -0300 +--- a/rt3/step3/show_mpls_table.ref ++++ b/rt3/step4/show_mpls_table.ref @@ -7,23 +7,7 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff index 8eac75bec..1af024fc2 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step4/show_ip_route.ref 2020-09-25 17:49:01.963652403 -0300 -+++ rt3/step5/show_ip_route.ref 2020-09-25 17:50:12.592573438 -0300 +--- a/rt3/step4/show_ip_route.ref ++++ b/rt3/step5/show_ip_route.ref @@ -15,10 +15,36 @@ "afi":"ipv4", "interfaceName":"eth-sw1", @@ -144,7 +144,7 @@ ] } ], -@@ -169,12 +248,40 @@ +@@ -172,12 +251,40 @@ { "ip":"10.0.1.1", "afi":"ipv4", @@ -187,7 +187,7 @@ } ] } -@@ -265,13 +372,30 @@ +@@ -268,13 +375,30 @@ { "ip":"10.0.4.5", "afi":"ipv4", @@ -220,7 +220,7 @@ } ] } -@@ -287,12 +411,29 @@ +@@ -290,12 +414,29 @@ "ip":"10.0.4.5", "afi":"ipv4", "interfaceName":"eth-rt5-1", @@ -252,7 +252,7 @@ } ] } -@@ -387,14 +528,31 @@ +@@ -390,14 +531,31 @@ "ip":"10.0.4.5", "afi":"ipv4", "interfaceName":"eth-rt5-1", diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff index fc55267ad..7cc79d0e5 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step4/show_ipv6_route.ref 2020-09-25 17:49:03.199668512 -0300 -+++ rt3/step5/show_ipv6_route.ref 2020-09-25 17:50:13.840589722 -0300 +--- a/rt3/step4/show_ipv6_route.ref ++++ b/rt3/step5/show_ipv6_route.ref @@ -14,10 +14,34 @@ "afi":"ipv6", "interfaceName":"eth-sw1", @@ -73,7 +73,7 @@ @@ -57,19 +105,28 @@ "fib":true, "afi":"ipv6", - "interfaceName":"eth-sw1", + "interfaceName":"eth-rt5-1", - "active":true + "active":true, + "labels":[ @@ -83,7 +83,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-2", + "interfaceName":"eth-sw1", - "active":true + "active":true, + "labels":[ @@ -93,7 +93,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", - "active":true + "active":true, + "labels":[ @@ -104,7 +104,7 @@ } @@ -89,6 +146,9 @@ "afi":"ipv6", - "interfaceName":"eth-rt5-2", + "interfaceName":"eth-rt5-1", "active":true, + "backupIndex":[ + 0 @@ -114,7 +114,7 @@ ] @@ -98,10 +158,24 @@ "afi":"ipv6", - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", "active":true, + "backupIndex":[ + 0 diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff index 4ed491e24..75a0f01f5 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step4/show_mpls_table.ref 2020-09-25 17:49:00.759636711 -0300 -+++ rt3/step5/show_mpls_table.ref 2020-09-25 17:50:11.280556320 -0300 +--- a/rt3/step4/show_mpls_table.ref ++++ b/rt3/step5/show_mpls_table.ref @@ -7,7 +7,23 @@ "type":"SR (IS-IS)", "outLabel":3, diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff index 9273c7535..c814a2876 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step5/show_ip_route.ref 2020-09-25 17:50:12.592573438 -0300 -+++ rt3/step6/show_ip_route.ref 2020-09-25 17:51:15.521394894 -0300 +--- a/rt3/step5/show_ip_route.ref ++++ b/rt3/step6/show_ip_route.ref @@ -31,7 +31,7 @@ "interfaceName":"eth-rt5-1", "active":true, @@ -81,7 +81,7 @@ ] } ], -@@ -271,7 +271,7 @@ +@@ -274,7 +274,7 @@ "interfaceName":"eth-rt5-1", "active":true, "labels":[ @@ -90,7 +90,7 @@ ] }, { -@@ -280,7 +280,7 @@ +@@ -283,7 +283,7 @@ "interfaceName":"eth-rt5-2", "active":true, "labels":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff index f50be893e..6f9405f20 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step5/show_ipv6_route.ref 2020-09-25 17:50:13.840589722 -0300 -+++ rt3/step6/show_ipv6_route.ref 2020-09-25 17:51:16.757411035 -0300 +--- a/rt3/step5/show_ipv6_route.ref ++++ b/rt3/step6/show_ipv6_route.ref @@ -29,7 +29,7 @@ "interfaceName":"eth-rt5-1", "active":true, @@ -36,8 +36,8 @@ 16021 ] } -@@ -116,7 +116,7 @@ - "interfaceName":"eth-rt5-2", +@@ -107,7 +107,7 @@ + "interfaceName":"eth-rt5-1", "active":true, "labels":[ - 16041 @@ -46,7 +46,7 @@ }, { @@ -125,7 +125,7 @@ - "interfaceName":"eth-rt5-1", + "interfaceName":"eth-rt5-2", "active":true, "labels":[ - 16041 diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff index b63a728ef..d8c39685d 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step5/show_mpls_table.ref 2020-09-25 17:50:11.280556320 -0300 -+++ rt3/step6/show_mpls_table.ref 2020-09-25 17:51:14.281378700 -0300 +--- a/rt3/step5/show_mpls_table.ref ++++ b/rt3/step6/show_mpls_table.ref @@ -17,12 +17,12 @@ "backupNexthops":[ { diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff index 0ae87afa3..c928fcdb4 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step6/show_ip_route.ref 2020-09-25 17:51:15.521394894 -0300 -+++ rt3/step7/show_ip_route.ref 2020-09-25 17:52:02.414007470 -0300 +--- a/rt3/step6/show_ip_route.ref ++++ b/rt3/step7/show_ip_route.ref @@ -158,9 +158,6 @@ "active":true, "backupIndex":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff index f392f644c..017097178 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step6/show_ipv6_route.ref 2020-09-25 17:51:16.757411035 -0300 -+++ rt3/step7/show_ipv6_route.ref 2020-09-25 17:52:03.650023622 -0300 +--- a/rt3/step6/show_ipv6_route.ref ++++ b/rt3/step7/show_ipv6_route.ref @@ -148,9 +148,6 @@ "active":true, "backupIndex":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff index b74eb9579..d7a3ed978 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step6/show_mpls_table.ref 2020-09-25 17:51:14.281378700 -0300 -+++ rt3/step7/show_mpls_table.ref 2020-09-25 17:52:01.181991371 -0300 +--- a/rt3/step6/show_mpls_table.ref ++++ b/rt3/step7/show_mpls_table.ref @@ -159,68 +159,6 @@ } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff index 25b42f282..41a7ff325 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step7/show_ip_route.ref 2020-09-25 17:52:02.414007470 -0300 -+++ rt3/step8/show_ip_route.ref 2020-09-25 17:53:20.419027241 -0300 +--- a/rt3/step7/show_ip_route.ref ++++ b/rt3/step8/show_ip_route.ref @@ -158,6 +158,9 @@ "active":true, "backupIndex":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff index 42d9356c8..bd49f8606 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step7/show_ipv6_route.ref 2020-09-25 17:52:03.650023622 -0300 -+++ rt3/step8/show_ipv6_route.ref 2020-09-25 17:53:21.643043250 -0300 +--- a/rt3/step7/show_ipv6_route.ref ++++ b/rt3/step8/show_ipv6_route.ref @@ -148,6 +148,9 @@ "active":true, "backupIndex":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff index bd40f954e..4cc69b66f 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step7/show_mpls_table.ref 2020-09-25 17:52:01.181991371 -0300 -+++ rt3/step8/show_mpls_table.ref 2020-09-25 17:53:19.135010448 -0300 +--- a/rt3/step7/show_mpls_table.ref ++++ b/rt3/step8/show_mpls_table.ref @@ -159,6 +159,68 @@ } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff index 687e84ad4..cc0a482ee 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step8/show_ip_route.ref 2020-09-25 17:53:20.419027241 -0300 -+++ rt3/step9/show_ip_route.ref 2020-09-25 17:54:38.112043759 -0300 +--- a/rt3/step8/show_ip_route.ref ++++ b/rt3/step9/show_ip_route.ref @@ -185,7 +185,7 @@ "active":true, "labels":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff index 4b76be66a..650b982f0 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step8/show_ipv6_route.ref 2020-09-25 17:53:21.643043250 -0300 -+++ rt3/step9/show_ipv6_route.ref 2020-09-25 17:54:39.320059571 -0300 +--- a/rt3/step8/show_ipv6_route.ref ++++ b/rt3/step9/show_ipv6_route.ref @@ -173,7 +173,7 @@ "active":true, "labels":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff index 6f6451e51..8ce4f1d26 100644 --- a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt3/step8/show_mpls_table.ref 2020-09-25 17:53:19.135010448 -0300 -+++ rt3/step9/show_mpls_table.ref 2020-09-25 17:54:36.852027268 -0300 +--- a/rt3/step8/show_mpls_table.ref ++++ b/rt3/step9/show_mpls_table.ref @@ -159,13 +159,13 @@ } ] @@ -31,7 +31,7 @@ { "type":"SR (IS-IS)", - "outLabel":16040, -+ "outLabel":3, ++ "outLabel":16060, "nexthop":"10.0.1.2" } ] @@ -63,7 +63,7 @@ { "type":"SR (IS-IS)", - "outLabel":16041, -+ "outLabel":3, ++ "outLabel":16061, "interface":"eth-sw1" } ] @@ -94,7 +94,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16060, + "outLabel":16040, "nexthop":"10.0.1.2" } @@ -126,7 +126,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16061, + "outLabel":16041, "interface":"eth-sw1" } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref b/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref index 168b90a3f..0ef5d1bc3 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref @@ -41,7 +41,10 @@ "ip":"10.0.6.5", "afi":"ipv4", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16010 + ] } ] } @@ -169,7 +172,10 @@ "ip":"10.0.7.6", "afi":"ipv4", "interfaceName":"eth-rt6", - "active":true + "active":true, + "labels":[ + 16050 + ] } ] } @@ -203,7 +209,10 @@ "ip":"10.0.6.5", "afi":"ipv4", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16060 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref b/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref index a4442ee08..b640df30c 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref @@ -12,7 +12,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt2-1", + "interfaceName":"eth-rt2-2", "active":true, "backupIndex":[ 0 @@ -24,7 +24,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt2-2", + "interfaceName":"eth-rt2-1", "active":true, "backupIndex":[ 0 @@ -38,7 +38,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16011 + ] } ] } @@ -56,7 +59,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt2-1", + "interfaceName":"eth-rt2-2", "active":true, "backupIndex":[ 0 @@ -68,7 +71,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt2-2", + "interfaceName":"eth-rt2-1", "active":true, "backupIndex":[ 0 @@ -104,7 +107,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt2-1", + "interfaceName":"eth-rt2-2", "active":true, "labels":[ 16031 @@ -113,7 +116,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5", + "interfaceName":"eth-rt2-1", "active":true, "labels":[ 16031 @@ -122,7 +125,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt2-2", + "interfaceName":"eth-rt5", "active":true, "labels":[ 16031 @@ -158,7 +161,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt6", - "active":true + "active":true, + "labels":[ + 16051 + ] } ] } @@ -190,7 +196,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16061 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref b/tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref index 18354e947..f60937ccb 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref +++ b/tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref @@ -25,7 +25,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16010, "nexthop":"10.0.6.5" } ] @@ -56,7 +56,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16011, "interface":"eth-rt5" } ] @@ -188,7 +188,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16050, "nexthop":"10.0.7.6" } ] @@ -210,7 +210,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16051, "interface":"eth-rt6" } ] @@ -232,7 +232,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16060, "nexthop":"10.0.6.5" } ] @@ -254,7 +254,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16061, "interface":"eth-rt5" } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff index 7dcdb744a..8b115c205 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt4/step3/show_ip_route.ref 2020-09-25 17:48:05.722919797 -0300 -+++ rt4/step4/show_ip_route.ref 2020-09-25 17:49:02.163655010 -0300 +--- a/rt4/step3/show_ip_route.ref ++++ b/rt4/step4/show_ip_route.ref @@ -15,9 +15,6 @@ "afi":"ipv4", "interfaceName":"eth-rt2-1", @@ -10,29 +10,28 @@ "labels":[ 16010 ] -@@ -28,21 +25,10 @@ +@@ -28,20 +25,6 @@ "afi":"ipv4", "interfaceName":"eth-rt2-2", "active":true, - "backupIndex":[ - 0 - ], - "labels":[ - 16010 - ] - } +- "labels":[ +- 16010 +- ] +- } - ], - "backupNexthops":[ - { - "ip":"10.0.6.5", - "afi":"ipv4", - "interfaceName":"eth-rt5", -- "active":true -- } - ] - } - ], -@@ -62,9 +48,6 @@ +- "active":true, + "labels":[ + 16010 + ] +@@ -65,9 +48,6 @@ "afi":"ipv4", "interfaceName":"eth-rt2-1", "active":true, @@ -42,7 +41,7 @@ "labels":[ 3 ] -@@ -75,25 +58,10 @@ +@@ -78,25 +58,10 @@ "afi":"ipv4", "interfaceName":"eth-rt2-2", "active":true, @@ -68,7 +67,7 @@ ] } ], -@@ -156,21 +124,10 @@ +@@ -159,24 +124,10 @@ "afi":"ipv4", "interfaceName":"eth-rt5", "active":true, @@ -85,12 +84,15 @@ - "ip":"10.0.7.6", - "afi":"ipv4", - "interfaceName":"eth-rt6", -- "active":true +- "active":true, +- "labels":[ +- 16050 +- ] - } ] } ], -@@ -190,21 +147,10 @@ +@@ -196,24 +147,10 @@ "afi":"ipv4", "interfaceName":"eth-rt6", "active":true, @@ -107,12 +109,15 @@ - "ip":"10.0.6.5", - "afi":"ipv4", - "interfaceName":"eth-rt5", -- "active":true +- "active":true, +- "labels":[ +- 16060 +- ] - } ] } ], -@@ -223,27 +169,13 @@ +@@ -232,27 +169,13 @@ "ip":"10.0.2.2", "afi":"ipv4", "interfaceName":"eth-rt2-1", @@ -141,7 +146,7 @@ "active":true } ] -@@ -259,30 +191,13 @@ +@@ -268,30 +191,13 @@ { "ip":"10.0.2.2", "afi":"ipv4", @@ -174,7 +179,7 @@ } ] } -@@ -298,29 +213,12 @@ +@@ -307,29 +213,12 @@ "ip":"10.0.2.2", "afi":"ipv4", "interfaceName":"eth-rt2-1", @@ -206,7 +211,7 @@ } ] } -@@ -340,31 +238,6 @@ +@@ -349,31 +238,6 @@ "ip":"10.0.6.5", "afi":"ipv4", "interfaceName":"eth-rt5", @@ -238,7 +243,7 @@ "active":true } ] -@@ -385,31 +258,6 @@ +@@ -394,31 +258,6 @@ "ip":"10.0.6.5", "afi":"ipv4", "interfaceName":"eth-rt5", @@ -270,7 +275,7 @@ "active":true } ] -@@ -425,18 +273,7 @@ +@@ -434,18 +273,7 @@ { "ip":"10.0.6.5", "afi":"ipv4", @@ -290,7 +295,7 @@ } ] } -@@ -451,18 +288,7 @@ +@@ -460,18 +288,7 @@ { "ip":"10.0.7.6", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff index b84ceaff1..7f3928508 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff @@ -1,8 +1,8 @@ ---- rt4/step3/show_ipv6_route.ref 2020-09-25 17:48:06.998936410 -0300 -+++ rt4/step4/show_ipv6_route.ref 2020-09-25 17:49:03.399671119 -0300 +--- a/rt4/step3/show_ipv6_route.ref ++++ b/rt4/step4/show_ipv6_route.ref @@ -14,9 +14,6 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-1", + "interfaceName":"eth-rt2-2", "active":true, - "backupIndex":[ - 0 @@ -10,30 +10,29 @@ "labels":[ 16011 ] -@@ -26,20 +23,10 @@ +@@ -26,19 +23,6 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-2", + "interfaceName":"eth-rt2-1", "active":true, - "backupIndex":[ - 0 - ], - "labels":[ - 16011 - ] - } +- "labels":[ +- 16011 +- ] +- } - ], - "backupNexthops":[ - { - "afi":"ipv6", - "interfaceName":"eth-rt5", -- "active":true -- } - ] - } - ], -@@ -58,9 +45,6 @@ +- "active":true, + "labels":[ + 16011 + ] +@@ -61,9 +45,6 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-1", + "interfaceName":"eth-rt2-2", "active":true, - "backupIndex":[ - 0 @@ -41,9 +40,9 @@ "labels":[ 3 ] -@@ -70,24 +54,10 @@ +@@ -73,24 +54,10 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-2", + "interfaceName":"eth-rt2-1", "active":true, - "backupIndex":[ - 0 @@ -66,7 +65,7 @@ ] } ], -@@ -146,20 +116,10 @@ +@@ -149,23 +116,10 @@ "afi":"ipv6", "interfaceName":"eth-rt5", "active":true, @@ -82,12 +81,15 @@ - { - "afi":"ipv6", - "interfaceName":"eth-rt6", -- "active":true +- "active":true, +- "labels":[ +- 16051 +- ] - } ] } ], -@@ -178,20 +138,10 @@ +@@ -184,23 +138,10 @@ "afi":"ipv6", "interfaceName":"eth-rt6", "active":true, @@ -103,7 +105,10 @@ - { - "afi":"ipv6", - "interfaceName":"eth-rt5", -- "active":true +- "active":true, +- "labels":[ +- 16061 +- ] - } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff index 70e0108b0..3dcd36c17 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt4/step3/show_mpls_table.ref 2020-09-25 17:48:04.418902820 -0300 -+++ rt4/step4/show_mpls_table.ref 2020-09-25 17:49:00.959639319 -0300 +--- a/rt4/step3/show_mpls_table.ref ++++ b/rt4/step4/show_mpls_table.ref @@ -7,26 +7,13 @@ "type":"SR (IS-IS)", "outLabel":16010, @@ -23,7 +23,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16010, - "nexthop":"10.0.6.5" + "nexthop":"10.0.2.2" } @@ -52,7 +52,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16011, - "interface":"eth-rt5" + "interface":"eth-rt2-1" } @@ -129,7 +129,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16050, - "nexthop":"10.0.7.6" + "nexthop":"10.0.6.5" } @@ -148,7 +148,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16051, - "interface":"eth-rt6" + "interface":"eth-rt5" } @@ -167,7 +167,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16060, - "nexthop":"10.0.6.5" + "nexthop":"10.0.7.6" } @@ -186,7 +186,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16061, - "interface":"eth-rt5" + "interface":"eth-rt6" } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff index aa319a323..484a3147d 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt4/step4/show_ip_route.ref 2020-09-25 17:49:02.163655010 -0300 -+++ rt4/step5/show_ip_route.ref 2020-09-25 17:50:12.800576153 -0300 +--- a/rt4/step4/show_ip_route.ref ++++ b/rt4/step5/show_ip_route.ref @@ -15,6 +15,9 @@ "afi":"ipv4", "interfaceName":"eth-rt2-1", @@ -10,29 +10,28 @@ "labels":[ 16010 ] -@@ -25,10 +28,21 @@ +@@ -25,6 +28,20 @@ "afi":"ipv4", "interfaceName":"eth-rt2-2", "active":true, + "backupIndex":[ + 0 + ], - "labels":[ - 16010 - ] - } ++ "labels":[ ++ 16010 ++ ] ++ } + ], + "backupNexthops":[ + { + "ip":"10.0.6.5", + "afi":"ipv4", + "interfaceName":"eth-rt5", -+ "active":true -+ } - ] - } - ], -@@ -48,6 +62,9 @@ ++ "active":true, + "labels":[ + 16010 + ] +@@ -48,6 +65,9 @@ "afi":"ipv4", "interfaceName":"eth-rt2-1", "active":true, @@ -42,7 +41,7 @@ "labels":[ 3 ] -@@ -58,10 +75,25 @@ +@@ -58,10 +78,25 @@ "afi":"ipv4", "interfaceName":"eth-rt2-2", "active":true, @@ -68,7 +67,7 @@ ] } ], -@@ -124,10 +156,21 @@ +@@ -124,10 +159,24 @@ "afi":"ipv4", "interfaceName":"eth-rt5", "active":true, @@ -85,12 +84,15 @@ + "ip":"10.0.7.6", + "afi":"ipv4", + "interfaceName":"eth-rt6", -+ "active":true ++ "active":true, ++ "labels":[ ++ 16050 ++ ] + } ] } ], -@@ -147,10 +190,21 @@ +@@ -147,10 +196,24 @@ "afi":"ipv4", "interfaceName":"eth-rt6", "active":true, @@ -107,12 +109,15 @@ + "ip":"10.0.6.5", + "afi":"ipv4", + "interfaceName":"eth-rt5", -+ "active":true ++ "active":true, ++ "labels":[ ++ 16060 ++ ] + } ] } ], -@@ -169,13 +223,27 @@ +@@ -169,13 +232,27 @@ "ip":"10.0.2.2", "afi":"ipv4", "interfaceName":"eth-rt2-1", @@ -141,7 +146,7 @@ "active":true } ] -@@ -191,13 +259,30 @@ +@@ -191,13 +268,30 @@ { "ip":"10.0.2.2", "afi":"ipv4", @@ -174,7 +179,7 @@ } ] } -@@ -213,12 +298,29 @@ +@@ -213,12 +307,29 @@ "ip":"10.0.2.2", "afi":"ipv4", "interfaceName":"eth-rt2-1", @@ -206,7 +211,7 @@ } ] } -@@ -238,6 +340,31 @@ +@@ -238,6 +349,31 @@ "ip":"10.0.6.5", "afi":"ipv4", "interfaceName":"eth-rt5", @@ -238,7 +243,7 @@ "active":true } ] -@@ -258,6 +385,31 @@ +@@ -258,6 +394,31 @@ "ip":"10.0.6.5", "afi":"ipv4", "interfaceName":"eth-rt5", @@ -270,7 +275,7 @@ "active":true } ] -@@ -273,7 +425,18 @@ +@@ -273,7 +434,18 @@ { "ip":"10.0.6.5", "afi":"ipv4", @@ -290,7 +295,7 @@ } ] } -@@ -288,7 +451,18 @@ +@@ -288,7 +460,18 @@ { "ip":"10.0.7.6", "afi":"ipv4", diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff index 1bd207854..3ad008512 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff @@ -1,8 +1,8 @@ ---- rt4/step4/show_ipv6_route.ref 2020-09-25 17:49:03.399671119 -0300 -+++ rt4/step5/show_ipv6_route.ref 2020-09-25 17:50:14.040592332 -0300 +--- a/rt4/step4/show_ipv6_route.ref ++++ b/rt4/step5/show_ipv6_route.ref @@ -14,6 +14,9 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-1", + "interfaceName":"eth-rt2-2", "active":true, + "backupIndex":[ + 0 @@ -10,30 +10,29 @@ "labels":[ 16011 ] -@@ -23,10 +26,20 @@ +@@ -23,6 +26,19 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-2", + "interfaceName":"eth-rt2-1", "active":true, + "backupIndex":[ + 0 + ], - "labels":[ - 16011 - ] - } ++ "labels":[ ++ 16011 ++ ] ++ } + ], + "backupNexthops":[ + { + "afi":"ipv6", + "interfaceName":"eth-rt5", -+ "active":true -+ } - ] - } - ], -@@ -45,6 +58,9 @@ ++ "active":true, + "labels":[ + 16011 + ] +@@ -45,6 +61,9 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-1", + "interfaceName":"eth-rt2-2", "active":true, + "backupIndex":[ + 0 @@ -41,9 +40,9 @@ "labels":[ 3 ] -@@ -54,10 +70,24 @@ +@@ -54,10 +73,24 @@ "afi":"ipv6", - "interfaceName":"eth-rt2-2", + "interfaceName":"eth-rt2-1", "active":true, + "backupIndex":[ + 0 @@ -66,7 +65,7 @@ ] } ], -@@ -116,10 +146,20 @@ +@@ -116,10 +149,23 @@ "afi":"ipv6", "interfaceName":"eth-rt5", "active":true, @@ -82,12 +81,15 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt6", -+ "active":true ++ "active":true, ++ "labels":[ ++ 16051 ++ ] + } ] } ], -@@ -138,10 +178,20 @@ +@@ -138,10 +184,23 @@ "afi":"ipv6", "interfaceName":"eth-rt6", "active":true, @@ -103,7 +105,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt5", -+ "active":true ++ "active":true, ++ "labels":[ ++ 16061 ++ ] + } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff index 664b129a1..20e363375 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt4/step4/show_mpls_table.ref 2020-09-25 17:49:00.959639319 -0300 -+++ rt4/step5/show_mpls_table.ref 2020-09-25 17:50:11.488559034 -0300 +--- a/rt4/step4/show_mpls_table.ref ++++ b/rt4/step5/show_mpls_table.ref @@ -7,13 +7,26 @@ "type":"SR (IS-IS)", "outLabel":16010, @@ -24,7 +24,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16010, + "nexthop":"10.0.6.5" } ] @@ -53,7 +53,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16011, + "interface":"eth-rt5" } ] @@ -130,7 +130,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16050, + "nexthop":"10.0.7.6" } ] @@ -149,7 +149,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16051, + "interface":"eth-rt6" } ] @@ -168,7 +168,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16060, + "nexthop":"10.0.6.5" } ] @@ -187,7 +187,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16061, + "interface":"eth-rt5" } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff index c758b8983..907041473 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff @@ -1,6 +1,15 @@ ---- rt4/step5/show_ip_route.ref 2020-09-25 17:50:12.800576153 -0300 -+++ rt4/step6/show_ip_route.ref 2020-09-25 17:51:15.725397558 -0300 -@@ -90,7 +90,7 @@ +--- a/rt4/step5/show_ip_route.ref ++++ b/rt4/step6/show_ip_route.ref +@@ -43,7 +43,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16010 ++ 30010 + ] + } + ] +@@ -93,7 +93,7 @@ "interfaceName":"eth-rt5", "active":true, "labels":[ @@ -9,7 +18,7 @@ 16020 ] } -@@ -134,7 +134,7 @@ +@@ -137,7 +137,7 @@ "interfaceName":"eth-rt5", "active":true, "labels":[ @@ -18,7 +27,16 @@ ] } ] -@@ -281,7 +281,7 @@ +@@ -211,7 +211,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16060 ++ 30060 + ] + } + ] +@@ -290,7 +290,7 @@ "interfaceName":"eth-rt5", "active":true, "labels":[ @@ -27,7 +45,7 @@ ] } ] -@@ -319,7 +319,7 @@ +@@ -328,7 +328,7 @@ "interfaceName":"eth-rt5", "active":true, "labels":[ diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff index ca495216d..57a57647a 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff @@ -1,6 +1,15 @@ ---- rt4/step5/show_ipv6_route.ref 2020-09-25 17:50:14.040592332 -0300 -+++ rt4/step6/show_ipv6_route.ref 2020-09-25 17:51:16.969413804 -0300 -@@ -84,7 +84,7 @@ +--- a/rt4/step5/show_ipv6_route.ref ++++ b/rt4/step6/show_ipv6_route.ref +@@ -40,7 +40,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16011 ++ 30011 + ] + } + ] +@@ -87,7 +87,7 @@ "interfaceName":"eth-rt5", "active":true, "labels":[ @@ -9,12 +18,21 @@ 16021 ] } -@@ -116,7 +116,7 @@ +@@ -128,7 +128,7 @@ "interfaceName":"eth-rt5", "active":true, "labels":[ - 16031 + 30031 ] - }, - { + } + ] +@@ -198,7 +198,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16061 ++ 30061 + ] + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff index 630e0419c..94f87854d 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff @@ -1,5 +1,23 @@ ---- rt4/step5/show_mpls_table.ref 2020-09-25 17:50:11.488559034 -0300 -+++ rt4/step6/show_mpls_table.ref 2020-09-25 17:51:14.481381312 -0300 +--- a/rt4/step5/show_mpls_table.ref ++++ b/rt4/step6/show_mpls_table.ref +@@ -25,7 +25,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16010, ++ "outLabel":30010, + "nexthop":"10.0.6.5" + } + ] +@@ -56,7 +56,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16011, ++ "outLabel":30011, + "interface":"eth-rt5" + } + ] @@ -87,7 +87,7 @@ "backupNexthops":[ { @@ -36,3 +54,21 @@ "installed":true, "interface":"eth-rt5" } +@@ -232,7 +232,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16060, ++ "outLabel":30060, + "nexthop":"10.0.6.5" + } + ] +@@ -254,7 +254,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16061, ++ "outLabel":30061, + "interface":"eth-rt5" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff index 30e0dcf3c..e54873d5a 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff @@ -1,6 +1,6 @@ ---- rt4/step6/show_ip_route.ref 2020-09-25 17:51:15.725397558 -0300 -+++ rt4/step7/show_ip_route.ref 2020-09-25 17:52:02.614010084 -0300 -@@ -158,9 +158,6 @@ +--- a/rt4/step6/show_ip_route.ref ++++ b/rt4/step7/show_ip_route.ref +@@ -161,9 +161,6 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -172,10 +169,7 @@ + "ip":"10.0.7.6", + "afi":"ipv4", + "interfaceName":"eth-rt6", +- "active":true, +- "labels":[ +- 16050 +- ] ++ "active":true + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff index 2606027d7..92e08f99a 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff @@ -1,6 +1,6 @@ ---- rt4/step6/show_ipv6_route.ref 2020-09-25 17:51:16.969413804 -0300 -+++ rt4/step7/show_ipv6_route.ref 2020-09-25 17:52:03.854026287 -0300 -@@ -148,9 +148,6 @@ +--- a/rt4/step6/show_ipv6_route.ref ++++ b/rt4/step7/show_ipv6_route.ref +@@ -151,9 +151,6 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -161,10 +158,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt6", +- "active":true, +- "labels":[ +- 16051 +- ] ++ "active":true + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff index 5334cfd04..fb614ebf6 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt4/step6/show_mpls_table.ref 2020-09-25 17:51:14.481381312 -0300 -+++ rt4/step7/show_mpls_table.ref 2020-09-25 17:52:01.385994037 -0300 +--- a/rt4/step6/show_mpls_table.ref ++++ b/rt4/step7/show_mpls_table.ref @@ -171,50 +171,6 @@ } ] @@ -21,7 +21,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16050, - "nexthop":"10.0.7.6" - } - ] @@ -43,7 +43,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16051, - "interface":"eth-rt6" - } - ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff index b393970e4..252da6e76 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff @@ -1,6 +1,6 @@ ---- rt4/step7/show_ip_route.ref 2020-09-25 17:52:02.614010084 -0300 -+++ rt4/step8/show_ip_route.ref 2020-09-25 17:53:20.623029909 -0300 -@@ -158,6 +158,9 @@ +--- a/rt4/step7/show_ip_route.ref ++++ b/rt4/step8/show_ip_route.ref +@@ -161,6 +161,9 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -169,7 +172,10 @@ + "ip":"10.0.7.6", + "afi":"ipv4", + "interfaceName":"eth-rt6", +- "active":true ++ "active":true, ++ "labels":[ ++ 16050 ++ ] + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff index 8bad2edcf..7057d2166 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff @@ -1,6 +1,6 @@ ---- rt4/step7/show_ipv6_route.ref 2020-09-25 17:52:03.854026287 -0300 -+++ rt4/step8/show_ipv6_route.ref 2020-09-25 17:53:21.843045865 -0300 -@@ -148,6 +148,9 @@ +--- a/rt4/step7/show_ipv6_route.ref ++++ b/rt4/step8/show_ipv6_route.ref +@@ -151,6 +151,9 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -158,7 +161,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt6", +- "active":true ++ "active":true, ++ "labels":[ ++ 16051 ++ ] + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff index d296dbdca..3dc4303b9 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt4/step7/show_mpls_table.ref 2020-09-25 17:52:01.385994037 -0300 -+++ rt4/step8/show_mpls_table.ref 2020-09-25 17:53:19.371013534 -0300 +--- a/rt4/step7/show_mpls_table.ref ++++ b/rt4/step8/show_mpls_table.ref @@ -171,6 +171,50 @@ } ] @@ -21,7 +21,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16050, + "nexthop":"10.0.7.6" + } + ] @@ -43,7 +43,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16051, + "interface":"eth-rt6" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ip_route.ref.diff index e69de29bb..56f9cc534 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ip_route.ref.diff @@ -0,0 +1,11 @@ +--- a/rt4/step8/show_ip_route.ref ++++ b/rt4/step9/show_ip_route.ref +@@ -174,7 +174,7 @@ + "interfaceName":"eth-rt6", + "active":true, + "labels":[ +- 16050 ++ 16500 + ] + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ipv6_route.ref.diff index e69de29bb..41e552177 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ipv6_route.ref.diff @@ -0,0 +1,11 @@ +--- a/rt4/step8/show_ipv6_route.ref ++++ b/rt4/step9/show_ipv6_route.ref +@@ -163,7 +163,7 @@ + "interfaceName":"eth-rt6", + "active":true, + "labels":[ +- 16051 ++ 16501 + ] + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff index 408cbfb0b..627e29251 100644 --- a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt4/step8/show_mpls_table.ref 2020-09-25 17:53:19.371013534 -0300 -+++ rt4/step9/show_mpls_table.ref 2020-09-25 17:54:37.064030042 -0300 +--- a/rt4/step8/show_mpls_table.ref ++++ b/rt4/step9/show_mpls_table.ref @@ -171,15 +171,15 @@ } ] @@ -19,11 +19,13 @@ "backupIndex":[ 0 ] -@@ -189,19 +189,19 @@ +@@ -188,20 +188,20 @@ + "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, +- "outLabel":16050, - "nexthop":"10.0.7.6" ++ "outLabel":30060, + "nexthop":"10.0.6.5" } ] @@ -43,11 +45,13 @@ "backupIndex":[ 0 ] -@@ -211,19 +211,19 @@ +@@ -210,20 +210,20 @@ + "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, +- "outLabel":16051, - "interface":"eth-rt6" ++ "outLabel":30061, + "interface":"eth-rt5" } ] @@ -67,11 +71,13 @@ "backupIndex":[ 0 ] -@@ -233,19 +233,19 @@ +@@ -232,20 +232,20 @@ + "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, +- "outLabel":30060, - "nexthop":"10.0.6.5" ++ "outLabel":16500, + "nexthop":"10.0.7.6" } ] @@ -91,11 +97,13 @@ "backupIndex":[ 0 ] -@@ -255,7 +255,7 @@ +@@ -254,8 +254,8 @@ + "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, +- "outLabel":30061, - "interface":"eth-rt5" ++ "outLabel":16501, + "interface":"eth-rt6" } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref b/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref index f747065f9..93740e22e 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref @@ -41,7 +41,10 @@ "ip":"10.0.6.4", "afi":"ipv4", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16010 + ] } ] } @@ -169,7 +172,10 @@ "ip":"10.0.8.6", "afi":"ipv4", "interfaceName":"eth-rt6", - "active":true + "active":true, + "labels":[ + 16040 + ] } ] } @@ -203,7 +209,10 @@ "ip":"10.0.6.4", "afi":"ipv4", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16060 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref b/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref index 6c0a5e0b9..6dafa69ad 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref @@ -12,7 +12,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt3-1", + "interfaceName":"eth-rt3-2", "active":true, "backupIndex":[ 0 @@ -24,7 +24,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt3-2", + "interfaceName":"eth-rt3-1", "active":true, "backupIndex":[ 0 @@ -38,7 +38,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16011 + ] } ] } @@ -65,7 +68,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt3-1", + "interfaceName":"eth-rt3-2", "active":true, "labels":[ 16021 @@ -74,7 +77,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt3-2", + "interfaceName":"eth-rt3-1", "active":true, "labels":[ 16021 @@ -96,7 +99,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt3-1", + "interfaceName":"eth-rt3-2", "active":true, "backupIndex":[ 0 @@ -108,7 +111,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt3-2", + "interfaceName":"eth-rt3-1", "active":true, "backupIndex":[ 0 @@ -158,7 +161,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt6", - "active":true + "active":true, + "labels":[ + 16041 + ] } ] } @@ -190,7 +196,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16061 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref b/tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref index 2b70392ad..0c5861b5e 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref +++ b/tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref @@ -25,7 +25,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16010, "nexthop":"10.0.6.4" } ] @@ -56,7 +56,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16011, "interface":"eth-rt4" } ] @@ -188,7 +188,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16040, "nexthop":"10.0.8.6" } ] @@ -210,7 +210,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16041, "interface":"eth-rt6" } ] @@ -232,7 +232,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16060, "nexthop":"10.0.6.4" } ] @@ -254,7 +254,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16061, "interface":"eth-rt4" } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff index 6402b5189..7545a31b9 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff @@ -1,6 +1,18 @@ ---- rt5/step3/show_ip_route.ref 2020-09-25 17:48:05.950922766 -0300 -+++ rt5/step4/show_ip_route.ref 2020-09-25 17:49:02.363657616 -0300 -@@ -81,10 +81,7 @@ +--- a/rt5/step3/show_ip_route.ref ++++ b/rt5/step4/show_ip_route.ref +@@ -41,10 +41,7 @@ + "ip":"10.0.6.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16010 +- ] ++ "active":true + } + ] + } +@@ -84,10 +81,7 @@ "ip":"10.0.6.4", "afi":"ipv4", "interfaceName":"eth-rt4", @@ -12,7 +24,7 @@ } ] } -@@ -105,9 +102,6 @@ +@@ -108,9 +102,6 @@ "afi":"ipv4", "interfaceName":"eth-rt3-1", "active":true, @@ -22,7 +34,7 @@ "labels":[ 3 ] -@@ -118,25 +112,10 @@ +@@ -121,25 +112,10 @@ "afi":"ipv4", "interfaceName":"eth-rt3-2", "active":true, @@ -48,7 +60,7 @@ ] } ], -@@ -158,9 +137,6 @@ +@@ -161,9 +137,6 @@ "active":true, "backupIndex":[ 0 @@ -58,7 +70,31 @@ ] } ], -@@ -349,30 +325,13 @@ +@@ -172,10 +145,7 @@ + "ip":"10.0.8.6", + "afi":"ipv4", + "interfaceName":"eth-rt6", +- "active":true, +- "labels":[ +- 16040 +- ] ++ "active":true + } + ] + } +@@ -209,10 +179,7 @@ + "ip":"10.0.6.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16060 +- ] ++ "active":true + } + ] + } +@@ -358,30 +325,13 @@ { "ip":"10.0.4.3", "afi":"ipv4", @@ -91,7 +127,7 @@ } ] } -@@ -388,29 +347,12 @@ +@@ -397,29 +347,12 @@ "ip":"10.0.4.3", "afi":"ipv4", "interfaceName":"eth-rt3-1", diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff index 7a0135bf0..1de62bb58 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff @@ -1,6 +1,18 @@ ---- rt5/step3/show_ipv6_route.ref 2020-09-25 17:48:07.218939274 -0300 -+++ rt5/step4/show_ipv6_route.ref 2020-09-25 17:49:03.599673726 -0300 -@@ -57,10 +57,7 @@ +--- a/rt5/step3/show_ipv6_route.ref ++++ b/rt5/step4/show_ipv6_route.ref +@@ -38,10 +38,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16011 +- ] ++ "active":true + } + ] + } +@@ -60,10 +57,7 @@ "fib":true, "afi":"ipv6", "interfaceName":"eth-rt4", @@ -12,9 +24,9 @@ }, { "fib":true, -@@ -98,9 +95,6 @@ +@@ -101,9 +95,6 @@ "afi":"ipv6", - "interfaceName":"eth-rt3-1", + "interfaceName":"eth-rt3-2", "active":true, - "backupIndex":[ - 0 @@ -22,9 +34,9 @@ "labels":[ 3 ] -@@ -110,24 +104,10 @@ +@@ -113,24 +104,10 @@ "afi":"ipv6", - "interfaceName":"eth-rt3-2", + "interfaceName":"eth-rt3-1", "active":true, - "backupIndex":[ - 0 @@ -47,7 +59,7 @@ ] } ], -@@ -148,9 +128,6 @@ +@@ -151,9 +128,6 @@ "active":true, "backupIndex":[ 0 @@ -57,3 +69,27 @@ ] } ], +@@ -161,10 +135,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt6", +- "active":true, +- "labels":[ +- 16041 +- ] ++ "active":true + } + ] + } +@@ -196,10 +167,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16061 +- ] ++ "active":true + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff index 299dac764..b3d525243 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff @@ -1,5 +1,23 @@ ---- rt5/step3/show_mpls_table.ref 2020-09-25 17:48:04.626905528 -0300 -+++ rt5/step4/show_mpls_table.ref 2020-09-25 17:49:01.159641924 -0300 +--- a/rt5/step3/show_mpls_table.ref ++++ b/rt5/step4/show_mpls_table.ref +@@ -25,7 +25,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16010, ++ "outLabel":3, + "nexthop":"10.0.6.4" + } + ] +@@ -56,7 +56,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16011, ++ "outLabel":3, + "interface":"eth-rt4" + } + ] @@ -76,12 +76,6 @@ "outLabel":16020, "installed":true, @@ -100,7 +118,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16040, - "nexthop":"10.0.8.6" - } - ] @@ -122,9 +140,27 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16041, - "interface":"eth-rt6" + "interface":"eth-rt3-1" } ] }, +@@ -232,7 +150,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16060, ++ "outLabel":3, + "nexthop":"10.0.6.4" + } + ] +@@ -254,7 +172,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16061, ++ "outLabel":3, + "interface":"eth-rt4" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff index 31f70b17a..be5d83f46 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff @@ -1,6 +1,18 @@ ---- rt5/step4/show_ip_route.ref 2020-09-25 17:49:02.363657616 -0300 -+++ rt5/step5/show_ip_route.ref 2020-09-25 17:50:13.012578918 -0300 -@@ -81,7 +81,10 @@ +--- a/rt5/step4/show_ip_route.ref ++++ b/rt5/step5/show_ip_route.ref +@@ -41,7 +41,10 @@ + "ip":"10.0.6.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16010 ++ ] + } + ] + } +@@ -81,7 +84,10 @@ "ip":"10.0.6.4", "afi":"ipv4", "interfaceName":"eth-rt4", @@ -12,7 +24,7 @@ } ] } -@@ -102,6 +105,9 @@ +@@ -102,6 +108,9 @@ "afi":"ipv4", "interfaceName":"eth-rt3-1", "active":true, @@ -22,7 +34,7 @@ "labels":[ 3 ] -@@ -112,10 +118,25 @@ +@@ -112,10 +121,25 @@ "afi":"ipv4", "interfaceName":"eth-rt3-2", "active":true, @@ -48,7 +60,7 @@ ] } ], -@@ -137,6 +158,9 @@ +@@ -137,6 +161,9 @@ "active":true, "backupIndex":[ 0 @@ -58,7 +70,31 @@ ] } ], -@@ -325,13 +349,30 @@ +@@ -145,7 +172,10 @@ + "ip":"10.0.8.6", + "afi":"ipv4", + "interfaceName":"eth-rt6", +- "active":true ++ "active":true, ++ "labels":[ ++ 16040 ++ ] + } + ] + } +@@ -179,7 +209,10 @@ + "ip":"10.0.6.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16060 ++ ] + } + ] + } +@@ -325,13 +358,30 @@ { "ip":"10.0.4.3", "afi":"ipv4", @@ -91,7 +127,7 @@ } ] } -@@ -347,12 +388,29 @@ +@@ -347,12 +397,29 @@ "ip":"10.0.4.3", "afi":"ipv4", "interfaceName":"eth-rt3-1", diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff index 59d9755e1..a85601962 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff @@ -1,6 +1,18 @@ ---- rt5/step4/show_ipv6_route.ref 2020-09-25 17:49:03.599673726 -0300 -+++ rt5/step5/show_ipv6_route.ref 2020-09-25 17:50:14.248595046 -0300 -@@ -57,7 +57,10 @@ +--- a/rt5/step4/show_ipv6_route.ref ++++ b/rt5/step5/show_ipv6_route.ref +@@ -38,7 +38,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16011 ++ ] + } + ] + } +@@ -57,7 +60,10 @@ "fib":true, "afi":"ipv6", "interfaceName":"eth-rt4", @@ -12,9 +24,9 @@ }, { "fib":true, -@@ -95,6 +98,9 @@ +@@ -95,6 +101,9 @@ "afi":"ipv6", - "interfaceName":"eth-rt3-1", + "interfaceName":"eth-rt3-2", "active":true, + "backupIndex":[ + 0 @@ -22,9 +34,9 @@ "labels":[ 3 ] -@@ -104,10 +110,24 @@ +@@ -104,10 +113,24 @@ "afi":"ipv6", - "interfaceName":"eth-rt3-2", + "interfaceName":"eth-rt3-1", "active":true, + "backupIndex":[ + 0 @@ -47,7 +59,7 @@ ] } ], -@@ -128,6 +148,9 @@ +@@ -128,6 +151,9 @@ "active":true, "backupIndex":[ 0 @@ -57,3 +69,27 @@ ] } ], +@@ -135,7 +161,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt6", +- "active":true ++ "active":true, ++ "labels":[ ++ 16041 ++ ] + } + ] + } +@@ -167,7 +196,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16061 ++ ] + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff index 669c07e34..74caa8620 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff @@ -1,5 +1,23 @@ ---- rt5/step4/show_mpls_table.ref 2020-09-25 17:49:01.159641924 -0300 -+++ rt5/step5/show_mpls_table.ref 2020-09-25 17:50:11.696561748 -0300 +--- a/rt5/step4/show_mpls_table.ref ++++ b/rt5/step5/show_mpls_table.ref +@@ -25,7 +25,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16010, + "nexthop":"10.0.6.4" + } + ] +@@ -56,7 +56,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16011, + "interface":"eth-rt4" + } + ] @@ -69,6 +69,12 @@ "type":"SR (IS-IS)", "outLabel":16020, @@ -101,7 +119,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16040, + "nexthop":"10.0.8.6" + } + ] @@ -123,8 +141,26 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16041, + "interface":"eth-rt6" } ] }, +@@ -150,7 +232,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16060, + "nexthop":"10.0.6.4" + } + ] +@@ -172,7 +254,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16061, + "interface":"eth-rt4" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff index a4f82cbf1..2883c046f 100644 --- a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt5/step5/show_mpls_table.ref 2020-09-25 17:50:11.696561748 -0300 -+++ rt5/step6/show_mpls_table.ref 2020-09-25 17:51:14.685383977 -0300 +--- a/rt5/step5/show_mpls_table.ref ++++ b/rt5/step6/show_mpls_table.ref @@ -1,6 +1,6 @@ { - "16010":{ diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref b/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref index 5bcef4c2f..b9b43c413 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref @@ -61,7 +61,10 @@ "ip":"10.0.8.5", "afi":"ipv4", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16020 + ] } ] } @@ -95,7 +98,10 @@ "ip":"10.0.7.4", "afi":"ipv4", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16030 + ] } ] } @@ -129,7 +135,10 @@ "ip":"10.0.8.5", "afi":"ipv4", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16040 + ] } ] } @@ -163,7 +172,10 @@ "ip":"10.0.7.4", "afi":"ipv4", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16050 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref b/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref index 8294b0713..1b1942939 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref +++ b/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref @@ -12,7 +12,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt5", + "interfaceName":"eth-rt4", "active":true, "labels":[ 16011 @@ -21,7 +21,7 @@ { "fib":true, "afi":"ipv6", - "interfaceName":"eth-rt4", + "interfaceName":"eth-rt5", "active":true, "labels":[ 16011 @@ -57,7 +57,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16021 + ] } ] } @@ -89,7 +92,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16031 + ] } ] } @@ -121,7 +127,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt5", - "active":true + "active":true, + "labels":[ + 16041 + ] } ] } @@ -153,7 +162,10 @@ { "afi":"ipv6", "interfaceName":"eth-rt4", - "active":true + "active":true, + "labels":[ + 16051 + ] } ] } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref b/tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref index 33dbf5920..5b52a16f4 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref +++ b/tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref @@ -7,13 +7,13 @@ "type":"SR (IS-IS)", "outLabel":16010, "installed":true, - "nexthop":"10.0.7.4" + "nexthop":"10.0.8.5" }, { "type":"SR (IS-IS)", "outLabel":16010, "installed":true, - "nexthop":"10.0.8.5" + "nexthop":"10.0.7.4" } ] }, @@ -25,13 +25,13 @@ "type":"SR (IS-IS)", "outLabel":16011, "installed":true, - "interface":"eth-rt4" + "interface":"eth-rt5" }, { "type":"SR (IS-IS)", "outLabel":16011, "installed":true, - "interface":"eth-rt5" + "interface":"eth-rt4" } ] }, @@ -52,7 +52,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16020, "nexthop":"10.0.8.5" } ] @@ -74,7 +74,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16021, "interface":"eth-rt5" } ] @@ -96,7 +96,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16030, "nexthop":"10.0.7.4" } ] @@ -118,7 +118,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16031, "interface":"eth-rt4" } ] @@ -140,7 +140,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16040, "nexthop":"10.0.8.5" } ] @@ -162,7 +162,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16041, "interface":"eth-rt5" } ] @@ -184,7 +184,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16050, "nexthop":"10.0.7.4" } ] @@ -206,7 +206,7 @@ "backupNexthops":[ { "type":"SR (IS-IS)", - "outLabel":3, + "outLabel":16051, "interface":"eth-rt4" } ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff index 04adaefe7..7c2f00419 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step3/show_ip_route.ref 2020-09-25 17:48:06.154925422 -0300 -+++ rt6/step4/show_ip_route.ref 2020-09-25 17:49:02.583660484 -0300 +--- a/rt6/step3/show_ip_route.ref ++++ b/rt6/step4/show_ip_route.ref @@ -14,10 +14,7 @@ "ip":"10.0.7.4", "afi":"ipv4", @@ -22,7 +22,19 @@ ] } ], -@@ -118,9 +112,6 @@ +@@ -98,10 +92,7 @@ + "ip":"10.0.7.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16030 +- ] ++ "active":true + } + ] + } +@@ -124,9 +115,6 @@ "active":true, "backupIndex":[ 0 @@ -32,3 +44,27 @@ ] } ], +@@ -135,10 +123,7 @@ + "ip":"10.0.8.5", + "afi":"ipv4", + "interfaceName":"eth-rt5", +- "active":true, +- "labels":[ +- 16040 +- ] ++ "active":true + } + ] + } +@@ -172,10 +157,7 @@ + "ip":"10.0.7.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16050 +- ] ++ "active":true + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff index 20aa1ec83..70f872e9d 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff @@ -1,6 +1,6 @@ ---- rt6/step3/show_ipv6_route.ref 2020-09-25 17:48:07.434942087 -0300 -+++ rt6/step4/show_ipv6_route.ref 2020-09-25 17:49:03.847676958 -0300 -@@ -22,10 +22,7 @@ +--- a/rt6/step3/show_ipv6_route.ref ++++ b/rt6/step4/show_ipv6_route.ref +@@ -13,10 +13,7 @@ "fib":true, "afi":"ipv6", "interfaceName":"eth-rt4", @@ -9,9 +9,9 @@ - 16011 - ] + "active":true - } - ] - } + }, + { + "fib":true, @@ -47,9 +44,6 @@ "active":true, "backupIndex":[ @@ -22,7 +22,19 @@ ] } ], -@@ -111,9 +105,6 @@ +@@ -92,10 +86,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16031 +- ] ++ "active":true + } + ] + } +@@ -117,9 +108,6 @@ "active":true, "backupIndex":[ 0 @@ -32,3 +44,27 @@ ] } ], +@@ -127,10 +115,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt5", +- "active":true, +- "labels":[ +- 16041 +- ] ++ "active":true + } + ] + } +@@ -162,10 +147,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16051 +- ] ++ "active":true + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff index 3f24547f6..c191763a7 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff @@ -1,35 +1,49 @@ ---- rt6/step3/show_mpls_table.ref 2020-09-25 17:48:04.842908340 -0300 -+++ rt6/step4/show_mpls_table.ref 2020-09-25 17:49:01.363644584 -0300 -@@ -7,12 +7,6 @@ - "type":"SR (IS-IS)", +--- a/rt6/step3/show_mpls_table.ref ++++ b/rt6/step4/show_mpls_table.ref +@@ -8,12 +8,6 @@ "outLabel":16010, "installed":true, -- "nexthop":"10.0.7.4" + "nexthop":"10.0.8.5" - }, - { - "type":"SR (IS-IS)", - "outLabel":16010, - "installed":true, - "nexthop":"10.0.8.5" +- "nexthop":"10.0.7.4" } ] -@@ -25,12 +19,6 @@ - "type":"SR (IS-IS)", + }, +@@ -26,12 +20,6 @@ "outLabel":16011, "installed":true, -- "interface":"eth-rt4" + "interface":"eth-rt5" - }, - { - "type":"SR (IS-IS)", - "outLabel":16011, - "installed":true, - "interface":"eth-rt5" +- "interface":"eth-rt4" } ] -@@ -123,50 +111,6 @@ + }, +@@ -96,7 +84,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16030, ++ "outLabel":3, + "nexthop":"10.0.7.4" } ] - }, +@@ -118,52 +106,8 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16031, +- "interface":"eth-rt4" +- } +- ] +- }, - "16040":{ - "inLabel":16040, - "installed":true, @@ -47,7 +61,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16040, - "nexthop":"10.0.8.5" - } - ] @@ -58,7 +72,7 @@ - "nexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, + "outLabel":3, - "installed":true, - "interface":"eth-rt4", - "backupIndex":[ @@ -69,11 +83,27 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16041, - "interface":"eth-rt5" -- } -- ] -- }, - "16050":{ - "inLabel":16050, - "installed":true, ++ "interface":"eth-rt4" + } + ] + }, +@@ -184,7 +128,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16050, ++ "outLabel":3, + "nexthop":"10.0.7.4" + } + ] +@@ -206,7 +150,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16051, ++ "outLabel":3, + "interface":"eth-rt4" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff index 9f73a2904..9f017d249 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step4/show_ip_route.ref 2020-09-25 17:49:02.583660484 -0300 -+++ rt6/step5/show_ip_route.ref 2020-09-25 17:50:13.220581632 -0300 +--- a/rt6/step4/show_ip_route.ref ++++ b/rt6/step5/show_ip_route.ref @@ -14,7 +14,10 @@ "ip":"10.0.7.4", "afi":"ipv4", @@ -22,7 +22,19 @@ ] } ], -@@ -112,6 +118,9 @@ +@@ -92,7 +98,10 @@ + "ip":"10.0.7.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16030 ++ ] + } + ] + } +@@ -115,6 +124,9 @@ "active":true, "backupIndex":[ 0 @@ -32,3 +44,27 @@ ] } ], +@@ -123,7 +135,10 @@ + "ip":"10.0.8.5", + "afi":"ipv4", + "interfaceName":"eth-rt5", +- "active":true ++ "active":true, ++ "labels":[ ++ 16040 ++ ] + } + ] + } +@@ -157,7 +172,10 @@ + "ip":"10.0.7.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16050 ++ ] + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff index c9358d45b..1209504e9 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff @@ -1,6 +1,6 @@ ---- rt6/step4/show_ipv6_route.ref 2020-09-25 17:49:03.847676958 -0300 -+++ rt6/step5/show_ipv6_route.ref 2020-09-25 17:50:14.456597760 -0300 -@@ -22,7 +22,10 @@ +--- a/rt6/step4/show_ipv6_route.ref ++++ b/rt6/step5/show_ipv6_route.ref +@@ -13,7 +13,10 @@ "fib":true, "afi":"ipv6", "interfaceName":"eth-rt4", @@ -9,9 +9,9 @@ + "labels":[ + 16011 + ] - } - ] - } + }, + { + "fib":true, @@ -44,6 +47,9 @@ "active":true, "backupIndex":[ @@ -22,7 +22,19 @@ ] } ], -@@ -105,6 +111,9 @@ +@@ -86,7 +92,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16031 ++ ] + } + ] + } +@@ -108,6 +117,9 @@ "active":true, "backupIndex":[ 0 @@ -32,3 +44,27 @@ ] } ], +@@ -115,7 +127,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt5", +- "active":true ++ "active":true, ++ "labels":[ ++ 16041 ++ ] + } + ] + } +@@ -147,7 +162,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16051 ++ ] + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff index c9d67955e..abf7c2a32 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step4/show_mpls_table.ref 2020-09-25 17:49:01.363644584 -0300 -+++ rt6/step5/show_mpls_table.ref 2020-09-25 17:50:11.904564461 -0300 +--- a/rt6/step4/show_mpls_table.ref ++++ b/rt6/step5/show_mpls_table.ref @@ -7,6 +7,12 @@ "type":"SR (IS-IS)", "outLabel":16010, @@ -26,7 +26,22 @@ "interface":"eth-rt5" } ] -@@ -111,6 +123,50 @@ +@@ -84,7 +96,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16030, + "nexthop":"10.0.7.4" + } + ] +@@ -106,11 +118,55 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16031, + "interface":"eth-rt4" } ] }, @@ -47,7 +62,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16040, + "nexthop":"10.0.8.5" + } + ] @@ -69,7 +84,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16041, + "interface":"eth-rt5" + } + ] @@ -77,3 +92,21 @@ "16050":{ "inLabel":16050, "installed":true, +@@ -128,7 +184,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16050, + "nexthop":"10.0.7.4" + } + ] +@@ -150,7 +206,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":3, ++ "outLabel":16051, + "interface":"eth-rt4" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff index 527ec7495..f318f95e2 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step5/show_ip_route.ref 2020-09-25 17:50:13.220581632 -0300 -+++ rt6/step6/show_ip_route.ref 2020-09-25 17:51:16.137402938 -0300 +--- a/rt6/step5/show_ip_route.ref ++++ b/rt6/step6/show_ip_route.ref @@ -26,7 +26,7 @@ "interfaceName":"eth-rt5", "active":true, @@ -9,7 +9,16 @@ ] } ] -@@ -86,7 +86,7 @@ +@@ -63,7 +63,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16020 ++ 30020 + ] + } + ] +@@ -89,7 +89,7 @@ 0 ], "labels":[ @@ -18,3 +27,12 @@ ] } ], +@@ -137,7 +137,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16040 ++ 30040 + ] + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff index 7b8f8022f..9208491fc 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff @@ -1,15 +1,24 @@ ---- rt6/step5/show_ipv6_route.ref 2020-09-25 17:50:14.456597760 -0300 -+++ rt6/step6/show_ipv6_route.ref 2020-09-25 17:51:17.401419446 -0300 -@@ -15,7 +15,7 @@ +--- a/rt6/step5/show_ipv6_route.ref ++++ b/rt6/step6/show_ipv6_route.ref +@@ -24,7 +24,7 @@ "interfaceName":"eth-rt5", "active":true, "labels":[ - 16011 + 30011 ] - }, - { -@@ -81,7 +81,7 @@ + } + ] +@@ -59,7 +59,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16021 ++ 30021 + ] + } + ] +@@ -84,7 +84,7 @@ 0 ], "labels":[ @@ -18,3 +27,12 @@ ] } ], +@@ -129,7 +129,7 @@ + "interfaceName":"eth-rt5", + "active":true, + "labels":[ +- 16041 ++ 30041 + ] + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff index edd5afeeb..aee8969de 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step5/show_mpls_table.ref 2020-09-25 17:50:11.904564461 -0300 -+++ rt6/step6/show_mpls_table.ref 2020-09-25 17:51:14.893386692 -0300 +--- a/rt6/step5/show_mpls_table.ref ++++ b/rt6/step6/show_mpls_table.ref @@ -11,7 +11,7 @@ }, { @@ -18,6 +18,24 @@ "installed":true, "interface":"eth-rt5" } +@@ -52,7 +52,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16020, ++ "outLabel":30020, + "nexthop":"10.0.8.5" + } + ] +@@ -74,7 +74,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16021, ++ "outLabel":30021, + "interface":"eth-rt5" + } + ] @@ -85,7 +85,7 @@ "nexthops":[ { @@ -36,3 +54,21 @@ "installed":true, "interface":"eth-rt5", "backupIndex":[ +@@ -140,7 +140,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16040, ++ "outLabel":30040, + "nexthop":"10.0.8.5" + } + ] +@@ -162,7 +162,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16041, ++ "outLabel":30041, + "interface":"eth-rt5" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff index 7553dd22e..0e6c3ff5c 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff @@ -1,6 +1,6 @@ ---- rt6/step6/show_ip_route.ref 2020-09-25 17:51:16.137402938 -0300 -+++ rt6/step7/show_ip_route.ref 2020-09-25 17:52:03.018015363 -0300 -@@ -152,9 +152,6 @@ +--- a/rt6/step6/show_ip_route.ref ++++ b/rt6/step7/show_ip_route.ref +@@ -161,9 +161,6 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -172,10 +169,7 @@ + "ip":"10.0.7.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16050 +- ] ++ "active":true + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff index b56890de0..2fe46c826 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff @@ -1,6 +1,6 @@ ---- rt6/step6/show_ipv6_route.ref 2020-09-25 17:51:17.401419446 -0300 -+++ rt6/step7/show_ipv6_route.ref 2020-09-25 17:52:04.270031723 -0300 -@@ -143,9 +143,6 @@ +--- a/rt6/step6/show_ipv6_route.ref ++++ b/rt6/step7/show_ipv6_route.ref +@@ -152,9 +152,6 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -162,10 +159,7 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true, +- "labels":[ +- 16051 +- ] ++ "active":true + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff index ff043fb0b..179a4f460 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step6/show_mpls_table.ref 2020-09-25 17:51:14.893386692 -0300 -+++ rt6/step7/show_mpls_table.ref 2020-09-25 17:52:01.809999577 -0300 +--- a/rt6/step6/show_mpls_table.ref ++++ b/rt6/step7/show_mpls_table.ref @@ -166,49 +166,5 @@ "interface":"eth-rt5" } @@ -22,7 +22,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16050, - "nexthop":"10.0.7.4" - } - ] @@ -44,7 +44,7 @@ - "backupNexthops":[ - { - "type":"SR (IS-IS)", -- "outLabel":3, +- "outLabel":16051, - "interface":"eth-rt4" - } - ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff index d0b25bffa..9d5c440a2 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff @@ -1,6 +1,6 @@ ---- rt6/step7/show_ip_route.ref 2020-09-25 17:52:03.018015363 -0300 -+++ rt6/step8/show_ip_route.ref 2020-09-25 17:53:21.035035298 -0300 -@@ -152,6 +152,9 @@ +--- a/rt6/step7/show_ip_route.ref ++++ b/rt6/step8/show_ip_route.ref +@@ -161,6 +161,9 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -169,7 +172,10 @@ + "ip":"10.0.7.4", + "afi":"ipv4", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16050 ++ ] + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff index 203175510..21cab20a4 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff @@ -1,6 +1,6 @@ ---- rt6/step7/show_ipv6_route.ref 2020-09-25 17:52:04.270031723 -0300 -+++ rt6/step8/show_ipv6_route.ref 2020-09-25 17:53:22.239051045 -0300 -@@ -143,6 +143,9 @@ +--- a/rt6/step7/show_ipv6_route.ref ++++ b/rt6/step8/show_ipv6_route.ref +@@ -152,6 +152,9 @@ "active":true, "backupIndex":[ 0 @@ -10,3 +10,15 @@ ] } ], +@@ -159,7 +162,10 @@ + { + "afi":"ipv6", + "interfaceName":"eth-rt4", +- "active":true ++ "active":true, ++ "labels":[ ++ 16051 ++ ] + } + ] + } diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff index 535f30bf3..760c5542c 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step7/show_mpls_table.ref 2020-09-25 17:52:01.809999577 -0300 -+++ rt6/step8/show_mpls_table.ref 2020-09-25 17:53:19.799019132 -0300 +--- a/rt6/step7/show_mpls_table.ref ++++ b/rt6/step8/show_mpls_table.ref @@ -166,5 +166,49 @@ "interface":"eth-rt5" } @@ -22,7 +22,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16050, + "nexthop":"10.0.7.4" + } + ] @@ -44,7 +44,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", -+ "outLabel":3, ++ "outLabel":16051, + "interface":"eth-rt4" + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ip_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ip_route.ref.diff index e69de29bb..ee296470c 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ip_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ip_route.ref.diff @@ -0,0 +1,11 @@ +--- a/rt6/step8/show_ip_route.ref ++++ b/rt6/step9/show_ip_route.ref +@@ -174,7 +174,7 @@ + "interfaceName":"eth-rt4", + "active":true, + "labels":[ +- 16050 ++ 16500 + ] + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ipv6_route.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ipv6_route.ref.diff index e69de29bb..bebca4dcf 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ipv6_route.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ipv6_route.ref.diff @@ -0,0 +1,11 @@ +--- a/rt6/step8/show_ipv6_route.ref ++++ b/rt6/step9/show_ipv6_route.ref +@@ -164,7 +164,7 @@ + "interfaceName":"eth-rt4", + "active":true, + "labels":[ +- 16051 ++ 16501 + ] + } + ] diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff b/tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff index b6e539655..57347d15b 100644 --- a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff +++ b/tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff @@ -1,5 +1,5 @@ ---- rt6/step8/show_mpls_table.ref 2020-09-25 17:53:19.799019132 -0300 -+++ rt6/step9/show_mpls_table.ref 2020-09-25 17:54:37.492035644 -0300 +--- a/rt6/step8/show_mpls_table.ref ++++ b/rt6/step9/show_mpls_table.ref @@ -167,8 +167,8 @@ } ] @@ -11,7 +11,13 @@ "installed":true, "nexthops":[ { -@@ -189,8 +189,8 @@ +@@ -184,13 +184,13 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16050, ++ "outLabel":16500, + "nexthop":"10.0.7.4" } ] }, @@ -22,3 +28,12 @@ "installed":true, "nexthops":[ { +@@ -206,7 +206,7 @@ + "backupNexthops":[ + { + "type":"SR (IS-IS)", +- "outLabel":16051, ++ "outLabel":16501, + "interface":"eth-rt4" + } + ] |