tests: don't compare internal vrfId in topotests

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json
index ac5fd040745e3b4037ebb7fc0b9006d1285a30e2..5cba71ef200e0528fceecd098d1b06fbac60af08 100644 (file)
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json
@@ -1,5 +1,4 @@
 {
-    "vrfId": 0,
     "vrfName": "default",
     "routerId": "10.254.254.1",
     "localAS": 101,

diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json
index ab42b05e854c1a81edf7d3ad6f065a843b5ddf2d..c0cb3c4ac92174e42d3b95a850a12eed90ca90ce 100644 (file)
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json
@@ -1,5 +1,4 @@
 {
-    "vrfId": 0,
     "vrfName": "default",
     "routerId": "10.254.254.3",
     "localAS": 102,

diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
index 11611d041b9a275dace4e76a7c93e850b308602b..f0929536d33b90d6ace1b4592b6126abaf9a9e83 100644 (file)
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
+++ b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"10.0.255.1",
   "as":100,
-  "vrfId":0,
   "vrfName":"Default",
   "peerCount":20,
   "peers":{

diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
index f90aedb1ec6a8f8701aa40f8bc564cb5930e7124..9015f485f8474aac0f411aa649aa08cee8675e20 100644 (file)
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
+++ b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
@@ -1,7 +1,6 @@
 {
   "routerId":"10.0.255.1",
   "as":100,
-  "vrfId":0,
   "vrfName":"Default",
   "peerCount":20,
   "peers":{

diff --git a/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json b/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json
index 70b70de1d1917aea8bcc3b580cf53c2f6386f85e..d986071768f1b1d9e5afab5510ec0e0b97af6d5b 100644 (file)
--- a/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json
+++ b/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"192.168.0.1",
   "as":65000,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":2,
   "peers":{

diff --git a/tests/topotests/bgp_features/r1/bgp_summary.json b/tests/topotests/bgp_features/r1/bgp_summary.json
index 57aa992fab5f3297d7e7313f2ba2147d3f20f146..1ad734220af26c287a95d0791c9f624f10e80545 100644 (file)
--- a/tests/topotests/bgp_features/r1/bgp_summary.json
+++ b/tests/topotests/bgp_features/r1/bgp_summary.json
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"192.168.0.1",
   "as":65000,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":2,
   "peers":{

diff --git a/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json b/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json
index 95de3e3096968be03378567ab5a66f952e877892..b7892639a23d6932b088a18589d58589955da057 100644 (file)
--- a/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json
+++ b/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"192.168.0.2",
   "as":65000,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":2,
   "peers":{

diff --git a/tests/topotests/bgp_features/r2/bgp_summary.json b/tests/topotests/bgp_features/r2/bgp_summary.json
index f29204116c3a28be15023d01fbca6b4b30d65ee3..30e0ef47a83262699db6b9e2bde3f1529a2e7195 100644 (file)
--- a/tests/topotests/bgp_features/r2/bgp_summary.json
+++ b/tests/topotests/bgp_features/r2/bgp_summary.json
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"192.168.0.2",
   "as":65000,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":2,
   "peers":{

diff --git a/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json b/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json
index c22cbdadcdb95d7c80e5281b4b6b29336b47c1bf..ede4dd67b9b1b5e2c014a5b7ede050576d0d91ad 100644 (file)
--- a/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json
+++ b/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"192.168.100.1",
   "as":65100,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":1,
   "peers":{

diff --git a/tests/topotests/bgp_features/r4/bgp_summary.json b/tests/topotests/bgp_features/r4/bgp_summary.json
index d147602c74fcdff37c758eaff0cf50f39770f3d9..c0dfe78c6df723f83d9a3805b33b27041e482bca 100644 (file)
--- a/tests/topotests/bgp_features/r4/bgp_summary.json
+++ b/tests/topotests/bgp_features/r4/bgp_summary.json
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"192.168.100.1",
   "as":65100,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":1,
   "peers":{

diff --git a/tests/topotests/bgp_features/r5/bgp_summary.json b/tests/topotests/bgp_features/r5/bgp_summary.json
index f303aa6c72d52bdfa34210b3f72b5f0d5a3fc76b..b854af59a68174d0219c14244ea838dbcf48a245 100644 (file)
--- a/tests/topotests/bgp_features/r5/bgp_summary.json
+++ b/tests/topotests/bgp_features/r5/bgp_summary.json
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"192.168.200.1",
   "as":65200,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":1,
   "peers":{

diff --git a/tests/topotests/bgp_flowspec/r1/summary.txt b/tests/topotests/bgp_flowspec/r1/summary.txt
index d5dfe0b6c243be134d99d7cbcc921f09a023f6ab..82426f31623444abe52e14c1852844a24593b4dc 100644 (file)
--- a/tests/topotests/bgp_flowspec/r1/summary.txt
+++ b/tests/topotests/bgp_flowspec/r1/summary.txt
@@ -2,7 +2,6 @@
 "ipv4Unicast":{
   "routerId":"10.0.1.1",
   "as":100,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":1,
   "peers":{
@@ -19,7 +18,6 @@
 "ipv4Flowspec":{
   "routerId":"10.0.1.1",
   "as":100,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":1,
   "peers":{
@@ -36,7 +34,6 @@
 "ipv6Flowspec":{
   "routerId":"10.0.1.1",
   "as":100,
-  "vrfId":0,
   "vrfName":"default",
   "peerCount":1,
   "peers":{

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 b60350fa4d7f77d91f7658a3f02bffacdb91e399..1c7500b7beb6ed13629c389653e6ce6230d2bef6 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
@@ -3,7 +3,7 @@
         {
             "prefix": "10.254.254.2/32",
             "protocol": "bgp",
-            "vrfId":3,
+            "vrfName": "r1-cust1",
             "selected": true,
             "destSelected": true,
             "distance": 20,
@@ -24,7 +24,7 @@
         {
             "prefix": "10.254.254.1/32",
             "protocol": "connected",
-            "vrfId":3,
+            "vrfName": "r1-cust1",
             "selected": true,
             "destSelected": true,
             "distance": 0,

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 7e9193f8c18bc0861cad2136685710019863ee1b..0e1de87c3488cd04259ad748ba29ffa14e3311f3 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
@@ -3,7 +3,7 @@
     {
       "prefix": "2001:db8:1::/64",
       "protocol": "bgp",
-      "vrfId":3,
+      "vrfName": "r1-cust1",
       "distance": 20,
       "metric": 0,
       "nexthops": [
@@ -17,7 +17,7 @@
     {
       "prefix": "2001:db8:1::/64",
       "protocol": "connected",
-      "vrfId":3,
+      "vrfName": "r1-cust1",
       "selected": true,
       "destSelected": true,
       "distance": 0,

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 ccbea2aecc8719b11edb59d258bd26faf10f598b..4d7b289aeba85da7a01c5639d9b88bf6a2d43b7e 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
@@ -3,7 +3,7 @@
     {
       "prefix": "10.254.254.2/32",
       "protocol": "connected",
-      "vrfId":3,
+      "vrfName": "r2-cust1",
       "selected": true,
       "destSelected": true,
       "distance": 0,
@@ -24,7 +24,7 @@
     {
       "prefix": "10.254.254.1/32",
       "protocol": "bgp",
-      "vrfId":3,
+      "vrfName": "r2-cust1",
       "selected": true,
       "destSelected": true,
       "distance": 20,

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 b678c1e719cf309186a3888899bbccda074a18c5..805b57d36ff6c3395fc835f758534205b6915ebf 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
@@ -3,7 +3,7 @@
     {
       "prefix": "2001:db8:1::/64",
       "protocol": "connected",
-      "vrfId":3,
+      "vrfName": "r2-cust1",
       "selected": true,
       "destSelected": true,
       "distance": 0,

diff --git a/tests/topotests/evpn-pim-1/spine/bgp.summ.json b/tests/topotests/evpn-pim-1/spine/bgp.summ.json
index 53370507e88fbcf44c57c551cb0f2ecab0dea2bb..5ff4b096fd471fcbc6ac596f00de3a5aadaa077f 100644 (file)
--- a/tests/topotests/evpn-pim-1/spine/bgp.summ.json
+++ b/tests/topotests/evpn-pim-1/spine/bgp.summ.json
@@ -1,7 +1,6 @@
 {
   "routerId":"192.168.100.1",
   "as":65001,
-  "vrfId":0,
   "vrfName":"default",
   "tableVersion":7,
   "peerCount":2,

diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route.json b/tests/topotests/isis-topo1-vrf/r1/r1_route.json
index 2bac6b9ef600445b95c5467542a807682e065f84..77d2ad9c6302aff87a5aa0c32e644ce885e69e42 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route.json
+++ b/tests/topotests/isis-topo1-vrf/r1/r1_route.json
@@ -15,7 +15,6 @@
       "prefix": "10.0.10.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r1-cust1"
     }
   ], 
@@ -32,7 +31,6 @@
       ], 
       "prefix": "10.0.20.0/24", 
       "protocol": "isis", 
-      "vrfId": 3,
       "vrfName": "r1-cust1"
     }, 
     {
@@ -47,7 +45,6 @@
       "prefix": "10.0.20.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r1-cust1"
     }
   ]

diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json b/tests/topotests/isis-topo1-vrf/r1/r1_route6.json
index 6e717eaa1ff34269675dbc0b56115c4e9efbba49..888b9e2c424145f1604134b91c0e48bf8cb03417 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r1/r1_route6.json
@@ -12,7 +12,6 @@
       "prefix": "2001:db8:1:1::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r1-cust1"
     }
   ], 
@@ -31,7 +30,6 @@
       "prefix": "2001:db8:2:1::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r1-cust1"
     }
   ] 

diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route.json b/tests/topotests/isis-topo1-vrf/r2/r2_route.json
index e13a695295079416af5efe9fb5511394b8c9378d..98252c59399749158fbc981627bd6014e55060c9 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route.json
+++ b/tests/topotests/isis-topo1-vrf/r2/r2_route.json
@@ -15,7 +15,6 @@
       "prefix": "10.0.11.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r2-cust1"
     }
   ], 
@@ -32,7 +31,6 @@
       ], 
       "prefix": "10.0.21.0/24", 
       "protocol": "isis", 
-      "vrfId": 3,
       "vrfName": "r2-cust1"
     }, 
     {
@@ -47,7 +45,6 @@
       "prefix": "10.0.21.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r2-cust1"
     }
   ]

diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json b/tests/topotests/isis-topo1-vrf/r2/r2_route6.json
index 802ca0833c0edbd6e00ca3a6dcb4084c8044ead8..b01789b8d90a4e6783a7d8e3e07769cd8a224ec2 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r2/r2_route6.json
@@ -12,7 +12,6 @@
       "prefix": "2001:db8:1:2::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r2-cust1"
     }
   ], 
@@ -31,7 +30,6 @@
       "prefix": "2001:db8:2:2::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 3,
       "vrfName": "r2-cust1"
     }
   ] 

diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route.json b/tests/topotests/isis-topo1-vrf/r3/r3_route.json
index fa678632b501b67a7a852639979ddeff1b1ddefe..de158876f198c9a9ef512dab89fa932124477cb0 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route.json
+++ b/tests/topotests/isis-topo1-vrf/r3/r3_route.json
@@ -12,7 +12,6 @@
       ], 
       "prefix": "10.0.10.0/24", 
       "protocol": "isis", 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }, 
     {
@@ -27,7 +26,6 @@
       "prefix": "10.0.10.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ], 
@@ -47,7 +45,6 @@
       "prefix": "10.0.11.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ], 
@@ -64,7 +61,6 @@
       ], 
       "prefix": "10.0.20.0/24", 
       "protocol": "isis", 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }, 
     {
@@ -79,7 +75,6 @@
       "prefix": "10.0.20.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ], 
@@ -99,7 +94,6 @@
       "prefix": "10.0.21.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ]

diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route6.json b/tests/topotests/isis-topo1-vrf/r3/r3_route6.json
index b100d3440a8d4d6899434c9936868e1126273916..31a1e4620fb9075b86d0301b4e0b3adbe3d16b27 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r3/r3_route6.json
@@ -12,7 +12,6 @@
       "prefix": "2001:db8:1:1::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ], 
@@ -31,7 +30,6 @@
       "prefix": "2001:db8:1:2::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ], 
@@ -48,7 +46,6 @@
       "prefix": "2001:db8:2:1::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ], 
@@ -67,7 +64,6 @@
       "prefix": "2001:db8:2:2::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r3-cust1"
     }
   ]

diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route.json b/tests/topotests/isis-topo1-vrf/r4/r4_route.json
index ca8229dc46fd4abd29b0bb08414b3f5f15ee1e92..b3ed4f2cbe9604acf13181709f32626297f1d36c 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route.json
+++ b/tests/topotests/isis-topo1-vrf/r4/r4_route.json
@@ -14,7 +14,6 @@
       "prefix": "10.0.10.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ], 
@@ -29,7 +28,6 @@
       ], 
       "prefix": "10.0.11.0/24", 
       "protocol": "isis", 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }, 
     {
@@ -44,7 +42,6 @@
       "prefix": "10.0.11.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ], 
@@ -62,7 +59,6 @@
       "prefix": "10.0.20.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ], 
@@ -77,7 +73,6 @@
       ], 
       "prefix": "10.0.21.0/24", 
       "protocol": "isis", 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }, 
     {
@@ -92,7 +87,6 @@
       "prefix": "10.0.21.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ]

diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json b/tests/topotests/isis-topo1-vrf/r4/r4_route6.json
index 322c4d72dc15f833d0564b32dc30493a8cf24ef7..88a91749c21ccf7b5f5c3be2a4568c1f67672247 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r4/r4_route6.json
@@ -14,7 +14,6 @@
       "prefix": "2001:db8:1:1::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ], 
@@ -31,7 +30,6 @@
       "prefix": "2001:db8:1:2::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ], 
@@ -50,7 +48,6 @@
       "prefix": "2001:db8:2:1::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ], 
@@ -67,7 +64,6 @@
       "prefix": "2001:db8:2:2::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r4-cust1"
     }
   ] 

diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route.json b/tests/topotests/isis-topo1-vrf/r5/r5_route.json
index 781aa8ad7382e39ed3a0512cf475a144e498576d..5efa36bce678837a6c62b130cadbcb76b6924cc3 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route.json
+++ b/tests/topotests/isis-topo1-vrf/r5/r5_route.json
@@ -12,7 +12,6 @@
       ], 
       "prefix": "10.0.10.0/24", 
       "protocol": "isis", 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }, 
     {
@@ -27,7 +26,6 @@
       "prefix": "10.0.10.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ], 
@@ -42,7 +40,6 @@
       ], 
       "prefix": "10.0.11.0/24", 
       "protocol": "isis", 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }, 
     {
@@ -57,7 +54,6 @@
       "prefix": "10.0.11.0/24", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ], 
@@ -75,7 +71,6 @@
       "prefix": "10.0.20.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ], 
@@ -93,7 +88,6 @@
       "prefix": "10.0.21.0/24", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ]

diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json b/tests/topotests/isis-topo1-vrf/r5/r5_route6.json
index 25b73b7d43cf2a97cc1c644e91c78d9f9d308570..5e8f6364af4d838369eeb6ad3ecc79b836e58eba 100644 (file)
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json
+++ b/tests/topotests/isis-topo1-vrf/r5/r5_route6.json
@@ -14,7 +14,6 @@
       "prefix": "2001:db8:1:1::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ], 
@@ -33,7 +32,6 @@
       "prefix": "2001:db8:1:2::/64", 
       "protocol": "isis", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ], 
@@ -50,7 +48,6 @@
       "prefix": "2001:db8:2:1::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ], 
@@ -67,7 +64,6 @@
       "prefix": "2001:db8:2:2::/64", 
       "protocol": "connected", 
       "selected": true, 
-      "vrfId": 4,
       "vrfName": "r5-cust1"
     }
   ]