tests: Topotest fixes to skip comparing InterfaceIndex and Internal status in json_cmp

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/tests/topotests/bfd-topo2/r1/ipv4_routes.json b/tests/topotests/bfd-topo2/r1/ipv4_routes.json
index b0333de410b322129a11ff56a16c94c8b6108c47..650c0a81bb4009bc3d22818a1feb994b37c9d05c 100644 (file)
--- a/tests/topotests/bfd-topo2/r1/ipv4_routes.json
+++ b/tests/topotests/bfd-topo2/r1/ipv4_routes.json
@@ -3,16 +3,13 @@
         {
             "distance": 20,
             "protocol": "bgp",
-            "internalFlags": 8,
             "metric": 0,
             "selected": true,
             "installed": true,
             "prefix": "10.0.3.0/24",
-            "internalStatus": 16,
             "nexthops": [
                 {
                     "interfaceName": "r1-eth0",
-                    "interfaceIndex": 2,
                     "fib": true,
                     "flags": 3,
                     "active": true,
@@ -25,16 +22,13 @@
         {
             "distance": 20,
             "protocol": "bgp",
-            "internalFlags": 8,
             "metric": 0,
             "selected": true,
             "installed": true,
             "prefix": "10.254.254.2/32",
-            "internalStatus": 16,
             "nexthops": [
                 {
                     "interfaceName": "r1-eth0",
-                    "interfaceIndex": 2,
                     "fib": true,
                     "flags": 3,
                     "active": true,
@@ -47,17 +41,14 @@
         {
             "distance": 0,
             "protocol": "connected",
-            "internalFlags": 8,
             "metric": 0,
             "selected": true,
             "installed": true,
             "prefix": "10.254.254.1/32",
-            "internalStatus": 16,
             "nexthops": [
                 {
                     "directlyConnected": true,
                     "interfaceName": "lo",
-                    "interfaceIndex": 1,
                     "fib": true,
                     "flags": 3,
                     "active": true

diff --git a/tests/topotests/bfd-topo2/r1/ipv6_routes.json b/tests/topotests/bfd-topo2/r1/ipv6_routes.json
index 0fd03b516d7fdd86b3f8c942ffe07e8e796573b4..50c1f9ad8f4b4e198ba6f78d6d87cc1fe8ed4531 100644 (file)
--- a/tests/topotests/bfd-topo2/r1/ipv6_routes.json
+++ b/tests/topotests/bfd-topo2/r1/ipv6_routes.json
@@ -3,16 +3,13 @@
     {
       "distance": 20,
       "protocol": "bgp",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "2001:db8:4::/64",
-      "internalStatus": 16,
       "nexthops": [
         {
           "interfaceName": "r1-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true,
@@ -25,14 +22,11 @@
     {
       "distance": 20,
       "protocol": "bgp",
-      "internalFlags": 0,
       "metric": 0,
-      "internalStatus": 0,
       "prefix": "2001:db8:1::/64",
       "nexthops": [
         {
           "interfaceName": "r1-eth0",
-          "interfaceIndex": 2,
           "active": true,
           "afi": "ipv6"
         }
@@ -41,17 +35,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "2001:db8:1::/64",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "r1-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true

diff --git a/tests/topotests/bfd-topo2/r2/ipv4_routes.json b/tests/topotests/bfd-topo2/r2/ipv4_routes.json
index 69a5f1a5bc97f0e92908ec11b655a8d3c48c2910..3d49b178b5205a08594df4e44ba65c5493e5f7fb 100644 (file)
--- a/tests/topotests/bfd-topo2/r2/ipv4_routes.json
+++ b/tests/topotests/bfd-topo2/r2/ipv4_routes.json
@@ -3,15 +3,12 @@
     {
       "distance": 110,
       "protocol": "ospf",
-      "internalFlags": 0,
       "metric": 10,
-      "internalStatus": 0,
       "prefix": "10.0.3.0/24",
       "nexthops": [
         {
           "active": true,
           "directlyConnected": true,
-          "interfaceIndex": 3,
           "interfaceName": "r2-eth1"
         }
       ]
@@ -19,17 +16,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "10.0.3.0/24",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "r2-eth1",
-          "interfaceIndex": 3,
           "fib": true,
           "flags": 3,
           "active": true
@@ -41,17 +35,14 @@
     {
       "distance": 110,
       "protocol": "ospf",
-      "internalFlags": 8,
       "metric": 20,
       "selected": true,
       "installed": true,
       "prefix": "10.254.254.3/32",
-      "internalStatus": 16,
       "nexthops": [
         {
           "interfaceName": "r2-eth1",
           "ip": "10.0.3.1",
-          "interfaceIndex": 3,
           "fib": true,
           "flags": 3,
           "active": true,
@@ -64,17 +55,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "10.254.254.2/32",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "lo",
-          "interfaceIndex": 1,
           "fib": true,
           "flags": 3,
           "active": true
@@ -86,16 +74,13 @@
     {
       "distance": 20,
       "protocol": "bgp",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "10.254.254.1/32",
-      "internalStatus": 16,
       "nexthops": [
         {
           "interfaceName": "r2-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true,

diff --git a/tests/topotests/bfd-topo2/r2/ipv6_routes.json b/tests/topotests/bfd-topo2/r2/ipv6_routes.json
index 66abade380effeb500f5799eb428858124f6cc44..4f3c74c5e2ae5690a634fe2b092d79d35c3f52bf 100644 (file)
--- a/tests/topotests/bfd-topo2/r2/ipv6_routes.json
+++ b/tests/topotests/bfd-topo2/r2/ipv6_routes.json
@@ -3,15 +3,12 @@
     {
       "distance": 110,
       "protocol": "ospf6",
-      "internalFlags": 0,
       "metric": 10,
-      "internalStatus": 0,
       "prefix": "2001:db8:4::/64",
       "nexthops": [
         {
           "active": true,
           "directlyConnected": true,
-          "interfaceIndex": 4,
           "interfaceName": "r2-eth2"
         }
       ]
@@ -19,17 +16,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "2001:db8:4::/64",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "r2-eth2",
-          "interfaceIndex": 4,
           "fib": true,
           "flags": 3,
           "active": true
@@ -41,17 +35,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "2001:db8:1::/64",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "r2-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true

diff --git a/tests/topotests/bfd-topo2/r3/ipv4_routes.json b/tests/topotests/bfd-topo2/r3/ipv4_routes.json
index d4a0812ae16a984c2c2edc6393d8c2ef1c94bc1c..e96fdc0b158fd088b48abb692ac3cbdc9a76d506 100644 (file)
--- a/tests/topotests/bfd-topo2/r3/ipv4_routes.json
+++ b/tests/topotests/bfd-topo2/r3/ipv4_routes.json
@@ -3,15 +3,12 @@
     {
       "distance": 110,
       "protocol": "ospf",
-      "internalFlags": 0,
       "metric": 10,
-      "internalStatus": 0,
       "prefix": "10.0.3.0/24",
       "nexthops": [
         {
           "active": true,
           "directlyConnected": true,
-          "interfaceIndex": 2,
           "interfaceName": "r3-eth0"
         }
       ]
@@ -19,17 +16,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "10.0.3.0/24",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "r3-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true
@@ -41,17 +35,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "10.254.254.3/32",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "lo",
-          "interfaceIndex": 1,
           "fib": true,
           "flags": 3,
           "active": true
@@ -63,17 +54,14 @@
     {
       "distance": 110,
       "protocol": "ospf",
-      "internalFlags": 8,
       "metric": 20,
       "selected": true,
       "installed": true,
       "prefix": "10.254.254.2/32",
-      "internalStatus": 16,
       "nexthops": [
         {
           "interfaceName": "r3-eth0",
           "ip": "10.0.3.2",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true,
@@ -86,17 +74,14 @@
     {
       "distance": 110,
       "protocol": "ospf",
-      "internalFlags": 8,
       "metric": 20,
       "selected": true,
       "installed": true,
       "prefix": "10.254.254.1/32",
-      "internalStatus": 16,
       "nexthops": [
         {
           "interfaceName": "r3-eth0",
           "ip": "10.0.3.2",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true,

diff --git a/tests/topotests/bfd-topo2/r4/ipv4_routes.json b/tests/topotests/bfd-topo2/r4/ipv4_routes.json
index b06184a44d7545d83f7c0f0b7ac23bc3c200f71d..dc394aa89182ed1581ef063b12c62a483503c951 100644 (file)
--- a/tests/topotests/bfd-topo2/r4/ipv4_routes.json
+++ b/tests/topotests/bfd-topo2/r4/ipv4_routes.json
@@ -3,17 +3,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "10.254.254.4/32",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "lo",
-          "interfaceIndex": 1,
           "fib": true,
           "flags": 3,
           "active": true

diff --git a/tests/topotests/bfd-topo2/r4/ipv6_routes.json b/tests/topotests/bfd-topo2/r4/ipv6_routes.json
index af8272c4aff821b95c561c8b8a28a0f7600a7e1b..c828575c8489824e01c5d34f5df8ab941f835dec 100644 (file)
--- a/tests/topotests/bfd-topo2/r4/ipv6_routes.json
+++ b/tests/topotests/bfd-topo2/r4/ipv6_routes.json
@@ -3,15 +3,12 @@
     {
       "distance": 110,
       "protocol": "ospf6",
-      "internalFlags": 0,
       "metric": 10,
-      "internalStatus": 0,
       "prefix": "2001:db8:4::/64",
       "nexthops": [
         {
           "active": true,
           "directlyConnected": true,
-          "interfaceIndex": 2,
           "interfaceName": "r4-eth0"
         }
       ]
@@ -19,17 +16,14 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "installed": true,
       "prefix": "2001:db8:4::/64",
-      "internalStatus": 16,
       "nexthops": [
         {
           "directlyConnected": true,
           "interfaceName": "r4-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true
@@ -41,16 +35,13 @@
     {
       "distance": 110,
       "protocol": "ospf6",
-      "internalFlags": 8,
       "metric": 10,
       "selected": true,
       "installed": true,
       "prefix": "2001:db8:1::/64",
-      "internalStatus": 16,
       "nexthops": [
         {
           "interfaceName": "r4-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true,

diff --git a/tests/topotests/bgp_features/r1/ip_route.json b/tests/topotests/bgp_features/r1/ip_route.json
index cf1764140a8846292a64b24fb1b9ec53e7ff813c..34c58033ad518db3322a964ff50768b86597e37f 100644 (file)
--- a/tests/topotests/bgp_features/r1/ip_route.json
+++ b/tests/topotests/bgp_features/r1/ip_route.json
@@ -14,7 +14,6 @@
           "fib":true,
           "ip":"192.168.101.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth3",
           "active":true,
           "weight":1
@@ -32,7 +31,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true,
           "weight":1
@@ -52,7 +50,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -74,7 +71,6 @@
           "fib":true,
           "ip":"192.168.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -97,7 +93,6 @@
           "fib":true,
           "ip":"192.168.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -116,7 +111,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -136,7 +130,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -158,7 +151,6 @@
           "fib":true,
           "ip":"192.168.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -168,7 +160,6 @@
           "fib":true,
           "ip":"192.168.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -186,7 +177,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -206,7 +196,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -223,7 +212,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":5,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -243,7 +231,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":5,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -269,7 +256,6 @@
           "flags":1,
           "ip":"192.168.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -290,7 +276,6 @@
           "fib":true,
           "ip":"192.168.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -313,7 +298,6 @@
           "fib":true,
           "ip":"192.168.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -349,7 +333,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r1-eth3",
           "active":true
         }
@@ -371,7 +354,6 @@
           "fib":true,
           "ip":"192.168.101.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth3",
           "active":true,
           "weight":1

diff --git a/tests/topotests/bgp_features/r1/ip_route_norib.json b/tests/topotests/bgp_features/r1/ip_route_norib.json
index 30f67f53a438b7455399c08fe6972d157ed0880c..f6536d1e9f31d84b1e9397c575acb77236c333b2 100644 (file)
--- a/tests/topotests/bgp_features/r1/ip_route_norib.json
+++ b/tests/topotests/bgp_features/r1/ip_route_norib.json
@@ -9,7 +9,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true,
           "weight":1
@@ -29,7 +28,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -51,7 +49,6 @@
           "fib":true,
           "ip":"192.168.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -74,7 +71,6 @@
           "fib":true,
           "ip":"192.168.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -92,7 +88,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -112,7 +107,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -134,7 +128,6 @@
           "fib":true,
           "ip":"192.168.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -144,7 +137,6 @@
           "fib":true,
           "ip":"192.168.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -162,7 +154,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -182,7 +173,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -199,7 +189,6 @@
         {
           "flags":1,
           "directlyConnected":true,
-          "interfaceIndex":5,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -219,7 +208,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":5,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -241,7 +229,6 @@
           "fib":true,
           "ip":"192.168.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth1",
           "active":true,
           "weight":1
@@ -264,7 +251,6 @@
           "fib":true,
           "ip":"192.168.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth2",
           "active":true,
           "weight":1
@@ -286,7 +272,6 @@
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r1-eth3",
           "active":true
         }

diff --git a/tests/topotests/bgp_ipv6_rtadv/r1/ipv4_routes.json b/tests/topotests/bgp_ipv6_rtadv/r1/ipv4_routes.json
index 8718e49778a7cfa4b48d62fb8f20f71e96b272aa..73c7fbbf5ed1f1753aaacea4c6111d184c0fcfbf 100644 (file)
--- a/tests/topotests/bgp_ipv6_rtadv/r1/ipv4_routes.json
+++ b/tests/topotests/bgp_ipv6_rtadv/r1/ipv4_routes.json
@@ -3,7 +3,6 @@
         {
             "distance": 20,
             "protocol": "bgp",
-            "internalFlags": 8,
             "metric": 0,
             "selected": true,
             "destSelected": true,
@@ -11,7 +10,6 @@
             "nexthops": [
                 {
                     "interfaceName": "r1-eth0",
-                    "interfaceIndex": 2,
                     "fib": true,
                     "flags": 3,
                     "active": true,
@@ -24,7 +22,6 @@
         {
             "distance": 0,
             "protocol": "connected",
-            "internalFlags": 8,
             "metric": 0,
             "selected": true,
             "destSelected": true,
@@ -33,7 +30,6 @@
                 {
                     "directlyConnected": true,
                     "interfaceName": "lo",
-                    "interfaceIndex": 1,
                     "fib": true,
                     "flags": 3,
                     "active": true

diff --git a/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json b/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json
index acf5c8b276bad0c203b7d6f9950077d8e7789054..a50bffd0a8e259688501075a8053359d2bec6dc1 100644 (file)
--- a/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json
+++ b/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json
@@ -3,13 +3,11 @@
     {
       "distance": 20,
       "protocol": "bgp",
-      "internalFlags": 0,
       "metric": 0,
       "prefix": "2001:db8:1::/64",
       "nexthops": [
         {
           "interfaceName": "r1-eth0",
-          "interfaceIndex": 2,
           "active": true,
           "afi": "ipv6"
         }
@@ -18,7 +16,6 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "destSelected": true,
@@ -27,7 +24,6 @@
         {
           "directlyConnected": true,
           "interfaceName": "r1-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true

diff --git a/tests/topotests/bgp_ipv6_rtadv/r2/ipv4_routes.json b/tests/topotests/bgp_ipv6_rtadv/r2/ipv4_routes.json
index fe26937e80fd6fc2c249603ddf4a1f3491ce72b7..d4b1410ea5ffe655854bbd9d0c6a0ab9dbd5d96b 100644 (file)
--- a/tests/topotests/bgp_ipv6_rtadv/r2/ipv4_routes.json
+++ b/tests/topotests/bgp_ipv6_rtadv/r2/ipv4_routes.json
@@ -3,7 +3,6 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "destSelected": true,
@@ -12,7 +11,6 @@
         {
           "directlyConnected": true,
           "interfaceName": "lo",
-          "interfaceIndex": 1,
           "fib": true,
           "flags": 3,
           "active": true
@@ -24,7 +22,6 @@
     {
       "distance": 20,
       "protocol": "bgp",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "destSelected": true,
@@ -32,7 +29,6 @@
       "nexthops": [
         {
           "interfaceName": "r2-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true,

diff --git a/tests/topotests/bgp_ipv6_rtadv/r2/ipv6_routes.json b/tests/topotests/bgp_ipv6_rtadv/r2/ipv6_routes.json
index d5ad1a2c5ba96692c0239fc8f52705ce5da9f39b..e7bfb9914ae04bf232b0372e508d95887b9c2f1c 100644 (file)
--- a/tests/topotests/bgp_ipv6_rtadv/r2/ipv6_routes.json
+++ b/tests/topotests/bgp_ipv6_rtadv/r2/ipv6_routes.json
@@ -3,7 +3,6 @@
     {
       "distance": 0,
       "protocol": "connected",
-      "internalFlags": 8,
       "metric": 0,
       "selected": true,
       "destSelected": true,
@@ -12,7 +11,6 @@
         {
           "directlyConnected": true,
           "interfaceName": "r2-eth0",
-          "interfaceIndex": 2,
           "fib": true,
           "flags": 3,
           "active": true

diff --git a/tests/topotests/bgp_link_bw_ip/r1/v4_route.json b/tests/topotests/bgp_link_bw_ip/r1/v4_route.json
index d40a06d872243670a8b26f8c9c2ed091651fdc2f..76c6396169951d35aa3c0184105d84a2db1a5f4e 100644 (file)
--- a/tests/topotests/bgp_link_bw_ip/r1/v4_route.json
+++ b/tests/topotests/bgp_link_bw_ip/r1/v4_route.json
@@ -6,16 +6,11 @@
       "distance":110,
       "metric":10,
       "table":254,
-      "internalStatus":0,
-      "internalFlags":0,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":9,
           "ip":"0.0.0.0",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "onLink":true
@@ -31,16 +26,11 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -57,16 +47,11 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -83,17 +68,12 @@
       "metric":20,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":11,
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true,
           "onLink":true

diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json
index 1649ade96d37a9eb3f180b960a46ea010b16aaf5..b60350fa4d7f77d91f7658a3f02bffacdb91e399 100644 (file)
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json
@@ -9,14 +9,11 @@
             "distance": 20,
             "metric": 0,
             "installed": true,
-            "internalStatus": 16,
-            "internalFlags": 8,
             "nexthops": [
                 {
                     "flags": 3,
                     "fib": true,
                     "afi": "ipv6",
-                    "interfaceIndex": 2,
                     "interfaceName": "r1-eth0",
                     "active": true
                 }
@@ -33,14 +30,11 @@
             "distance": 0,
             "metric": 0,
             "installed": true,
-            "internalStatus": 16,
-            "internalFlags": 8,
             "nexthops": [
                 {
                     "flags": 3,
                     "fib": true,
                     "directlyConnected": true,
-                    "interfaceIndex": 4,
                     "interfaceName": "loop1",
                     "active": true
                 }

diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json
index e5aff94bdd0d6973800495c5b3e93d3f472623b1..7e9193f8c18bc0861cad2136685710019863ee1b 100644 (file)
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json
@@ -6,12 +6,9 @@
       "vrfId":3,
       "distance": 20,
       "metric": 0,
-      "internalStatus": 0,
-      "internalFlags": 0,
       "nexthops": [
         {
           "afi": "ipv6",
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0",
           "active": true
         }
@@ -26,14 +23,11 @@
       "distance": 0,
       "metric": 0,
       "installed": true,
-      "internalStatus": 16,
-      "internalFlags": 8,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
           "directlyConnected": true,
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0",
           "active": true
         }

diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json
index eda4bed0351d27cf3dd9b0f92de243216a6d8ad4..ccbea2aecc8719b11edb59d258bd26faf10f598b 100644 (file)
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json
@@ -9,14 +9,11 @@
       "distance": 0,
       "metric": 0,
       "installed": true,
-      "internalStatus": 16,
-      "internalFlags": 8,
        "nexthops": [
         {
           "flags": 3,
           "fib": true,
           "directlyConnected": true,
-          "interfaceIndex": 4,
           "interfaceName": "loop1",
           "active": true
         }
@@ -33,14 +30,11 @@
       "distance": 20,
       "metric": 0,
       "installed": true,
-      "internalStatus": 16,
-      "internalFlags": 8,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
           "afi": "ipv6",
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0",
           "active": true
         }

diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json
index 45c1b76017319b041c5f239d83e9e83fed8332e1..b678c1e719cf309186a3888899bbccda074a18c5 100644 (file)
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json
@@ -9,14 +9,11 @@
       "distance": 0,
       "metric": 0,
       "installed": true,
-      "internalStatus": 16,
-      "internalFlags": 8,
       "nexthops": [
         {
           "flags": 3,
           "fib": true,
           "directlyConnected": true,
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0",
           "active": true
         }

diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route.json b/tests/topotests/isis-topo1-vrf/r1/r1_route.json
index 790808f2cda1afc97a2b1c8d7bb2ccaa6091a95e..2bac6b9ef600445b95c5467542a807682e065f84 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route.json
+++ b/tests/topotests/isis-topo1-vrf/r1/r1_route.json
@@ -8,7 +8,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r1-eth0", 
           "ip": "10.0.20.1" 
         }
@@ -27,7 +26,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 2, 
           "interfaceName": "r1-eth0", 
           "ip": "10.0.20.1" 
         }
@@ -43,7 +41,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r1-eth0"
         }
       ], 

diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json b/tests/topotests/isis-topo1-vrf/r1/r1_route6.json
index 332cbb329039951f677d6e9a86983e0f6fa026cc..6e717eaa1ff34269675dbc0b56115c4e9efbba49 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r1/r1_route6.json
@@ -6,7 +6,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r1-eth0"
         }
       ], 
@@ -26,7 +25,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r1-eth0" 
         }
       ], 

diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route.json b/tests/topotests/isis-topo1-vrf/r2/r2_route.json
index b3ac86d218e42181e7fab13ceeefc472a136ed92..e13a695295079416af5efe9fb5511394b8c9378d 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route.json
+++ b/tests/topotests/isis-topo1-vrf/r2/r2_route.json
@@ -8,7 +8,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r2-eth0", 
           "ip": "10.0.21.1" 
         }
@@ -27,7 +26,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 2, 
           "interfaceName": "r2-eth0", 
           "ip": "10.0.21.1" 
         }
@@ -43,7 +41,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r2-eth0"
         }
       ], 

diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json b/tests/topotests/isis-topo1-vrf/r2/r2_route6.json
index c8d11b4922c88aac2ae9074b534caa9084d07322..802ca0833c0edbd6e00ca3a6dcb4084c8044ead8 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r2/r2_route6.json
@@ -6,7 +6,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r2-eth0"
         }
       ], 
@@ -26,7 +25,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r2-eth0" 
         }
       ], 

diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route.json b/tests/topotests/isis-topo1-vrf/r3/r3_route.json
index 709d6b9aeb85f35a7d2f04bd635071046647ca97..fa678632b501b67a7a852639979ddeff1b1ddefe 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route.json
+++ b/tests/topotests/isis-topo1-vrf/r3/r3_route.json
@@ -6,7 +6,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 3, 
           "interfaceName": "r3-eth1", 
           "ip": "10.0.10.1" 
         }
@@ -22,7 +21,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r3-eth1"
         }
       ], 
@@ -42,7 +40,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r3-eth1", 
           "ip": "10.0.10.1" 
         }
@@ -61,7 +58,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 2, 
           "interfaceName": "r3-eth0", 
           "ip": "10.0.20.2" 
         }
@@ -77,7 +73,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r3-eth0"
         }
       ], 
@@ -97,7 +92,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r3-eth1", 
           "ip": "10.0.10.1" 
         }

diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route6.json b/tests/topotests/isis-topo1-vrf/r3/r3_route6.json
index 3a7c3861fae8c5fb3155c120e96998326f9d1bd8..b100d3440a8d4d6899434c9936868e1126273916 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r3/r3_route6.json
@@ -6,7 +6,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r3-eth0"
         }
       ], 
@@ -26,7 +25,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r3-eth1" 
         }
       ], 
@@ -44,7 +42,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r3-eth1"
         }
       ], 
@@ -64,7 +61,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r3-eth1" 
         }
       ], 

diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route.json b/tests/topotests/isis-topo1-vrf/r4/r4_route.json
index c464607a2b76a1c697f6d829d050de06846e62e8..ca8229dc46fd4abd29b0bb08414b3f5f15ee1e92 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route.json
+++ b/tests/topotests/isis-topo1-vrf/r4/r4_route.json
@@ -7,7 +7,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r4-eth1", 
           "ip": "10.0.11.1" 
         }
@@ -24,7 +23,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 3, 
           "interfaceName": "r4-eth1", 
           "ip": "10.0.11.1" 
         }
@@ -40,7 +38,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r4-eth1"
         }
       ], 
@@ -58,7 +55,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r4-eth1", 
           "ip": "10.0.11.1" 
         }
@@ -75,7 +71,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 2, 
           "interfaceName": "r4-eth0", 
           "ip": "10.0.21.2" 
         }
@@ -91,7 +86,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r4-eth0"
         }
       ], 

diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json b/tests/topotests/isis-topo1-vrf/r4/r4_route6.json
index 8d3ea570f0b5e6d626513ff3041981c2ab1363f9..322c4d72dc15f833d0564b32dc30493a8cf24ef7 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r4/r4_route6.json
@@ -8,7 +8,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r4-eth1" 
         }
       ], 
@@ -26,7 +25,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r4-eth0"
         }
       ], 
@@ -46,7 +44,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r4-eth1" 
         }
       ], 
@@ -64,7 +61,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r4-eth1"
         }
       ], 

diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route.json b/tests/topotests/isis-topo1-vrf/r5/r5_route.json
index 58aee5ddcc828002f8e3360a48e7bc501bb6e2a0..781aa8ad7382e39ed3a0512cf475a144e498576d 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route.json
+++ b/tests/topotests/isis-topo1-vrf/r5/r5_route.json
@@ -6,7 +6,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 2, 
           "interfaceName": "r5-eth0", 
           "ip": "10.0.10.2" 
         }
@@ -22,7 +21,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r5-eth0"
         }
       ], 
