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>

diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index e33b8c628d0d5e4ce8d15d4474cfd15adc51fd9a..1b4b0c8f2fe8ef1d7d31e607b30e92a474fc48cd 100644 (file)
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -207,35 +207,30 @@ static int isis_zebra_add_nexthops(struct isis *isis, struct list *nexthops,
                api_nh->ifindex = nexthop->ifindex;
 
                /* Add MPLS label(s). */
-               switch (type) {
-               case ISIS_NEXTHOP_MAIN:
-                       if (nexthop->sr.present) {
-                               api_nh->label_num = 1;
-                               api_nh->labels[0] = nexthop->sr.label;
-                       } else if (mpls_lsp)
+               if (nexthop->label_stack) {
+                       api_nh->label_num = nexthop->label_stack->num_labels;
+                       memcpy(api_nh->labels, nexthop->label_stack->label,
+                              sizeof(mpls_label_t) * api_nh->label_num);
+               } else if (nexthop->sr.present) {
+                       api_nh->label_num = 1;
+                       api_nh->labels[0] = nexthop->sr.label;
+               } else if (mpls_lsp) {
+                       switch (type) {
+                       case ISIS_NEXTHOP_MAIN:
                                /*
                                 * Do not use non-SR enabled nexthops to prevent
                                 * broken LSPs from being formed.
                                 */
                                continue;
-                       break;
-               case ISIS_NEXTHOP_BACKUP:
-                       if (nexthop->label_stack) {
-                               api_nh->label_num =
-                                       nexthop->label_stack->num_labels;
-                               memcpy(api_nh->labels,
-                                      nexthop->label_stack->label,
-                                      sizeof(mpls_label_t)
-                                              * api_nh->label_num);
-                       } else if (mpls_lsp) {
+                       case ISIS_NEXTHOP_BACKUP:
                                /*
                                 * This is necessary because zebra requires
                                 * the nexthops of MPLS LSPs to be labeled.
                                 */
                                api_nh->label_num = 1;
                                api_nh->labels[0] = MPLS_LABEL_IMPLICIT_NULL;
+                               break;
                        }
-                       break;
                }
 
                /* Backup nexthop handling. */

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 e3ed7c20b2fffa0045ff53f58b64110266c3289e..aa0357d7500062c835811bc9e2d3d5586691065e 100644 (file)
--- 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 1a9307ddb99f7d4bdd7aabab7083c84c0c95c896..10b336f5b812d86c90f3ea82adc270ce7239b663 100644 (file)
--- 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 f5036aeda82c15efe7d8f742f9dc7d1d52fd0692..904aaa1ce2a1cf9b1716591cfb94b5b6513b5a32 100644 (file)
--- 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 30c612b5449bf5f9f64eadcfbbfd5c5acc0fad59..d7d875313105b80e9857f311582638c8222cbdd0 100644 (file)
--- 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 79a452ef69f8c5ee0c4325ce1d8956241714638a..b583fa97bde2dea1a987d2f9d67935569deab3dd 100644 (file)
--- 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 805266aaaa920f2a0cbf1ed5a2f70334bcbc160c..d608abec982080cb2104eccd49f00eb6724841d9 100644 (file)
--- 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 d7ab66ee189b0710cbd6fcfa081bdfd40f5e1045..b5161fcd55ba20de15bb6f2b59e6547b41f22f5d 100644 (file)
--- 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 9aa0cd2e39ae493a2878eaab8204256d453d85a9..726aed514fe2e74cb68e36a5e65738f075351261 100644 (file)
--- 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 52fd7caf915b7579477b41656744c637c6248b0a..2049f6fa190aeaf735cf88e03ec9436aa7d22cdd 100644 (file)
--- 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 53332be5691323ea3f077c8c7646f92140b08a43..22301ba1ff876401b40ab369c7c2c7b3436deb72 100644 (file)
--- 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 af9f72e718afb4b3a24d01a81c94b3578b9739bc..4a1d4805a4e76a62059ae1e5db953cb43c9bb2df 100644 (file)
--- 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 b733b33ed9d9bfb00dbcafe1447f307c1b668605..eaece74e48b655d16ed5dbacaecfee5503344ae4 100644 (file)
--- 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 b6f8c962f0fc7f8e6855af0fc8e75189c3242f52..46c17de01915e9f25dde42d698f00f1d327c4bf1 100644 (file)
--- 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 1d963415571ccb262bc2e74f9bc5b4b3eeedc7c8..06efdc96ce596be5beb8e15a4b5c89e5bddb711e 100644 (file)
--- 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 232b823ac2bcc5c18da9bd360b78b824c8c7993c..a58f2d447cd6d128c46eb0ae79488e48960a6528 100644 (file)
--- 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 7f0d50f5f2263a6add1f74935622a20dbbab9675..c0a1ac592b51ee211ae260535667a082a6def8a1 100644 (file)
--- 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 23e07b7cdad329c08e3d1b73dda0037306e936b4..7e1ccd10a2b7453983a8826dd41a22701c64ade2 100644 (file)
--- 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 d9bd04ef30f5dc228f99f8e37030546460f3dfa8..6d31f6f26b8b4b2fce5446a44909971c865507fe 100644 (file)
--- 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 cd2f879593a0015ce8b20a5f1cd80cc739d36eb2..b9b906a31d9cede95b03b277c91691892526caed 100644 (file)
--- 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 22b896f6840e5678c83cc15d34b29ec57b501210..90e0895639b2008559dea9086a35ca00c8f61dd0 100644 (file)
--- 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 08c7d2b1fcc8ff2116c5cf68151f45b0e8eba62b..2d19f20f633f91fdd63ab405ead73d00cf79870d 100644 (file)
--- 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 4feb927156ad2ffa1b19d704285e71cef2b6d9c4..01fc74a60b75297cb72982e1456aa06d3f89bfbc 100644 (file)
--- 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 af1cebc76da0c658b09cc8340c7cae3244967399..d93f0362291085a41c445b8a3900a13d53ba9d4d 100644 (file)
--- 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 9809c316e87f06d2c7372990f147c00243d343f7..68b618e91db796b82fa8d3b00c24d5ed7c00f1b5 100644 (file)
--- 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 180323e4c830a22639cc4488600150d354be210a..966e153a6b6ad5468b84c1d5dda5a0180f457084 100644 (file)
--- 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 12d45bbe07af85d774c1665017a10ed9af0ad6ac..dd75d76b9bcad648c0898df13f58b84db844afc9 100644 (file)
--- 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 fdf658d59d2191f0d9dd2038ebf7173f8639370c..63731237ecb672b38a26912c42a1aaf3bf3d7fad 100644 (file)
--- 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 a78f79c5765a5f2cba0f558e43e046603586bb49..3872ce4980dec569543cf8eec9f0afd2f9ace8b8 100644 (file)
--- 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 7d20fad3f453615837f407148f02fc5983e1c9dd..4d5636436ca8208dacdb23f3ea273a75e4f16069 100644 (file)
--- 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 93309643388cfd390be6b781ee73f52d3c07ca91..f9e0276f85ae5e02ba32d0fad3b7a0cfd8aa21e3 100644 (file)
--- 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 b1e44a727f2b87e142ac5f303d62565846a15b32..6aebbd6c82b62d4947caae77b83086bac3b22a9d 100644 (file)
--- 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 c92195d7040a9f97d4d952d4dae99b2990a21bc3..5e73b978448da4480db966c87a62c804e3d7fd15 100644 (file)
--- 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 140c7b08bf1daee2143f87ed74756ec183976325..5dc4e59151aac30499ffa544fe36c7cb6f336d8c 100644 (file)
--- 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 f8476cd0bbf0182535b59903b89a5fe6ab9c2cea..6c0d7392f017f2cc184a1385548fe5db1115357f 100644 (file)
--- 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 7d5237e7405df62311305d0661a4ea85b9803b1a..f5df607613ed6bd5fc5de2d0799cdd2da65bfb42 100644 (file)
--- 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 45322214e68b994ab6e82dc11b641f413ac2d670..125f36b1b449f22e3916a2613be78ee0a262ef3e 100644 (file)
--- 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 083c6478028c2c38ed44122e01b59ccb9f0b154f..a1d5d795c5521cad2220b36f60d197d85e04de15 100644 (file)
--- 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 15370a0a6293a040ea3b6fc2045e5598494e204c..2475c639c19af9b2f2f13ff1da58d5cde5a87bee 100644 (file)
--- 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 2585f32595dc25d4677e3cdc1c94b9e1c0744813..2d21fbcde2608e487aaba98a792ef2a5f79b3f02 100644 (file)
--- 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 b90b889ebad2a452ba89a3c985fde5a409cefa7e..bc0ec3157ea26d4ed414ff57fd5cfe6f376d6162 100644 (file)
--- 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 8c37180daf2cdf2db2c38ef5bf32483d88266477..d70e9fe882e2f3eb08a8474787e06dd72b38ba28 100644 (file)
--- 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 5ddb24af5a0f93c309dd2fdc5fe9b3af6255c70c..058d33609b89740031bcee6a8f096013ea32367c 100644 (file)
--- 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 f68d1f4244f248d72e7127683d9df59717cbc2d0..1912df3f050cfee0c634bf106455b6990562adaf 100644 (file)
--- 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 707f95495d85a1150496c0d0b0e28b6117206b1e..9ba73b057a0e1e4b720a208d55d08d9740818ddf 100644 (file)
--- 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 76d0ebc913a6159e71fc90b77598f1aedbddaf5c..04f61c4eb40b4fc4ec174a66536d68bfb54dbafc 100644 (file)
--- 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 b888c9d273215f0cc180ceb774b400bae60ea05e..b3588ca791326f985980ab537d9e966a5bd87432 100644 (file)
--- 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 8eac75bec7e4a6117d825e85b48da8d5bc4aabcc..1af024fc2e78088cf740185d4ee4d7893f4714be 100644 (file)
--- 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 fc55267ad1618da848dc3f37b5e4080a51fd75df..7cc79d0e58585d18256c62fbff4b8021f96dffc2 100644 (file)
--- 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 4ed491e2416ca87494552ef0c4fd83d0f8e9ce79..75a0f01f551428f5302cc750d8ea80d229647d9c 100644 (file)
--- 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 9273c75352640fa21c093191fa62661c9dea2544..c814a2876b4dc744f0ae64ac5190749b9da8a361 100644 (file)
--- 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 f50be893e476a1261948e7a9298daf393b135af2..6f9405f20ce9b75fac4e726fd28ff18595c739e4 100644 (file)
--- 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 b63a728ef101da3637c0f7be25247909242a835d..d8c39685de7c7aca7ac4ee4130a8732521aab879 100644 (file)
--- 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 0ae87afa3bad5b1bf1914ae051ab6e29d8eae2f8..c928fcdb4bf18d542e5e7c65e762db1b70d7d0e9 100644 (file)
--- 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 f392f644c04977f5cde9215e44a2ec2cf374aa55..0170971781cffd906de60e8a2aae595d357cb9eb 100644 (file)
--- 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 b74eb9579cd3b1d97e587b55161d93fb3fe98bc9..d7a3ed978f369874ee258d12378d06e710c96aa8 100644 (file)
--- 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 25b42f282506404624ae2a53459dc6bf3d7e9b57..41a7ff32552e083fd53362cdcab1db70eb3834db 100644 (file)
--- 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 42d9356c8ad791bfc2786e259cef758a5b3aaebf..bd49f8606ba8cb6bf7e250e2672b4a706ab20be7 100644 (file)
--- 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 bd40f954eb781b790aa2ac0c83706ede04e7e744..4cc69b66f24d46735cf72d0f56cf54bdfb48a5fb 100644 (file)
--- 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 687e84ad40a2ac449221d0682b3f7113c0335a8c..cc0a482eee4e2c71c3a88aa8a08a6ead483e8268 100644 (file)
--- 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 4b76be66ac8458df84a086f4ee966f5f30f36308..650b982f0b620fe7806c03c97edb87e53cbce325 100644 (file)
--- 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 6f6451e510358332c612403f4722698101ab7ecc..8ce4f1d266100e050812761d560963247ab1d840 100644 (file)
--- 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 168b90a3f6bd12ccc0b40c21a53c7ddfd4c615e2..0ef5d1bc3f82d65a2413060ab49c6e2b63f9ed13 100644 (file)
--- 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 a4442ee0895a4b284004e18554a976bdc45302b7..b640df30c1fb4fd133405e5def92c5d12bdff841 100644 (file)
--- 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 18354e947d2c9e75edc931d255fb7b62f5e0f953..f60937ccbcd717331cf083a40c867f62a74ccf43 100644 (file)
--- 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 7dcdb744ac905fd7a601619fea05d21d601260fe..8b115c2058044b948d2afd868a9a6dacdeb62083 100644 (file)
--- 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 b84ceaff1a7aae3630fd2bed6fdefaf6241c769a..7f39285089687a0c7c919e726bf48fae8c735e1b 100644 (file)
--- 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 70e0108b0dcf1e1ac329bf03fd34674d78280504..3dcd36c1768f7fc73c4f25e2a87348c30348a9a7 100644 (file)
--- 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 aa319a3232fa8218d7a59aa7ab26f7ef65d81b95..484a3147dcd18670aa53f655a60a8aa8c714105f 100644 (file)
--- 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 1bd207854c7433e1826c7fb0e5f0e761939ea822..3ad008512041e7b73aef25991c34fae17ba40cba 100644 (file)
--- 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 664b129a1b9c1fe46d7536ef94405d140ae3d0f1..20e363375bc87f4680cd469bbd6530b89730c767 100644 (file)
--- 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 c758b89839c4f06e5ca26fff4b1e090467daf3df..9070414730e036a2f4e0f28454c6758f75cf35ed 100644 (file)
--- 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 ca495216ddd66d35844fc61c5cf403ed3d756051..57a57647a17ed5191beabcdfeaf9a337a761b905 100644 (file)
--- 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 630e0419cf2a566eee9bcb0d0a2e0f6a23b29f29..94f87854d170252449791b20841eb95acbb562ff 100644 (file)
--- 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 30e0dcf3c0c098ee98ebf9b8f35b2ff70f71d012..e54873d5ab5933a5584595df22907bdcbdb89070 100644 (file)
--- 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 2606027d7514329b4d0c1c8b2126c2c6302a0778..92e08f99a065a869070a3ba0d0d6d1137de48b36 100644 (file)
--- 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 5334cfd04860a5c0dd06baf16142b4167f4d2ea0..fb614ebf6a8a26e4b6f4f602c70b1da0449d965b 100644 (file)
--- 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 b393970e423bb59081388897951360c62c80d743..252da6e76417b1ea49ed4f060957eb8d1eb289fb 100644 (file)
--- 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 8bad2edcf339857371c3f88e6f62323f7825431d..7057d2166a0cf24cf85c329a62ac6d3209fbe8e0 100644 (file)
--- 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 d296dbdcafc70654dc66a99e95164e566a1d60bb..3dc4303b9b4d2f261a7dc33c8172779f778244b0 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..56f9cc534f95cd6c83e6fb0fc55e9c7b534d9c09 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..41e552177a2f04d3c39f5f8c4344e72613343a94 100644 (file)
--- 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 408cbfb0ba6a110c70f078390aaaee43a3afc6ac..627e292518fa88dc8d00185aa99c6116b449ec50 100644 (file)
--- 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 f747065f9c13c8eb2d71718706affc86caa5cf7b..93740e22e0c74506a2b8e227c99cc99f325abfce 100644 (file)
--- 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 6c0a5e0b9b19c5b40fe81ee888589d914e03a140..6dafa69adb8f59b1ffb4954ede5d722c5814a09e 100644 (file)
--- 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 2b70392adc08c65356c68dadcb2be0911323d633..0c5861b5e89d3a9176b0314be55f76750e51e25d 100644 (file)
--- 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 6402b51893a0b8fce1e1b237fe594adda020ac57..7545a31b9b050ad30997b920f587820fd2c58fed 100644 (file)
--- 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 7a0135bf04db548f1acac3eb4144b54efa647968..1de62bb58e18d5d1b6d6a464132cb68e6df7e516 100644 (file)
--- 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 299dac76402bff79f614058c1ac59d8a2ca9a028..b3d525243052027d9c140a31f93c9590f819c4ed 100644 (file)
--- 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 31f70b17a3c70030857da6d44e340ae293cfd89d..be5d83f4635739845242b4ad605ec4ae8ab17b95 100644 (file)
--- 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 59d9755e183e5a45d2e48d290a37d115d5b402ff..a856019622d47e25c6817ab6efb21a093e7ca915 100644 (file)
--- 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 669c07e3447289a2c9699686897553d51adeea49..74caa8620e6152c3ffbe63eb2ca860467e192063 100644 (file)
--- 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 a4f82cbf1056ed9205903310f8ef3c431cfcfacc..2883c046fd50af157339f9caf648ccc293697e0c 100644 (file)
--- 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 5bcef4c2f6df604251fda0ec7fb5320f5e9221a6..b9b43c41392705cd485f0ae637d3d5f9b2509d71 100644 (file)
--- 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 8294b071367228ff8e2d1cdd3c0d460ddf50c4da..1b1942939ddc8c07770162fe6e1648713590e1b9 100644 (file)
--- 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 33dbf592047f45575986580e3a0db55b5c816ed0..5b52a16f48df8e9c4d75608823180f1346aec6dc 100644 (file)
--- 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 04adaefe784b287ba50ca5ccc7efe335408c8d47..7c2f00419ab04d172c68f71e1bcb052647308877 100644 (file)
--- 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 20aa1ec83b0a41684ebcb3c2401a1e033f464339..70f872e9de36e3f9024122e355d9044033ad2a28 100644 (file)
--- 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 3f24547f6d547f40eb8e6e81c22ee4633f7bcbbd..c191763a73f788828ddb7f71bd77729d5cd26a72 100644 (file)
--- 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 9f73a2904e91ae1fab90a92239204c9ab713dcd2..9f017d24925b27dbb6c57ebd1acb420389083641 100644 (file)
--- 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 c9358d45b2a2cf1fbaa15b75df8565fa9af073fb..1209504e9425bdcd15f523224c0fc8c7bb724729 100644 (file)
--- 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 c9d67955ef456088c2fff72869809dc06b9b0c77..abf7c2a32d73c19b58f57134aad7994d0466b146 100644 (file)
--- 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 527ec74958f3911fe29d7852226629d065bf4e67..f318f95e212bcb0eefa6b331aaebab1f39319ea8 100644 (file)
--- 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 7b8f8022f24534a9eaa3f5250c5b74362ce2a4f2..9208491fc824f3d168495a3502b4829e427ddaad 100644 (file)
--- 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 edd5afeeb80aa61113041086b929a0a63e9878ce..aee8969deddc27c4be5eae0c52d4ef38ce3b6e08 100644 (file)
--- 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 7553dd22e5794ede0967d1b92205550913abecc0..0e6c3ff5cd549680e35c0c3feac8ebd05c21edf4 100644 (file)
--- 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 b56890de0fcd53c80964e5bff80007741b5c8e1b..2fe46c82658a91b6da172cd76232a9c19588ea4a 100644 (file)
--- 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 ff043fb0bf309fe4357f6165b44d61837e12690f..179a4f460b2a5654d7a8d7aa79a67c53607233ee 100644 (file)
--- 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 d0b25bffa31ce95eef45c633ff947e56fc9f84f5..9d5c440a2215d875efce3bcae5ec87bd727bb295 100644 (file)
--- 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 203175510c0f28e496278607c3b4822f362cea70..21cab20a470a795eea03cfbc73954f06a87911d7 100644 (file)
--- 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 535f30bf358329bdac5b94d24c52c6b756fdf21e..760c5542cb7ed74c78a6359727bee758ac6ab00d 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ee296470c0ccd0fc8db798e4a27bca5bf58757a5 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bebca4dcf18962c4787e681ef8e629a98d4675ca 100644 (file)
--- 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 b6e5396554a2fb338bb6a45b0ec3f6b6eede229f..57347d15beed5dfdf50d6397d2d95490cd7e8924 100644 (file)
--- 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"
+       }
+     ]