4 files changed, 39 insertions, 31 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 7532ce933..cfab5726e 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.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
index a14ba1291..444c67e44 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.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/frr.conf
index c8c4faf22..e4a805998 100644
--- a/tests/topotests/bgp_evpn_rt5/r1/bgpd.conf
+++ b/tests/topotests/bgp_evpn_rt5/r1/frr.conf
@@ -1,15 +1,36 @@
+! debug zebra vxlan
+! debug zebra kernel
+! debug zebra dplane
+! debug zebra rib
 ! debug bgp neighbor-events
 ! debug bgp updates
 ! debug bgp zebra
+vrf r1-vrf-101
+ vni 101
+ exit-vrf
+!
+interface r1-eth0
+ ip address 192.168.100.21/24
+!
+interface loop101 vrf r1-vrf-101
+ ip address 192.168.102.21/32
+ ipv6 address fd00::1/128
+!
 router bgp 65000
  bgp router-id 192.168.100.21
  bgp log-neighbor-changes
  no bgp default ipv4-unicast
+ no bgp ebgp-requires-policy
  neighbor 192.168.100.41 remote-as 65000
  neighbor 192.168.100.41 capability extended-nexthop
+ neighbor 192.168.100.61 remote-as 65500
+ neighbor 192.168.100.61 capability extended-nexthop
  !
  address-family l2vpn evpn
   neighbor 192.168.100.41 activate
+  neighbor 192.168.100.41 route-map rmap_r1 in
+  neighbor 192.168.100.61 activate
+  neighbor 192.168.100.61 route-map rmap_r3 in
   advertise-all-vni
  exit-address-family
 !
@@ -24,7 +45,17 @@ 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
  !
+route-map rmap_r3 deny 1
+ match evpn vni 102
+exit
+route-map rmap_r1 permit 1
+ match evpn vni 101
+exit
+
+
diff --git a/tests/topotests/bgp_evpn_rt5/r1/zebra.conf b/tests/topotests/bgp_evpn_rt5/r1/zebra.conf
deleted file mode 100644
index c3d508c2b..000000000
--- a/tests/topotests/bgp_evpn_rt5/r1/zebra.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-log stdout
-
-hostname r1
-password zebra
-
-! debug zebra vxlan
-! debug zebra kernel
-! debug zebra dplane
-! debug zebra rib
-log stdout
-vrf r1-vrf-101
- vni 101
- exit-vrf
-!
-interface r1-eth0
- ip address 192.168.100.21/24
-!
-interface loop101 vrf r1-vrf-101
- ip address 192.168.102.21/32
- ipv6 address fd00::1/128
-!
-
-