topotests: fix bgp_evpn_route_map_match test r2 config

In this topotests, R1 is configured with an l3vni, while R2 is
configured with an l2vni. Update R2 config to match R1 config.

Signed-off-by: Loïc SANG <loic.sang@6wind.com>

tests/topotests/bgp_evpn_route_map_match/r1/frr.conf

@@ -24,19 +24,16 @@ router bgp 65001
  !
  address-family l2vpn evpn
   neighbor 192.168.1.2 activate
-  neighbor 192.168.1.2 route-map r2 out
+  neighbor 192.168.1.2 route-map rt5 out
   advertise-all-vni
   advertise ipv4 unicast
  exit-address-family
 !
-route-map r2 deny 10
- match evpn route-type macip
-!
-route-map r2 deny 20
+route-map rt5 deny 20
  match ip address prefix-list pl
  match evpn route-type prefix
 !
-route-map r2 permit 30
+route-map rt5 permit 30
 !
 ip prefix-list pl seq 5 permit 192.168.1.0/24
 ip prefix-list pl seq 10 permit 10.10.10.1/32

tests/topotests/bgp_evpn_route_map_match/r2/frr.conf

@@ -7,6 +7,7 @@ int lo
 int r2-eth0
  ip address 192.168.1.2/24
 !
+vni 10
 router bgp 65002
  no bgp ebgp-requires-policy
  neighbor 192.168.1.1 remote-as external

tests/topotests/bgp_evpn_route_map_match/test_bgp_evpn_route_map_match.py

@@ -23,6 +23,7 @@ sys.path.append(os.path.join(CWD, "../"))
 # pylint: disable=C0413
 from lib import topotest
 from lib.topogen import Topogen, get_topogen
+from lib.topolog import logger
 
 
 def setup_module(mod):
@@ -63,7 +64,7 @@ def teardown_module(mod):
     tgen.stop_topology()
 
 
-def test_bgp_evpn_route_map_match_route_type():
+def test_bgp_evpn_route_map_match_route_type5():
     tgen = get_topogen()
 
     if tgen.routers_have_failure():
@@ -84,16 +85,12 @@ def test_bgp_evpn_route_map_match_route_type():
                         "valid": True,
                     }
                 },
-                "10.10.10.2:2": {
-                    "[3]:[0]:[32]:[10.10.10.2]": {
-                        "valid": True,
-                    }
-                },
             },
-            "totalPrefixCounter": 2,
+            "totalPrefixCounter": 1,
         }
         return topotest.json_cmp(output, expected)
 
+    logger.info("Check route type-5 filtering")
     test_func = functools.partial(
         _bgp_converge,
     )