Merging upstream version 10.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 988 insertions, 422 deletions

diff --git a/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ip_route.ref b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ip_route.ref
new file mode 100644
index 0000000..93740e2
--- /dev/null
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ip_route.ref
@@ -0,0 +1,506 @@
+{
+  "1.1.1.1\/32":[
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":30,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            16010
+          ]
+        },
+        {
+          "fib":true,
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            16010
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16010
+          ]
+        }
+      ]
+    }
+  ],
+  "2.2.2.2\/32":[
+    {
+      "prefix":"2.2.2.2\/32",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":30,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "labels":[
+            16020
+          ]
+        },
+        {
+          "fib":true,
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "labels":[
+            16020
+          ]
+        },
+        {
+          "fib":true,
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16020
+          ]
+        }
+      ]
+    }
+  ],
+  "3.3.3.3\/32":[
+    {
+      "prefix":"3.3.3.3\/32",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        },
+        {
+          "fib":true,
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16020,
+            16030
+          ]
+        }
+      ]
+    }
+  ],
+  "4.4.4.4\/32":[
+    {
+      "prefix":"4.4.4.4\/32",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.8.6",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt6",
+          "active":true,
+          "labels":[
+            16040
+          ]
+        }
+      ]
+    }
+  ],
+  "6.6.6.6\/32":[
+    {
+      "prefix":"6.6.6.6\/32",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.8.6",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt6",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16060
+          ]
+        }
+      ]
+    }
+  ],
+  "10.0.1.0\/24":[
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "backupIndex":[
+            0
+          ]
+        },
+        {
+          "fib":true,
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "backupIndex":[
+            0
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.2.0\/24":[
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "backupIndex":[
+            0,
+            1,
+            2
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.8.6",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt6",
+          "active":true
+        },
+        {
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "active":true
+        },
+        {
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.3.0\/24":[
+    {
+      "prefix":"10.0.3.0\/24",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "backupIndex":[
+            0,
+            1,
+            2
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.8.6",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt6",
+          "active":true
+        },
+        {
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "active":true
+        },
+        {
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.4.0\/24":[
+    {
+      "prefix":"10.0.4.0\/24",
+      "protocol":"isis",
+      "distance":115,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "backupIndex":[
+            0
+          ]
+        },
+        {
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "backupIndex":[
+            0
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16020
+          ]
+        }
+      ]
+    }
+  ],
+  "10.0.5.0\/24":[
+    {
+      "prefix":"10.0.5.0\/24",
+      "protocol":"isis",
+      "distance":115,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.4.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "backupIndex":[
+            0
+          ]
+        },
+        {
+          "ip":"10.0.5.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3-2",
+          "backupIndex":[
+            0
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16020
+          ]
+        }
+      ]
+    }
+  ],
+  "10.0.6.0\/24":[
+    {
+      "prefix":"10.0.6.0\/24",
+      "protocol":"isis",
+      "distance":115,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "backupIndex":[
+            0
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.8.6",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt6",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.7.0\/24":[
+    {
+      "prefix":"10.0.7.0\/24",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.8.6",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt6",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.8.0\/24":[
+    {
+      "prefix":"10.0.8.0\/24",
+      "protocol":"isis",
+      "distance":115,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.8.6",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt6",
+          "backupIndex":[
+            0
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.6.4",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt4",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
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
deleted file mode 100644
index be5d83f..0000000
--- a/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ip_route.ref.diff
+++ /dev/null
@@ -1,161 +0,0 @@
---- 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",
--          "active":true
-+          "active":true,
-+          "labels":[
-+            16020
-+          ]
-         }
-       ]
-     }
-@@ -102,6 +108,9 @@
-           "afi":"ipv4",
-           "interfaceName":"eth-rt3-1",
-           "active":true,
-+          "backupIndex":[
-+            0
-+          ],
-           "labels":[
-             3
-           ]
-@@ -112,10 +121,25 @@
-           "afi":"ipv4",
-           "interfaceName":"eth-rt3-2",
-           "active":true,
-+          "backupIndex":[
-+            0
-+          ],
-           "labels":[
-             3
-           ]
-         }
-+      ],
-+      "backupNexthops":[
-+        {
-+          "ip":"10.0.6.4",
-+          "afi":"ipv4",
-+          "interfaceName":"eth-rt4",
-+          "active":true,
-+          "labels":[
-+            16020,
-+            16030
-+          ]
-+        }
-       ]
-     }
-   ],
-@@ -137,6 +161,9 @@
-           "active":true,
-           "backupIndex":[
-             0
-+          ],
-+          "labels":[
-+            3
-           ]
-         }
-       ],
-@@ -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",
--          "interfaceName":"eth-rt3-1"
-+          "interfaceName":"eth-rt3-1",
-+          "backupIndex":[
-+            0
-+          ]
-         },
-         {
-           "ip":"10.0.5.3",
-           "afi":"ipv4",
-           "interfaceName":"eth-rt3-2",
--          "active":true
-+          "active":true,
-+          "backupIndex":[
-+            0
-+          ]
-+        }
-+      ],
-+      "backupNexthops":[
-+        {
-+          "ip":"10.0.6.4",
-+          "afi":"ipv4",
-+          "interfaceName":"eth-rt4",
-+          "active":true,
-+          "labels":[
-+            16020
-+          ]
-         }
-       ]
-     }
-@@ -347,12 +397,29 @@
-           "ip":"10.0.4.3",
-           "afi":"ipv4",
-           "interfaceName":"eth-rt3-1",
--          "active":true
-+          "active":true,
-+          "backupIndex":[
-+            0
-+          ]
-         },
-         {
-           "ip":"10.0.5.3",
-           "afi":"ipv4",
--          "interfaceName":"eth-rt3-2"
-+          "interfaceName":"eth-rt3-2",
-+          "backupIndex":[
-+            0
-+          ]
-+        }
-+      ],
-+      "backupNexthops":[
-+        {
-+          "ip":"10.0.6.4",
-+          "afi":"ipv4",
-+          "interfaceName":"eth-rt4",
-+          "active":true,
-+          "labels":[
-+            16020
-+          ]
-         }
-       ]
-     }
diff --git a/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ipv6_route.ref b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ipv6_route.ref
new file mode 100644
index 0000000..168828d
--- /dev/null
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ipv6_route.ref
@@ -0,0 +1,207 @@
+{
+  "2001:db8:1000::1\/128":[
+    {
+      "prefix":"2001:db8:1000::1\/128",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":30,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            16011
+          ]
+        },
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            16011
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16011
+          ]
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::2\/128":[
+    {
+      "prefix":"2001:db8:1000::2\/128",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":30,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "labels":[
+            16021
+          ]
+        },
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "labels":[
+            16021
+          ]
+        },
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16021
+          ]
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::3\/128":[
+    {
+      "prefix":"2001:db8:1000::3\/128",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3-1",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        },
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3-2",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16021,
+            16031
+          ]
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::4\/128":[
+    {
+      "prefix":"2001:db8:1000::4\/128",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt6",
+          "active":true,
+          "labels":[
+            16041
+          ]
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::6\/128":[
+    {
+      "prefix":"2001:db8:1000::6\/128",
+      "protocol":"isis",
+      "selected":true,
+      "destSelected":true,
+      "distance":115,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "afi":"ipv6",
+          "interfaceName":"eth-rt6",
+          "active":true,
+          "backupIndex":[
+            0
+          ],
+          "labels":[
+            3
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt4",
+          "active":true,
+          "labels":[
+            16061
+          ]
+        }
+      ]
+    }
+  ]
+}
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
deleted file mode 100644
index a856019..0000000
--- a/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ipv6_route.ref.diff
+++ /dev/null
@@ -1,95 +0,0 @@
---- 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",
--          "active":true
-+          "active":true,
-+          "labels":[
-+            16021
-+          ]
-         },
-         {
-           "fib":true,
-@@ -95,6 +101,9 @@
-           "afi":"ipv6",
-           "interfaceName":"eth-rt3-2",
-           "active":true,
-+          "backupIndex":[
-+            0
-+          ],
-           "labels":[
-             3
-           ]
-@@ -104,10 +113,24 @@
-           "afi":"ipv6",
-           "interfaceName":"eth-rt3-1",
-           "active":true,
-+          "backupIndex":[
-+            0
-+          ],
-           "labels":[
-             3
-           ]
-         }
-+      ],
-+      "backupNexthops":[
-+        {
-+          "afi":"ipv6",
-+          "interfaceName":"eth-rt4",
-+          "active":true,
-+          "labels":[
-+            16021,
-+            16031
-+          ]
-+        }
-       ]
-     }
-   ],
-@@ -128,6 +151,9 @@
-           "active":true,
-           "backupIndex":[
-             0
-+          ],
-+          "labels":[
-+            3
-           ]
-         }
-       ],
-@@ -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 b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_mpls_table.ref
new file mode 100644
index 0000000..d40be3d
--- /dev/null
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_mpls_table.ref
@@ -0,0 +1,275 @@
+{
+  "16010":{
+    "inLabel":16010,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16010,
+        "installed":true,
+        "nexthop":"10.0.5.3",
+        "interface":"eth-rt3-2",
+        "backupIndex":[
+          0
+        ]
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16010,
+        "installed":true,
+        "nexthop":"10.0.4.3",
+        "interface":"eth-rt3-1",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16010,
+        "nexthop":"10.0.6.4",
+        "interface":"eth-rt4"
+      }
+    ]
+  },
+  "16011":{
+    "inLabel":16011,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16011,
+        "installed":true,
+        "interface":"eth-rt3-2",
+        "backupIndex":[
+          0
+        ]
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16011,
+        "installed":true,
+        "interface":"eth-rt3-1",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16011,
+        "interface":"eth-rt4"
+      }
+    ]
+  },
+  "16020":{
+    "inLabel":16020,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16020,
+        "installed":true,
+        "nexthop":"10.0.6.4",
+        "interface":"eth-rt4"
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16020,
+        "installed":true,
+        "nexthop":"10.0.5.3",
+        "interface":"eth-rt3-2"
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16020,
+        "installed":true,
+        "nexthop":"10.0.4.3",
+        "interface":"eth-rt3-1"
+      }
+    ]
+  },
+  "16021":{
+    "inLabel":16021,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16021,
+        "installed":true,
+        "interface":"eth-rt4"
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16021,
+        "installed":true,
+        "interface":"eth-rt3-2"
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16021,
+        "installed":true,
+        "interface":"eth-rt3-1"
+      }
+    ]
+  },
+  "16030":{
+    "inLabel":16030,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "nexthop":"10.0.5.3",
+        "interface":"eth-rt3-2",
+        "backupIndex":[
+          0
+        ]
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "nexthop":"10.0.4.3",
+        "interface":"eth-rt3-1",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16020,
+        "nexthop":"10.0.6.4",
+        "interface":"eth-rt4"
+      }
+    ]
+  },
+  "16031":{
+    "inLabel":16031,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "interface":"eth-rt3-2",
+        "backupIndex":[
+          0
+        ]
+      },
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "interface":"eth-rt3-1",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16021,
+        "interface":"eth-rt4"
+      }
+    ]
+  },
+  "16040":{
+    "inLabel":16040,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "nexthop":"10.0.6.4",
+        "interface":"eth-rt4",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16040,
+        "nexthop":"10.0.8.6",
+        "interface":"eth-rt6"
+      }
+    ]
+  },
+  "16041":{
+    "inLabel":16041,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "interface":"eth-rt4",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16041,
+        "interface":"eth-rt6"
+      }
+    ]
+  },
+  "16060":{
+    "inLabel":16060,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "nexthop":"10.0.8.6",
+        "interface":"eth-rt6",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16060,
+        "nexthop":"10.0.6.4",
+        "interface":"eth-rt4"
+      }
+    ]
+  },
+  "16061":{
+    "inLabel":16061,
+    "installed":true,
+    "nexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":3,
+        "installed":true,
+        "interface":"eth-rt6",
+        "backupIndex":[
+          0
+        ]
+      }
+    ],
+    "backupNexthops":[
+      {
+        "type":"SR (IS-IS)",
+        "outLabel":16061,
+        "interface":"eth-rt4"
+      }
+    ]
+  }
+}
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
deleted file mode 100644
index 74caa86..0000000
--- a/tests/topotests/isis_tilfa_topo1/rt5/step5/show_mpls_table.ref.diff
+++ /dev/null
@@ -1,166 +0,0 @@
---- 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,
-         "installed":true,
-+        "nexthop":"10.0.6.4"
-+      },
-+      {
-+        "type":"SR (IS-IS)",
-+        "outLabel":16020,
-+        "installed":true,
-         "nexthop":"10.0.5.3"
-       },
-       {
-@@ -87,6 +93,12 @@
-         "type":"SR (IS-IS)",
-         "outLabel":16021,
-         "installed":true,
-+        "interface":"eth-rt4"
-+      },
-+      {
-+        "type":"SR (IS-IS)",
-+        "outLabel":16021,
-+        "installed":true,
-         "interface":"eth-rt3-2"
-       },
-       {
-@@ -105,13 +117,26 @@
-         "type":"SR (IS-IS)",
-         "outLabel":3,
-         "installed":true,
--        "nexthop":"10.0.5.3"
-+        "nexthop":"10.0.5.3",
-+        "backupIndex":[
-+          0
-+        ]
-       },
-       {
-         "type":"SR (IS-IS)",
-         "outLabel":3,
-         "installed":true,
--        "nexthop":"10.0.4.3"
-+        "nexthop":"10.0.4.3",
-+        "backupIndex":[
-+          0
-+        ]
-+      }
-+    ],
-+    "backupNexthops":[
-+      {
-+        "type":"SR (IS-IS)",
-+        "outLabel":16020,
-+        "nexthop":"10.0.6.4"
-       }
-     ]
-   },
-@@ -123,13 +148,70 @@
-         "type":"SR (IS-IS)",
-         "outLabel":3,
-         "installed":true,
--        "interface":"eth-rt3-2"
-+        "interface":"eth-rt3-2",
-+        "backupIndex":[
-+          0
-+        ]
-       },
-       {
-         "type":"SR (IS-IS)",
-         "outLabel":3,
-         "installed":true,
--        "interface":"eth-rt3-1"
-+        "interface":"eth-rt3-1",
-+        "backupIndex":[
-+          0
-+        ]
-+      }
-+    ],
-+    "backupNexthops":[
-+      {
-+        "type":"SR (IS-IS)",
-+        "outLabel":16021,
-+        "interface":"eth-rt4"
-+      }
-+    ]
-+  },
-+  "16040":{
-+    "inLabel":16040,
-+    "installed":true,
-+    "nexthops":[
-+      {
-+        "type":"SR (IS-IS)",
-+        "outLabel":3,
-+        "installed":true,
-+        "nexthop":"10.0.6.4",
-+        "backupIndex":[
-+          0
-+        ]
-+      }
-+    ],
-+    "backupNexthops":[
-+      {
-+        "type":"SR (IS-IS)",
-+        "outLabel":16040,
-+        "nexthop":"10.0.8.6"
-+      }
-+    ]
-+  },
-+  "16041":{
-+    "inLabel":16041,
-+    "installed":true,
-+    "nexthops":[
-+      {
-+        "type":"SR (IS-IS)",
-+        "outLabel":3,
-+        "installed":true,
-+        "interface":"eth-rt4",
-+        "backupIndex":[
-+          0
-+        ]
-+      }
-+    ],
-+    "backupNexthops":[
-+      {
-+        "type":"SR (IS-IS)",
-+        "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"
-       }
-     ]