@@ -38,7 +36,6 @@
       "nexthops": [
         {
           "afi": "ipv4", 
-          "interfaceIndex": 3, 
           "interfaceName": "r5-eth1", 
           "ip": "10.0.11.2" 
         }
@@ -54,7 +51,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r5-eth1"
         }
       ], 
@@ -72,7 +68,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r5-eth0", 
           "ip": "10.0.10.2" 
         }
@@ -91,7 +86,6 @@
           "active": true, 
           "afi": "ipv4", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r5-eth1", 
           "ip": "10.0.11.2" 
         }

diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json b/tests/topotests/isis-topo1-vrf/r5/r5_route6.json
index e32bbcc2c185e0f100402b46e6b18bd790b7c25e..25b73b7d43cf2a97cc1c644e91c78d9f9d308570 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r5/r5_route6.json
@@ -8,7 +8,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r5-eth0" 
         }
       ], 
@@ -28,7 +27,6 @@
           "active": true, 
           "afi": "ipv6", 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r5-eth1" 
         }
       ], 
@@ -46,7 +44,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 2, 
           "interfaceName": "r5-eth0"
         }
       ], 
@@ -64,7 +61,6 @@
           "active": true, 
           "directlyConnected": true, 
           "fib": true, 
-          "interfaceIndex": 3, 
           "interfaceName": "r5-eth1"
         }
       ], 

