From e0045dcaa1e668aed90964e214988106e6c10cca Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Wed, 23 Apr 2025 13:15:01 +0200 Subject: [PATCH] tests: bgp_evpn_rt5 re-address rd and rt Re-address Route-Distinguisher and route-targets for clarity. Signed-off-by: Louis Scalbert --- .../topotests/bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes.json | 8 ++++---- .../bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes_all.json | 8 ++++---- .../bgp_evpn_rt5/r1/bgp_vrf_ipv4_routes_detail.json | 2 +- .../bgp_evpn_rt5/r1/bgp_vrf_ipv6_routes_detail.json | 2 +- tests/topotests/bgp_evpn_rt5/r1/frr.conf | 4 ++-- .../topotests/bgp_evpn_rt5/r2/bgp_l2vpn_evpn_routes.json | 8 ++++---- .../bgp_evpn_rt5/r2/bgp_vrf_ipv4_routes_detail.json | 2 +- .../bgp_evpn_rt5/r2/bgp_vrf_ipv6_routes_detail.json | 2 +- tests/topotests/bgp_evpn_rt5/r2/frr.conf | 4 ++-- 9 files changed, 20 insertions(+), 20 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 index 86a63ee6b0..e7d8da02d8 100644 --- 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.0.1", "defaultLocPrf":100, "localAS":65000, - "65000:201":{ - "rd":"65000:201", + "65000:2":{ + "rd":"65000:2", "[5]:[0]:[32]:[10.0.101.2]":{ "prefix":"[5]:[0]:[32]:[10.0.101.2]", "prefixLen":352, @@ -65,8 +65,8 @@ ] } }, - "65000:101":{ - "rd":"65000:101", + "65000:1":{ + "rd":"65000:1", "[5]:[0]:[32]:[10.0.101.1]":{ "prefix":"[5]:[0]:[32]:[10.0.101.1]", "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 index 2bf47dfd1f..af2f23bc53 100644 --- 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.0.1", "defaultLocPrf":100, "localAS":65000, - "65000:201":{ - "rd":"65000:201", + "65000:2":{ + "rd":"65000:2", "[5]:[0]:[32]:[10.0.101.2]":{ "prefix":"[5]:[0]:[32]:[10.0.101.2]", "prefixLen":352, @@ -125,8 +125,8 @@ ] } }, - "65000:101":{ - "rd":"65000:101", + "65000:1":{ + "rd":"65000:1", "[5]:[0]:[32]:[10.0.101.1]":{ "prefix":"[5]:[0]:[32]:[10.0.101.1]", "prefixLen":352, diff --git a/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv4_routes_detail.json b/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv4_routes_detail.json index 3260467620..67961ad9b0 100644 --- a/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv4_routes_detail.json +++ b/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv4_routes_detail.json @@ -5,7 +5,7 @@ "routes": { "10.0.101.2/32": [ { - "importedFrom": "65000:201", + "importedFrom": "65000:2", "vni": "101", "valid": true, "extendedCommunity": null, diff --git a/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv6_routes_detail.json b/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv6_routes_detail.json index a9bf422f2f..cf8c08ca9c 100644 --- a/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv6_routes_detail.json +++ b/tests/topotests/bgp_evpn_rt5/r1/bgp_vrf_ipv6_routes_detail.json @@ -5,7 +5,7 @@ "routes": { "fd01::2/128": [ { - "importedFrom": "65000:201", + "importedFrom": "65000:2", "vni": "101", "valid": true, "extendedCommunity": null, diff --git a/tests/topotests/bgp_evpn_rt5/r1/frr.conf b/tests/topotests/bgp_evpn_rt5/r1/frr.conf index d2db5cc626..1b011e8c3c 100644 --- a/tests/topotests/bgp_evpn_rt5/r1/frr.conf +++ b/tests/topotests/bgp_evpn_rt5/r1/frr.conf @@ -42,8 +42,8 @@ router bgp 65000 vrf r1-vrf-101 network fd01::1/128 exit-address-family address-family l2vpn evpn - rd 65000:101 - route-target both 65:101 + rd 65000:1 + route-target both 65000: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 index 5eeddf39e9..1f822e6f6d 100644 --- 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.0.2", "defaultLocPrf":100, "localAS":65000, - "65000:201":{ - "rd":"65000:201", + "65000:2":{ + "rd":"65000:2", "[5]:[0]:[32]:[10.0.101.2]":{ "prefix":"[5]:[0]:[32]:[10.0.101.2]", "prefixLen":352, @@ -63,8 +63,8 @@ ] } }, - "65000:101":{ - "rd":"65000:101", + "65000:1":{ + "rd":"65000:1", "[5]:[0]:[32]:[10.0.101.1]":{ "prefix":"[5]:[0]:[32]:[10.0.101.1]", "prefixLen":352, diff --git a/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv4_routes_detail.json b/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv4_routes_detail.json index d2a925aa5a..402a5bdd9b 100644 --- a/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv4_routes_detail.json +++ b/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv4_routes_detail.json @@ -5,7 +5,7 @@ "routes": { "10.0.101.1/32": [ { - "importedFrom": "65000:101", + "importedFrom": "65000:1", "vni": "101", "valid": true, "extendedCommunity": null, diff --git a/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv6_routes_detail.json b/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv6_routes_detail.json index 796b42e065..d702f0d108 100644 --- a/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv6_routes_detail.json +++ b/tests/topotests/bgp_evpn_rt5/r2/bgp_vrf_ipv6_routes_detail.json @@ -5,7 +5,7 @@ "routes": { "fd01::1/128": [ { - "importedFrom": "65000:101", + "importedFrom": "65000:1", "vni": "101", "valid": true, "extendedCommunity": null, diff --git a/tests/topotests/bgp_evpn_rt5/r2/frr.conf b/tests/topotests/bgp_evpn_rt5/r2/frr.conf index 7da281fecd..27d3730dea 100644 --- a/tests/topotests/bgp_evpn_rt5/r2/frr.conf +++ b/tests/topotests/bgp_evpn_rt5/r2/frr.conf @@ -40,8 +40,8 @@ router bgp 65000 vrf r2-vrf-101 network fd01::12/128 exit-address-family address-family l2vpn evpn - rd 65000:201 - route-target both 65:101 + rd 65000:2 + route-target both 65000:101 advertise ipv4 unicast route-map rmap4 advertise ipv6 unicast route-map rmap6 exit-address-family -- 2.39.5