From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Fri, 21 Mar 2025 14:49:47 +0000 (+0100)
Subject: topotests: fix invalidate exported vpn prefixes on srv6l3vpn vrf3 setup
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=03b57b45c668d5858d86eac0cdbfee2806fa08b5;p=mirror%2Ffrr.git

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 5645540fbb..f1ec26c967 100644
--- 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 e3edee172b..e2b7170853 100644
--- 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 25cdf031c3..41e8a82e40 100644
--- 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
 }