diff --git a/tests/topotests/isis-topo1/r1/r1_route.json b/tests/topotests/isis-topo1/r1/r1_route.json
index 6f5041e3c28e83b950e3f5b502b04509ce68e468..123b4dd16333488f3f238262ce3f1949f0eddd17 100644 (file)
--- a/tests/topotests/isis-topo1/r1/r1_route.json
+++ b/tests/topotests/isis-topo1/r1/r1_route.json
@@ -8,7 +8,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0",
           "ip": "10.0.20.1"
         }
@@ -25,7 +24,6 @@
       "nexthops": [
         {
           "afi": "ipv4",
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0",
           "ip": "10.0.20.1"
         }
@@ -39,7 +37,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0"
         }
       ],
@@ -55,7 +52,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],
@@ -73,7 +69,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0",
           "ip": "10.0.20.1"
         }

diff --git a/tests/topotests/isis-topo1/r1/r1_route6.json b/tests/topotests/isis-topo1/r1/r1_route6.json
index 1060150a59267a53e5a3af05af2f3a06f2d1d4ce..bd09839fea212172b1d00c4431997020ea5fe2de 100644 (file)
--- a/tests/topotests/isis-topo1/r1/r1_route6.json
+++ b/tests/topotests/isis-topo1/r1/r1_route6.json
@@ -6,7 +6,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0"
         }
       ],
