topotests: fix invalidate exported vpn prefixes on srv6l3vpn vrf3 setup

When srv6 is disabled due to misconfiguration, exported VPN prefixes
are invalidated, except for the ones that have their nexthop modified
with the 'nexthop vpn export' command. The previous commit also
invalidates those vpn prefixes.

Apply the changes to the test by not considering some prefixes as
selected. Enforce the expected route count.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json
index 5645540fbb2ff5dd0486d4254e8b3e7f12457752..f1ec26c96728a3b7b29d57cb62f1041177d5603c 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_locator_deleted.json
@@ -9,8 +9,6 @@
       "1:10": {
         "192.168.1.0/24": [
           {
-            "valid": true,
-            "bestpath": true,
             "selectionReason": "First path received",
             "pathFrom": "external",
             "prefix": "192.168.1.0",
@@ -34,8 +32,6 @@
         ],
         "192.168.3.0/24": [
           {
-            "valid": true,
-            "bestpath": true,
             "selectionReason": "First path received",
             "pathFrom": "external",
             "prefix": "192.168.3.0",
@@ -61,8 +57,6 @@
       "1:20": {
         "192.168.5.0/24": [
           {
-            "valid": true,
-            "bestpath": true,
             "selectionReason": "First path received",
             "pathFrom": "external",
             "prefix": "192.168.5.0",

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_locator_deleted.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_locator_deleted.json
index e3edee172b036fc486230370fb3ed2dd501dd9dd..e2b717085321e093aebe9997cae6ff05c5dd6771 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_locator_deleted.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_locator_deleted.json
@@ -86,5 +86,7 @@
         ]
       }
     }
-  }
+  },
+    "totalRoutes": 3,
+    "totalPaths": 3
 }

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_locator_deleted.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_locator_deleted.json
index 25cdf031c3de50a5e6f537732f3c80b852292b19..41e8a82e400ac3eba71ebe94732386a98ede1cff 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_locator_deleted.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_locator_deleted.json
@@ -89,5 +89,7 @@
         ]
       }
     }
-  }
+  },
+    "totalRoutes": 3,
+    "totalPaths": 3
 }