topotests: bgp_srv6l3vpn_to_bgp_vrf[2,3], ignore tableVersion

The expected tableVersion is wrong, when checking r1 table.

The tableVersion value increments at each route updates. The
previous commit brought an additional route update with the
'vpn_leak_postchange_all()' call.

Keep the function call, and do not check the table version
in bgp_srv6l3vpn_to_bgp_vrf[2,3] tests.

Fixes: 205b62ffae2c ("bgpd: fix hardset l3vpn label available in mpls pool")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vpnv4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vpnv4_rib.json
index 3cc2fddcfa447cf76d9069179e70ed69c4bc49cd..7a4e0d7452b240ea0f83f7fd6f0977ac520e31e0 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vpnv4_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/vpnv4_rib.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 2,
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
   "localAS": 1,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vpnv4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vpnv4_rib.json
index 95570541c80785e3aff8fc1511b39d748f1c30ae..0dcdec678f35f88b1f2db99204e0fedecd20937f 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vpnv4_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/vpnv4_rib.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 2,
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
   "localAS": 2,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib.json
index 3cc2fddcfa447cf76d9069179e70ed69c4bc49cd..7a4e0d7452b240ea0f83f7fd6f0977ac520e31e0 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 2,
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
   "localAS": 1,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_disabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_disabled.json
index eb3433301bcc661342464593bff97059a9bfeae5..205079574c082dcd78eb8ec6335939536e075715 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_disabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_disabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 4,
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
   "localAS": 1,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_reenabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_reenabled.json
index 5517fc738adebbafb5860bd8f33f0daca9454b4c..7a4e0d7452b240ea0f83f7fd6f0977ac520e31e0 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_reenabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv4_rib_sid_vpn_export_reenabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 6,
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
   "localAS": 1,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib.json
index 25b7a8616fcf6d5f02514cea9156dedf025c464c..0fdd3d6dc06081ee84920015f699d1378de1c1aa 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 2,
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
   "localAS": 1,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_disabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_disabled.json
index a1f21585d745689cf9a7752e6068b6a606393b56..e289df1d44dabedbf0da45d3e3bdc19fd78de126 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_disabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_disabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 4,
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
   "localAS": 1,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_reenabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_reenabled.json
index 7eeccd1496446f1cad0d783162de14e12592132c..0fdd3d6dc06081ee84920015f699d1378de1c1aa 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_reenabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r1/vpnv6_rib_sid_vpn_export_reenabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 6,
   "routerId": "1.1.1.1",
   "defaultLocPrf": 100,
   "localAS": 1,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib.json
index 95570541c80785e3aff8fc1511b39d748f1c30ae..0dcdec678f35f88b1f2db99204e0fedecd20937f 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 2,
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
   "localAS": 2,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_disabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_disabled.json
index d801671fdcde05c4f08e86ddbad473aea7cae616..a440ab424808d7d679a91d0fee847f86ebd75a49 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_disabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_disabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 4,
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
   "localAS": 2,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_reenabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_reenabled.json
index 25da05b0d4b9927c5f0b26d9a53dd6bf0c505bfa..0dcdec678f35f88b1f2db99204e0fedecd20937f 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_reenabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv4_rib_sid_vpn_export_reenabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 6,
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
   "localAS": 2,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib.json
index 2cd47b9ce5135a850b5e93e9d5089f8efcf76e00..03bbcc008d9008456e5356767b566161b293c980 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 2,
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
   "localAS": 2,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_disabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_disabled.json
index f390ef69b1484f3676dd8cb5a655a88ec1604ddf..5c70cf64504a41c30dfecd3266eaa62b7990371e 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_disabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_disabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 4,
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
   "localAS": 2,

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_reenabled.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_reenabled.json
index 3353d75eda5cfde2afb339cc7872935f809bbfbd..03bbcc008d9008456e5356767b566161b293c980 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_reenabled.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/r2/vpnv6_rib_sid_vpn_export_reenabled.json
@@ -1,7 +1,6 @@
 {
   "vrfId": 0,
   "vrfName": "default",
-  "tableVersion": 6,
   "routerId": "2.2.2.2",
   "defaultLocPrf": 100,
   "localAS": 2,