@@ -24,7 +23,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0"
         }
       ],
@@ -40,7 +38,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],
@@ -58,7 +55,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r1-eth0"
         }
       ],

diff --git a/tests/topotests/isis-topo1/r2/r2_route.json b/tests/topotests/isis-topo1/r2/r2_route.json
index 3b14f160c0d678924cbd9b4167e3b68e776a2054..fe2de057342bcf4d6c714be677b5aa1df8b0d7dd 100644 (file)
--- a/tests/topotests/isis-topo1/r2/r2_route.json
+++ b/tests/topotests/isis-topo1/r2/r2_route.json
@@ -8,7 +8,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0",
           "ip": "10.0.21.1"
         }
@@ -25,7 +24,6 @@
       "nexthops": [
         {
           "afi": "ipv4",
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0",
           "ip": "10.0.21.1"
         }
@@ -39,7 +37,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0"
         }
       ],
@@ -55,7 +52,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],
@@ -73,7 +69,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0",
           "ip": "10.0.21.1"
         }

diff --git a/tests/topotests/isis-topo1/r2/r2_route6.json b/tests/topotests/isis-topo1/r2/r2_route6.json
index 49477a7ad3fa0828dceba4049c69332983cc5164..78c31b3cc5452e5ecf8ec2fa862c6b5f02ff32d8 100644 (file)
--- a/tests/topotests/isis-topo1/r2/r2_route6.json
+++ b/tests/topotests/isis-topo1/r2/r2_route6.json
@@ -6,7 +6,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0"
         }
       ],
