3 files changed, 20 insertions, 23 deletions
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 597bca5fd..3a55a7a38 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.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/frr.conf
index 4f1d8e4a3..0bb4b7cab 100644
--- a/tests/topotests/bgp_evpn_rt5/r2/bgpd.conf
+++ b/tests/topotests/bgp_evpn_rt5/r2/frr.conf
@@ -1,6 +1,19 @@
+! debug zebra vxlan
 ! debug bgp neighbor-events
 ! debug bgp updates
 ! debug bgp zebra
+
+vrf r2-vrf-101
+ vni 101
+ exit-vrf
+!
+interface loop101 vrf r2-vrf-101
+ ip address 192.168.101.41/32
+ ipv6 address fd00::2/128
+!
+interface r2-eth0
+ ip address 192.168.100.41/24
+!
 router bgp 65000
  bgp router-id 192.168.100.41
  bgp log-neighbor-changes
@@ -27,6 +40,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
@@ -47,3 +62,4 @@ exit
 route-map rmap6 deny 2
  match ipv6 address acl6_2
 exit
+
diff --git a/tests/topotests/bgp_evpn_rt5/r2/zebra.conf b/tests/topotests/bgp_evpn_rt5/r2/zebra.conf
deleted file mode 100644
index 7db40cb59..000000000
--- a/tests/topotests/bgp_evpn_rt5/r2/zebra.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-log stdout
-
-hostname r2
-password zebra
-
-! debug zebra vxlan
-
-vrf r2-vrf-101
- vni 101
- exit-vrf
-!
-interface loop101 vrf r2-vrf-101
- ip address 192.168.101.41/32
- ipv6 address fd00::2/128
-!
-interface r2-eth0
- ip address 192.168.100.41/24
-!
-