topotests: bgp_evpn_rt5, configure route_distinguisher

When not configuring a route distinguisher, neither route-target, the derived rd settings differ if config load applies with frr.conf or not. For instance, the forged rd with frr.conf: > # show bgp l2vpn evpn json > "192.168.101.41:3":{ > "rd":"192.168.101.41:3", and without: > "192.168.101.41:2":{ > "rd":"192.168.101.41:2", The defined rts also are impacted. Temporay fix this by using an hardset configuration for all route distinguisher and route target of the setups. Signed-off-by: Philippe Guibert <[email protected]>
FRRouting · Dec 30, 2024 · 55fabf2 · 55fabf2
1 parent b1f1d3e
commit 55fabf2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/tests/topotests/bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes.json b/tests/topotests/bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes.json
@@ -2,8 +2,8 @@
     "bgpLocalRouterId":"192.168.100.21",
     "defaultLocPrf":100,
     "localAS":65000,
-    "192.168.101.41:2":{
-        "rd":"192.168.101.41:2",
+    "65000:201":{
+        "rd":"65000:201",
         "[5]:[0]:[32]:[192.168.101.41]":{
             "prefix":"[5]:[0]:[32]:[192.168.101.41]",
             "prefixLen":352,
@@ -65,8 +65,8 @@
             ]
         }
     },
-    "192.168.102.21:2":{
-        "rd":"192.168.102.21:2",
+    "65000:101":{
+        "rd":"65000:101",
         "[5]:[0]:[32]:[192.168.102.21]":{
             "prefix":"[5]:[0]:[32]:[192.168.102.21]",
             "prefixLen":352,

diff --git a/tests/topotests/bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes_all.json b/tests/topotests/bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes_all.json
@@ -2,8 +2,8 @@
     "bgpLocalRouterId":"192.168.100.21",
     "defaultLocPrf":100,
     "localAS":65000,
-    "192.168.101.41:2":{
-        "rd":"192.168.101.41:2",
+    "65000:201":{
+        "rd":"65000:201",
         "[5]:[0]:[32]:[192.168.101.41]":{
             "prefix":"[5]:[0]:[32]:[192.168.101.41]",
             "prefixLen":352,
@@ -125,8 +125,8 @@
             ]
         }
     },
-    "192.168.102.21:2":{
-        "rd":"192.168.102.21:2",
+    "65000:101":{
+        "rd":"65000:101",
         "[5]:[0]:[32]:[192.168.102.21]":{
             "prefix":"[5]:[0]:[32]:[192.168.102.21]",
             "prefixLen":352,

diff --git a/tests/topotests/bgp_evpn_rt5/r1/bgpd.conf b/tests/topotests/bgp_evpn_rt5/r1/bgpd.conf
@@ -30,6 +30,8 @@ router bgp 65000 vrf r1-vrf-101
   network fd00::1/128
  exit-address-family
  address-family l2vpn evpn
+  rd 65000:101
+  route-target both 65:101
   advertise ipv4 unicast
   advertise ipv6 unicast
  exit-address-family

diff --git a/tests/topotests/bgp_evpn_rt5/r2/bgp_l2vpn_evpn_routes.json b/tests/topotests/bgp_evpn_rt5/r2/bgp_l2vpn_evpn_routes.json
@@ -2,8 +2,8 @@
     "bgpLocalRouterId":"192.168.100.41",
     "defaultLocPrf":100,
     "localAS":65000,
-    "192.168.101.41:2":{
-        "rd":"192.168.101.41:2",
+    "65000:201":{
+        "rd":"65000:201",
         "[5]:[0]:[32]:[192.168.101.41]":{
             "prefix":"[5]:[0]:[32]:[192.168.101.41]",
             "prefixLen":352,
@@ -63,8 +63,8 @@
             ]
         }
     },
-    "192.168.102.21:2":{
-        "rd":"192.168.102.21:2",
+    "65000:101":{
+        "rd":"65000:101",
         "[5]:[0]:[32]:[192.168.102.21]":{
             "prefix":"[5]:[0]:[32]:[192.168.102.21]",
             "prefixLen":352,

diff --git a/tests/topotests/bgp_evpn_rt5/r2/bgpd.conf b/tests/topotests/bgp_evpn_rt5/r2/bgpd.conf
@@ -27,6 +27,8 @@ router bgp 65000 vrf r2-vrf-101
   network fd00::3/128
  exit-address-family
  address-family l2vpn evpn
+  rd 65000:201
+  route-target both 65:101
   advertise ipv4 unicast route-map rmap4
   advertise ipv6 unicast route-map rmap6
  exit-address-family

diff --git a/tests/topotests/bgp_evpn_rt5/r3/bgpd.conf b/tests/topotests/bgp_evpn_rt5/r3/bgpd.conf
@@ -25,6 +25,8 @@ router bgp 65000 vrf r3-vrf-102
   network fd00:102::1/128
  exit-address-family
  address-family l2vpn evpn
+  rd 65000:302
+  route-target both 65:101
   advertise ipv4 unicast
   advertise ipv6 unicast
  exit-address-family