@@ -24,7 +23,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0"
         }
       ],
@@ -40,7 +38,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],
@@ -58,7 +55,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r2-eth0"
         }
       ],

diff --git a/tests/topotests/isis-topo1/r3/r3_route.json b/tests/topotests/isis-topo1/r3/r3_route.json
index d688e63ba1031dd8cf5ef4f17fce02eca76f801b..1f0fcdfcd6471110b3a226b4978a7d991374a8ee 100644 (file)
--- a/tests/topotests/isis-topo1/r3/r3_route.json
+++ b/tests/topotests/isis-topo1/r3/r3_route.json
@@ -6,7 +6,6 @@
       "nexthops": [
         {
           "afi": "ipv4",
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1",
           "ip": "10.0.10.1"
         }
@@ -20,7 +19,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1"
         }
       ],
@@ -38,7 +36,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1",
           "ip": "10.0.10.1"
         }
@@ -55,7 +52,6 @@
       "nexthops": [
         {
           "afi": "ipv4",
-          "interfaceIndex": 2,
           "interfaceName": "r3-eth0",
           "ip": "10.0.20.2"
         }
@@ -69,7 +65,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r3-eth0"
         }
       ],
@@ -87,7 +82,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1",
           "ip": "10.0.10.1"
         }
@@ -106,7 +100,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r3-eth0",
           "ip": "10.0.20.2"
         }
@@ -123,7 +116,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],
@@ -141,7 +133,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1",
           "ip": "10.0.10.1"
         }
@@ -160,7 +151,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1",
           "ip": "10.0.10.1"
         }

diff --git a/tests/topotests/isis-topo1/r3/r3_route6.json b/tests/topotests/isis-topo1/r3/r3_route6.json
index 7bb2be0aef58069dedd11e203efe7ea01e131b20..41040240eaa82d5e974b1a5b87753f1addc302ba 100644 (file)
--- a/tests/topotests/isis-topo1/r3/r3_route6.json
+++ b/tests/topotests/isis-topo1/r3/r3_route6.json
@@ -6,7 +6,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r3-eth0"
         }
       ],
@@ -24,7 +23,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1"
         }
       ],
@@ -40,7 +38,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1"
         }
       ],
@@ -58,7 +55,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1"
         }
       ],
@@ -76,7 +72,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r3-eth0"
         }
       ],
@@ -92,7 +87,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],
@@ -110,7 +104,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1"
         }
       ],
@@ -128,7 +121,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r3-eth1"
         }
       ],

diff --git a/tests/topotests/isis-topo1/r4/r4_route.json b/tests/topotests/isis-topo1/r4/r4_route.json
index 282565a273d01422e2b0631d9fe102c1c0e9e259..597e953c09faf4ff7961b5ae35bac76c726e2a9e 100644 (file)
--- a/tests/topotests/isis-topo1/r4/r4_route.json
+++ b/tests/topotests/isis-topo1/r4/r4_route.json
@@ -6,7 +6,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r4-eth1"
         }
       ],
@@ -22,7 +21,6 @@
       "nexthops": [
         {
           "afi": "ipv4",
-          "interfaceIndex": 2,
           "interfaceName": "r4-eth0",
           "ip": "10.0.21.2"
         }
@@ -36,7 +34,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r4-eth0"
         }
       ],
@@ -54,7 +51,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r4-eth0",
           "ip": "10.0.21.2"
         }
@@ -71,7 +67,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],

diff --git a/tests/topotests/isis-topo1/r4/r4_route6.json b/tests/topotests/isis-topo1/r4/r4_route6.json
index 8f52bcea2c499859558d885a9d4943019c851ac2..c0ace9a19343c32bb8ec2ac10ea33b6973eb2927 100644 (file)
--- a/tests/topotests/isis-topo1/r4/r4_route6.json
+++ b/tests/topotests/isis-topo1/r4/r4_route6.json
@@ -8,7 +8,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r4-eth1"
         }
       ],
@@ -24,7 +23,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r4-eth0"
         }
       ],
@@ -42,7 +40,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r4-eth1"
         }
       ],
@@ -58,7 +55,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r4-eth1"
         }
       ],
@@ -76,7 +72,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r4-eth0"
         }
       ],
@@ -94,7 +89,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r4-eth1"
         }
       ],
@@ -110,7 +104,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],
@@ -128,7 +121,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r4-eth1"
         }
       ],

