proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: fix l3mdev config in bgp_l3vpn_to_bgp_vrf topotest

Browse Source 
Signed-off-by: David Schweizer <dschweizer@opensourcerouting.org>
This commit is contained in:
David Schweizer 2021-04-05 09:25:52 +02:00
parent a94d054dfd
commit f2d729056e
No known key found for this signature in database
GPG Key ID: A07D97BEEE79EF7F
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
View File

@ -84,6 +84,7 @@ from lib import topotest
from lib.topogen import Topogen, TopoRouter, get_topogen from lib.topogen import Topogen, TopoRouter, get_topogen
from lib.topolog import logger from lib.topolog import logger
from lib.ltemplate import ltemplateRtrCmd from lib.ltemplate import ltemplateRtrCmd
from lib.common_config import adjust_router_l3mdev
# Required to instantiate the topology builder class. # Required to instantiate the topology builder class.
from mininet.topo import Topo from mininet.topo import Topo
@ -145,26 +146,12 @@ class ThisTestTopo(Topo):
switch[1].add_link(tgen.gears["r3"], nodeif="r3-eth1") switch[1].add_link(tgen.gears["r3"], nodeif="r3-eth1")
l3mdev_accept = 0
def ltemplatePreRouterStartHook(): def ltemplatePreRouterStartHook():
global l3mdev_accept
cc = ltemplateRtrCmd() cc = ltemplateRtrCmd()
krel = platform.release() krel = platform.release()
tgen = get_topogen() tgen = get_topogen()
logger.info("pre router-start hook, kernel=" + krel) logger.info("pre router-start hook, kernel=" + krel)
if (
topotest.version_cmp(krel, "4.15") >= 0
and topotest.version_cmp(krel, "4.18") <= 0
):
l3mdev_accept = 1
if topotest.version_cmp(krel, "5.0") >= 0:
l3mdev_accept = 1
logger.info("setting net.ipv4.tcp_l3mdev_accept={}".format(l3mdev_accept))
# check for mpls # check for mpls
if tgen.hasmpls != True: if tgen.hasmpls != True:
logger.info("MPLS not available, skipping setup") logger.info("MPLS not available, skipping setup")
@ -187,10 +174,11 @@ def ltemplatePreRouterStartHook():
"ip ru add oif {0}-cust1 table 10", "ip ru add oif {0}-cust1 table 10",
"ip ru add iif {0}-cust1 table 10", "ip ru add iif {0}-cust1 table 10",
"ip link set dev {0}-cust1 up", "ip link set dev {0}-cust1 up",
"sysctl -w net.ipv4.tcp_l3mdev_accept={}".format(l3mdev_accept),
] ]
for rtr in rtrs: for rtr in rtrs:
router = tgen.gears[rtr] # adjust handling of VRF traffic
adjust_router_l3mdev(tgen, rtr)
for cmd in cmds: for cmd in cmds:
cc.doCmd(tgen, rtr, cmd.format(rtr)) cc.doCmd(tgen, rtr, cmd.format(rtr))
cc.doCmd(tgen, rtr, "ip link set dev {0}-eth4 master {0}-cust1".format(rtr)) cc.doCmd(tgen, rtr, "ip link set dev {0}-eth4 master {0}-cust1".format(rtr))
@ -229,9 +217,11 @@ def ltemplatePreRouterStartHook():
"ip ru add oif {0}-cust2 table 20", "ip ru add oif {0}-cust2 table 20",
"ip ru add iif {0}-cust2 table 20", "ip ru add iif {0}-cust2 table 20",
"ip link set dev {0}-cust2 up", "ip link set dev {0}-cust2 up",
"sysctl -w net.ipv4.tcp_l3mdev_accept={}".format(l3mdev_accept),
] ]
for rtr in rtrs: for rtr in rtrs:
# adjust handling of VRF traffic
adjust_router_l3mdev(tgen, rtr)
for cmd in cmds: for cmd in cmds:
cc.doCmd(tgen, rtr, cmd.format(rtr)) cc.doCmd(tgen, rtr, cmd.format(rtr))
cc.doCmd(tgen, rtr, "ip link set dev {0}-eth0 master {0}-cust2".format(rtr)) cc.doCmd(tgen, rtr, "ip link set dev {0}-eth0 master {0}-cust2".format(rtr))

3
tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_vrf.py
View File

@ -1,6 +1,7 @@
from lib.lutil import luCommand from lib.lutil import luCommand
from customize import l3mdev_accept from lib.common_config import kernel_requires_l3mdev_adjustment
l3mdev_accept = kernel_requires_l3mdev_adjustment()
l3mdev_rtrs = ["r1", "r3", "r4", "ce4"] l3mdev_rtrs = ["r1", "r3", "r4", "ce4"]
for rtr in l3mdev_rtrs: for rtr in l3mdev_rtrs:
luCommand(rtr, "sysctl net.ipv4.tcp_l3mdev_accept", " = \d*", "none", "") luCommand(rtr, "sysctl net.ipv4.tcp_l3mdev_accept", " = \d*", "none", "")