tests: fix l3mdev config in bgp_evpn_rt5 topotest

Signed-off-by: David Schweizer <dschweizer@opensourcerouting.org>

diff --git a/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py b/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
index 69ef7e9faeca1d5a820930fe409065491b69a866..f5e83fa666533f31d86410c9db67ac8a4ddeca4f 100755 (executable)
--- a/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
+++ b/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
@@ -42,12 +42,11 @@ sys.path.append(os.path.join(CWD, '../'))
 from lib import topotest
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
+from lib.common_config import adjust_router_l3mdev
 
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
-l3mdev_accept = 0
-krel = ''
 
 class BGPEVPNTopo(Topo):
     "Test topology builder"
@@ -70,8 +69,6 @@ class BGPEVPNTopo(Topo):
         
 def setup_module(mod):
     "Sets up the pytest environment"
-    global l3mdev_accept
-    global krel
 
     tgen = Topogen(BGPEVPNTopo, mod.__name__)
     tgen.start_topology()
@@ -83,17 +80,12 @@ def setup_module(mod):
         logger.info('BGP EVPN RT5 NETNS tests will not run (have kernel "{}", but it requires 4.18)'.format(krel))
         return pytest.skip('Skipping BGP EVPN RT5 NETNS Test. Kernel not supported')
 
-    l3mdev_accept = 1
-    logger.info('setting net.ipv4.tcp_l3mdev_accept={}'.format(l3mdev_accept))
-
     # create VRF vrf-101 on R1 and R2
     # create loop101
-    cmds_vrflite = ['sysctl -w net.ipv4.tcp_l3mdev_accept={}'.format(l3mdev_accept),
-                    'ip link add {}-vrf-101 type vrf table 101',
+    cmds_vrflite = ['ip link add {}-vrf-101 type vrf table 101',
                     'ip ru add oif {}-vrf-101 table 101',
                     'ip ru add iif {}-vrf-101 table 101',
                     'ip link set dev {}-vrf-101 up',
-                    'sysctl -w net.ipv4.tcp_l3mdev_accept={}'.format(l3mdev_accept),
                     'ip link add loop101 type dummy',
                     'ip link set dev loop101 master {}-vrf-101',
                     'ip link set dev loop101 up']
@@ -125,6 +117,7 @@ def setup_module(mod):
         logger.info('result: '+output);
 
     router = tgen.gears['r2']
+    adjust_router_l3mdev(tgen, 'r2')
     for cmd in cmds_vrflite:
         logger.info('cmd to r2: '+cmd.format('r2'));
         output = router.run(cmd.format('r2'))