diff --git a/tests/topotests/isis-topo1/r5/r5_route.json b/tests/topotests/isis-topo1/r5/r5_route.json
index 5bdde09f1b9252c4256ee347c52151dadcfc7eee..cca844b27c4f75507287b6a008343c116a7865ec 100644 (file)
--- a/tests/topotests/isis-topo1/r5/r5_route.json
+++ b/tests/topotests/isis-topo1/r5/r5_route.json
@@ -6,7 +6,6 @@
       "nexthops": [
         {
           "afi": "ipv4",
-          "interfaceIndex": 2,
           "interfaceName": "r5-eth0",
           "ip": "10.0.10.2"
         }
@@ -20,7 +19,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r5-eth0"
         }
       ],
@@ -36,7 +34,6 @@
       "nexthops": [
         {
           "afi": "ipv4",
-          "interfaceIndex": 3,
           "interfaceName": "r5-eth1",
           "ip": "10.0.11.2"
         }
@@ -50,7 +47,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r5-eth1"
         }
       ],
@@ -68,7 +64,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r5-eth0",
           "ip": "10.0.10.2"
         }
@@ -87,7 +82,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r5-eth1",
           "ip": "10.0.11.2"
         }
@@ -106,7 +100,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r5-eth0",
           "ip": "10.0.10.2"
         }
@@ -125,7 +118,6 @@
           "active": true,
           "afi": "ipv4",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r5-eth1",
           "ip": "10.0.11.2"
         }
@@ -142,7 +134,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],

diff --git a/tests/topotests/isis-topo1/r5/r5_route6.json b/tests/topotests/isis-topo1/r5/r5_route6.json
index 694d8c88142c91f42739ea993ad19588f1198b56..b9468764d490d344374824338ad1db2e714278ff 100644 (file)
--- a/tests/topotests/isis-topo1/r5/r5_route6.json
+++ b/tests/topotests/isis-topo1/r5/r5_route6.json
@@ -6,7 +6,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r5-eth0"
         }
       ],
@@ -22,7 +21,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r5-eth1"
         }
       ],
@@ -40,7 +38,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r5-eth0"
         }
       ],
@@ -58,7 +55,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r5-eth1"
         }
       ],
@@ -76,7 +72,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 2,
           "interfaceName": "r5-eth0"
         }
       ],
@@ -94,7 +89,6 @@
           "active": true,
           "afi": "ipv6",
           "fib": true,
-          "interfaceIndex": 3,
           "interfaceName": "r5-eth1"
         }
       ],
@@ -110,7 +104,6 @@
           "active": true,
           "directlyConnected": true,
           "fib": true,
-          "interfaceIndex": 1,
           "interfaceName": "lo"
         }
       ],

diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_route.ref b/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_route.ref
index d75b8f21dbbc03e24de687df5e5965a4c1875ec7..2131668fc310ff68aaf4505949bec8fe1adcf050 100644 (file)
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_route.ref
@@ -6,7 +6,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -20,7 +19,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -37,7 +35,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -54,7 +51,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -71,7 +67,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -85,7 +80,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -99,7 +93,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -116,7 +109,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -133,7 +125,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -147,7 +138,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -161,7 +151,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_route.ref b/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_route.ref
index 060c0b429d831b7098a01fa6ec11b2f3371325a6..4b1d31a5d3eb39fb9ba15aec7552e7578b7b6545 100644 (file)
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_route.ref
@@ -13,7 +13,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }
@@ -29,7 +28,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -47,7 +45,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -68,7 +65,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -89,7 +85,6 @@
           "fib":true,
           "ip":"10.0.2.4",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -105,7 +100,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }
@@ -123,7 +117,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }
@@ -139,7 +132,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -157,7 +149,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -178,7 +169,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -199,7 +189,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_route.ref b/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_route.ref
index 40800762ba3e30ebf3a4f7f9dc61cbcef147d45c..4d115caf3e04f5097e528f14697e415eabf0caf2 100644 (file)
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_route.ref
@@ -13,7 +13,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -34,7 +33,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -50,7 +48,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -68,7 +65,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -89,7 +85,6 @@
           "fib":true,
           "ip":"10.0.2.4",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -110,7 +105,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -126,7 +120,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -144,7 +137,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -160,7 +152,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -178,7 +169,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -199,7 +189,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_route.ref b/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_route.ref
index c9b83a1c73d0f9f7649fc44fb3068dfc0b15af83..223cbded84bb68052b6d43c13fd543cdf822da88 100644 (file)
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_route.ref
@@ -13,7 +13,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -34,7 +33,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -55,7 +53,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -71,7 +68,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -89,7 +85,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -110,7 +105,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -126,7 +120,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -144,7 +137,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -165,7 +157,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -186,7 +177,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-oc-topo1/r1/show_ip_route.ref b/tests/topotests/ldp-oc-topo1/r1/show_ip_route.ref
index d75b8f21dbbc03e24de687df5e5965a4c1875ec7..2131668fc310ff68aaf4505949bec8fe1adcf050 100644 (file)
--- a/tests/topotests/ldp-oc-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-topo1/r1/show_ip_route.ref
@@ -6,7 +6,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -20,7 +19,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -37,7 +35,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -54,7 +51,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -71,7 +67,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -85,7 +80,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -99,7 +93,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -116,7 +109,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -133,7 +125,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -147,7 +138,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -161,7 +151,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-oc-topo1/r2/show_ip_route.ref b/tests/topotests/ldp-oc-topo1/r2/show_ip_route.ref
index 060c0b429d831b7098a01fa6ec11b2f3371325a6..4b1d31a5d3eb39fb9ba15aec7552e7578b7b6545 100644 (file)
--- a/tests/topotests/ldp-oc-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-topo1/r2/show_ip_route.ref
@@ -13,7 +13,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }
@@ -29,7 +28,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -47,7 +45,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -68,7 +65,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -89,7 +85,6 @@
           "fib":true,
           "ip":"10.0.2.4",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -105,7 +100,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }
@@ -123,7 +117,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }
@@ -139,7 +132,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -157,7 +149,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -178,7 +169,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -199,7 +189,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-oc-topo1/r3/show_ip_route.ref b/tests/topotests/ldp-oc-topo1/r3/show_ip_route.ref
index 40800762ba3e30ebf3a4f7f9dc61cbcef147d45c..4d115caf3e04f5097e528f14697e415eabf0caf2 100644 (file)
--- a/tests/topotests/ldp-oc-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-topo1/r3/show_ip_route.ref
@@ -13,7 +13,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -34,7 +33,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -50,7 +48,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -68,7 +65,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -89,7 +85,6 @@
           "fib":true,
           "ip":"10.0.2.4",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -110,7 +105,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -126,7 +120,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -144,7 +137,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }
@@ -160,7 +152,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -178,7 +169,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -199,7 +189,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r3-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-oc-topo1/r4/show_ip_route.ref b/tests/topotests/ldp-oc-topo1/r4/show_ip_route.ref
index c9b83a1c73d0f9f7649fc44fb3068dfc0b15af83..223cbded84bb68052b6d43c13fd543cdf822da88 100644 (file)
--- a/tests/topotests/ldp-oc-topo1/r4/show_ip_route.ref
+++ b/tests/topotests/ldp-oc-topo1/r4/show_ip_route.ref
@@ -13,7 +13,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -34,7 +33,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -55,7 +53,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -71,7 +68,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -89,7 +85,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -110,7 +105,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -126,7 +120,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -144,7 +137,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -165,7 +157,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }
@@ -186,7 +177,6 @@
           "fib":true,
           "ip":"10.0.2.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r4-eth0",
           "active":true
         }

diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_ip_route.ref b/tests/topotests/ldp-sync-isis-topo1/r1/show_ip_route.ref
index dc8f19dad02f484f0f1ef32c6fb7210200e156cf..b1a55ba103b75884e06b91eab758503e84a68106 100644 (file)
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp-sync-isis-topo1/r1/show_ip_route.ref
@@ -8,7 +8,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -27,7 +26,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -46,7 +44,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -63,7 +60,6 @@
         {
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1"
         }
       ]
@@ -76,7 +72,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -93,7 +88,6 @@
         {
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2"
         }
       ]
@@ -106,7 +100,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -125,7 +118,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         },
@@ -133,7 +125,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ip_route.ref b/tests/topotests/ldp-sync-isis-topo1/r2/show_ip_route.ref
index 2bcee96064dcf150a0c1f34fda1e178b02cc9f1e..04f141aba4d87373a51fcf84eb98a413d50c0de4 100644 (file)
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp-sync-isis-topo1/r2/show_ip_route.ref
@@ -11,7 +11,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -27,7 +26,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -46,7 +44,6 @@
           "fib":true,
           "ip":"10.0.3.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -63,7 +60,6 @@
         {
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1"
         }
       ]
@@ -76,7 +72,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -95,7 +90,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         },
@@ -103,7 +97,6 @@
           "fib":true,
           "ip":"10.0.3.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -120,7 +113,6 @@
         {
           "ip":"10.0.3.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2"
         }
       ]
@@ -133,7 +125,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_ip_route.ref b/tests/topotests/ldp-sync-isis-topo1/r3/show_ip_route.ref
index da46f1dfe2b8819f8a90534414d1e1341dfbb7d9..22504046ed51db025eee5209685ba1cce6b8ed96 100644 (file)
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp-sync-isis-topo1/r3/show_ip_route.ref
@@ -11,7 +11,6 @@
           "fib":true,
           "ip":"10.0.2.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -30,7 +29,6 @@
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -46,7 +44,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -65,7 +62,6 @@
           "fib":true,
           "ip":"10.0.2.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         },
@@ -73,7 +69,6 @@
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -90,7 +85,6 @@
         {
           "ip":"10.0.2.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1"
         }
       ]
@@ -103,7 +97,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -120,7 +113,6 @@
         {
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2"
         }
       ]
@@ -133,7 +125,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_route.ref b/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_route.ref
index 8ccd60ca41220b878c295a965375d283da6d230b..fdb81f212df38e8c25c599549228c5e8016b4261 100644 (file)
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_route.ref
@@ -8,7 +8,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -22,7 +21,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -41,7 +39,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -60,7 +57,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -76,7 +72,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -90,7 +85,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -106,7 +100,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -120,7 +113,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -139,7 +131,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         },
@@ -147,7 +138,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_route.ref b/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_route.ref
index 7147c6a5958739296f6a44fd94d562ea267c8e2e..6056feffe3e836df6a474619c1ab5bd246519a65 100644 (file)
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_route.ref
@@ -11,7 +11,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -27,7 +26,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -41,7 +39,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -60,7 +57,6 @@
           "fib":true,
           "ip":"10.0.3.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -76,7 +72,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -90,7 +85,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -109,7 +103,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         },
@@ -117,7 +110,6 @@
           "fib":true,
           "ip":"10.0.3.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -133,7 +125,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -147,7 +138,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_route.ref b/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_route.ref
index d77de7c9e3b8db8e9eea7b8462934ba42864e3bd..fc96ada443280c9d74a0f4d1f03fdd2f88a19c61 100644 (file)
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_route.ref
@@ -11,7 +11,6 @@
           "fib":true,
           "ip":"10.0.2.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -30,7 +29,6 @@
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -46,7 +44,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -60,7 +57,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -79,7 +75,6 @@
           "fib":true,
           "ip":"10.0.2.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         },
@@ -87,7 +82,6 @@
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -103,7 +97,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -117,7 +110,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -133,7 +125,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -147,7 +138,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ip_route.ref b/tests/topotests/ldp-vpls-topo1/r1/show_ip_route.ref
index 8ccd60ca41220b878c295a965375d283da6d230b..fdb81f212df38e8c25c599549228c5e8016b4261 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp-vpls-topo1/r1/show_ip_route.ref
@@ -8,7 +8,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -22,7 +21,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -41,7 +39,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -60,7 +57,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -76,7 +72,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -90,7 +85,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -106,7 +100,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -120,7 +113,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }
@@ -139,7 +131,6 @@
           "fib":true,
           "ip":"10.0.1.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         },
@@ -147,7 +138,6 @@
           "fib":true,
           "ip":"10.0.2.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r1-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ip_route.ref b/tests/topotests/ldp-vpls-topo1/r2/show_ip_route.ref
index 7147c6a5958739296f6a44fd94d562ea267c8e2e..6056feffe3e836df6a474619c1ab5bd246519a65 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp-vpls-topo1/r2/show_ip_route.ref
@@ -11,7 +11,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -27,7 +26,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -41,7 +39,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -60,7 +57,6 @@
           "fib":true,
           "ip":"10.0.3.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -76,7 +72,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -90,7 +85,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -109,7 +103,6 @@
           "fib":true,
           "ip":"10.0.1.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         },
@@ -117,7 +110,6 @@
           "fib":true,
           "ip":"10.0.3.3",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -133,7 +125,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }
@@ -147,7 +138,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r2-eth2",
           "active":true
         }

diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ip_route.ref b/tests/topotests/ldp-vpls-topo1/r3/show_ip_route.ref
index d77de7c9e3b8db8e9eea7b8462934ba42864e3bd..fc96ada443280c9d74a0f4d1f03fdd2f88a19c61 100644 (file)
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp-vpls-topo1/r3/show_ip_route.ref
@@ -11,7 +11,6 @@
           "fib":true,
           "ip":"10.0.2.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -30,7 +29,6 @@
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -46,7 +44,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -60,7 +57,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":1,
           "interfaceName":"lo",
           "active":true
         }
@@ -79,7 +75,6 @@
           "fib":true,
           "ip":"10.0.2.1",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         },
@@ -87,7 +82,6 @@
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -103,7 +97,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -117,7 +110,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r3-eth1",
           "active":true
         }
@@ -133,7 +125,6 @@
       "nexthops":[
         {
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }
@@ -147,7 +138,6 @@
         {
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":4,
           "interfaceName":"r3-eth2",
           "active":true
         }

diff --git a/tests/topotests/ospf-topo2/r1/v4_route.json b/tests/topotests/ospf-topo2/r1/v4_route.json
index d40a06d872243670a8b26f8c9c2ed091651fdc2f..76c6396169951d35aa3c0184105d84a2db1a5f4e 100644 (file)
--- a/tests/topotests/ospf-topo2/r1/v4_route.json
+++ b/tests/topotests/ospf-topo2/r1/v4_route.json
@@ -6,16 +6,11 @@
       "distance":110,
       "metric":10,
       "table":254,
-      "internalStatus":0,
-      "internalFlags":0,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":9,
           "ip":"0.0.0.0",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "onLink":true
@@ -31,16 +26,11 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }
@@ -57,16 +47,11 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }
@@ -83,17 +68,12 @@
       "metric":20,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":11,
           "fib":true,
           "ip":"10.0.3.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true,
           "onLink":true

