topotests: remove useless zebra aspath control in bgp srv6 test

The aspath value has no need to be controlled. Unset the bgp capability
to send aspath information to zebra.

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

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf
index 716369d48a02575bb6d6b4a4137619bee40c2008..e46ab948e66a028b79eaa2d0a51fbdda6b5fb54c 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/frr.conf
@@ -41,6 +41,7 @@ ipv6 route 2001:db8:2:3::/64 2001::2
 !
 line vty
 !
+no bgp send-extra-data-zebra
 router bgp 1
  bgp router-id 1.1.1.1
  no bgp ebgp-requires-policy

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json
index 141c1cb957a0c6d00727777c9f152f0e4769abb4..aee6905d95291bc3296ae129b025590bbef13eac 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf10_rib.json
@@ -53,8 +53,7 @@
             "segs": "2001:db8:2:2:100::"
           }
         }
-      ],
-      "asPath": "2"
+      ]
     }
   ],
   "2001:3::/64": [

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json
index e20998061ff4cf182354e12119355d485c5af7e0..0f3c970afe068aa2d3c33cd2b85130cab2565225 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/vrf20_rib.json
@@ -27,8 +27,7 @@
             "segs": "2001:db8:2:2:200::"
           }
         }
-      ],
-      "asPath": "2"
+      ]
     }
   ],
   "2001:5::/64": [
@@ -85,8 +84,7 @@
             "segs": "2001:db8:2:2:200::"
           }
         }
-      ],
-      "asPath": "2"
+      ]
     }
   ]
 }

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf
index 38f6bdaeab144d885d40f45298e3634dd9e25b7d..f5729dd8eee6377902643187fb7d8f6cdb9973bd 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/frr.conf
@@ -42,6 +42,7 @@ ipv6 route 2001:db8:1:3::/64 2001::1
 !
 line vty
 !
+no bgp send-extra-data-zebra
 router bgp 2
  bgp router-id 2.2.2.2
  no bgp ebgp-requires-policy

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json
index 7f8a930d002e140f1d2a2f1d8e1583317b36a792..be1c58d3d12b4fe8222b66d8d8478ddf315bac9d 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf10_rib.json
@@ -27,8 +27,7 @@
             "segs": "2001:db8:1:1:100::"
           }
         }
-      ],
-      "asPath": "1"
+      ]
     }
   ],
   "2001:2::/64": [
@@ -85,8 +84,7 @@
             "segs": "2001:db8:1:1:100::"
           }
         }
-      ],
-      "asPath": "1"
+      ]
     }
   ]
 }

diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json
index 104bdc30d2b710ef13937582c7d006bb780b90f5..90e0413db26111ec7666a6c46c2e4c980f1aac76 100644 (file)
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/vrf20_rib.json
@@ -53,8 +53,7 @@
             "segs": "2001:db8:1:1:200::"
           }
         }
-      ],
-      "asPath": "1"
+      ]
     }
   ],
   "2001:6::/64": [