diff --git a/tests/topotests/ospf-topo2/r2/v4_route.json b/tests/topotests/ospf-topo2/r2/v4_route.json
index cd4f418fb9d6996cf205d23fb718f5de73d6c56e..163853638822d9906542e5426f36e506defa3a01 100644 (file)
--- a/tests/topotests/ospf-topo2/r2/v4_route.json
+++ b/tests/topotests/ospf-topo2/r2/v4_route.json
@@ -9,17 +9,12 @@
       "metric":20,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":11,
           "fib":true,
           "ip":"10.0.3.4",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true,
           "onLink":true
@@ -37,16 +32,11 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":3,
           "interfaceName":"r2-eth1",
           "active":true
         }
@@ -60,16 +50,11 @@
       "distance":110,
       "metric":10,
       "table":254,
-      "internalStatus":0,
-      "internalFlags":0,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":9,
           "ip":"0.0.0.0",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true,
           "onLink":true
@@ -85,16 +70,11 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "directlyConnected":true,
-          "interfaceIndex":2,
           "interfaceName":"r2-eth0",
           "active":true
         }

diff --git a/tests/topotests/zebra_netlink/r1/v4_route.json b/tests/topotests/zebra_netlink/r1/v4_route.json
index 61e9bb240be6ad2a7659a9ed39cd9168c53791d3..39041ebc956453b98db9db381ce9d99609d1376e 100644 (file)
--- a/tests/topotests/zebra_netlink/r1/v4_route.json
+++ b/tests/topotests/zebra_netlink/r1/v4_route.json
@@ -9,17 +9,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -37,17 +32,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -65,17 +55,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -93,17 +78,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -121,17 +101,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -149,17 +124,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -177,17 +147,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -205,17 +170,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -233,17 +193,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -261,17 +216,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -289,17 +239,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -317,17 +262,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -345,17 +285,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -373,17 +308,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -401,17 +331,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -429,17 +354,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -457,17 +377,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -485,17 +400,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -513,17 +423,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -541,17 +446,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -569,17 +469,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -597,17 +492,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -625,17 +515,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -653,17 +538,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -681,17 +561,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -709,17 +584,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -737,17 +607,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -765,17 +630,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -793,17 +653,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -821,17 +676,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -849,17 +699,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -877,17 +722,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -905,17 +745,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -933,17 +768,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -961,17 +791,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -989,17 +814,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1017,17 +837,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1045,17 +860,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1073,17 +883,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1101,17 +906,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1129,17 +929,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1157,17 +952,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1185,17 +975,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1213,17 +998,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1241,17 +1021,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1269,17 +1044,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1297,17 +1067,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1325,17 +1090,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1353,17 +1113,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1381,17 +1136,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1409,17 +1159,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1437,17 +1182,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1465,17 +1205,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1493,17 +1228,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1521,17 +1251,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1549,17 +1274,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1577,17 +1297,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1605,17 +1320,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1633,17 +1343,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1661,17 +1366,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1689,17 +1389,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1717,17 +1412,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1745,17 +1435,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1773,17 +1458,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1801,17 +1481,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1829,17 +1504,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1857,17 +1527,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1885,17 +1550,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1913,17 +1573,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1941,17 +1596,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1969,17 +1619,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -1997,17 +1642,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2025,17 +1665,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2053,17 +1688,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2081,17 +1711,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2109,17 +1734,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2137,17 +1757,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2165,17 +1780,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2193,17 +1803,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2221,17 +1826,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2249,17 +1849,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2277,17 +1872,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2305,17 +1895,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2333,17 +1918,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2361,17 +1941,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2389,17 +1964,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2417,17 +1987,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2445,17 +2010,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2473,17 +2033,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2501,17 +2056,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2529,17 +2079,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2557,17 +2102,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2585,17 +2125,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2613,17 +2148,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2641,17 +2171,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2669,17 +2194,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2697,17 +2217,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2725,17 +2240,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2753,17 +2263,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1
@@ -2781,17 +2286,12 @@
       "metric":0,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":9,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.1.1",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true,
           "weight":1

diff --git a/tests/topotests/zebra_rib/r1/v4_route_1.json b/tests/topotests/zebra_rib/r1/v4_route_1.json
index 3a77bdace4b4524617bdaf0b640d2f9beb1f5b2d..a238e52aa7fed638d22a12373e374207ff569cfc 100644 (file)
--- a/tests/topotests/zebra_rib/r1/v4_route_1.json
+++ b/tests/topotests/zebra_rib/r1/v4_route_1.json
@@ -9,17 +9,12 @@
       "metric":8192,
       "installed":true,
       "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.210.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }

diff --git a/tests/topotests/zebra_rib/r1/v4_route_1_static_override.json b/tests/topotests/zebra_rib/r1/v4_route_1_static_override.json
index 22e199f9aa25db25cbc3b5cbdeba7d749a81703e..5bc665bea7782638f310c6239181cce05d1ca56b 100644 (file)
--- a/tests/topotests/zebra_rib/r1/v4_route_1_static_override.json
+++ b/tests/topotests/zebra_rib/r1/v4_route_1_static_override.json
@@ -8,18 +8,12 @@
       "distance":1,
       "metric":0,
       "installed":true,
-      "table":254,
-      "internalStatus":16,
-      "internalFlags":73,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.216.3",
           "afi":"ipv4",
-          "interfaceIndex":8,
           "interfaceName":"r1-eth6",
           "active":true
         }
@@ -31,18 +25,12 @@
       "distance":255,
       "metric":8192,
       "installed":true,
-      "table":254,
-      "internalStatus":16,
-      "internalFlags":0,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.210.2",
           "afi":"ipv4",
-          "interfaceIndex":2,
           "interfaceName":"r1-eth0",
           "active":true
         }

diff --git a/tests/topotests/zebra_rib/r1/v4_route_2.json b/tests/topotests/zebra_rib/r1/v4_route_2.json
index 02c3878e12faf2075a001995de819944be22c540..5454af899befc0f61df6382300137b165d7f46b1 100644 (file)
--- a/tests/topotests/zebra_rib/r1/v4_route_2.json
+++ b/tests/topotests/zebra_rib/r1/v4_route_2.json
@@ -8,18 +8,12 @@
       "distance":1,
       "metric":1,
       "installed":true,
-      "table":254,
-      "internalStatus":16,
-      "internalFlags":8,
-      "internalNextHopNum":1,
-      "internalNextHopActiveNum":1,
       "nexthops":[
         {
           "flags":3,
           "fib":true,
           "ip":"192.168.211.2",
           "afi":"ipv4",
-          "interfaceIndex":3,
           "interfaceName":"r1-eth1",
           "active":true
         }