proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 16:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3753 from LabNConsulting/working/master/topotest-l3mdev=1

Browse Source 
topotest: bgp_l3vpn_to_bgp_vrf: fix setting of TCP l3mdev
This commit is contained in:
Donald Sharp 2019-02-13 09:32:43 -05:00 committed by GitHub
commit 01490ba25d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,10 @@ class ThisTestTopo(Topo):
switch[1].add_link(tgen.gears['r2'], nodeif='r2-eth2') switch[1].add_link(tgen.gears['r2'], nodeif='r2-eth2')
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()
@ -172,7 +175,7 @@ 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.udp_l3mdev_accept={}'.format(l3mdev_accept)] 'sysctl -w net.ipv4.tcp_l3mdev_accept={}'.format(l3mdev_accept)]
for rtr in rtrs: for rtr in rtrs:
router = tgen.gears[rtr] router = tgen.gears[rtr]
for cmd in cmds: for cmd in cmds:
@ -202,7 +205,7 @@ 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.udp_l3mdev_accept={}'.format(l3mdev_accept)] 'sysctl -w net.ipv4.tcp_l3mdev_accept={}'.format(l3mdev_accept)]
for rtr in rtrs: for rtr in rtrs:
for cmd in cmds: for cmd in cmds:
cc.doCmd(tgen, rtr, cmd.format(rtr)) cc.doCmd(tgen, rtr, cmd.format(rtr))

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

@ -1,11 +1,12 @@
from lutil import luCommand from lutil import luCommand
from customize import l3mdev_accept
rtrs = ['r1', 'r3', 'r4', 'ce1', 'ce2', 'ce3', 'ce4'] l3mdev_rtrs = ['r1', 'r3', 'r4', 'ce4']
for rtr in 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','')
found = luLast() found = luLast()
luCommand(rtr,'ss -aep',':bgp','pass','IPv4:bgp, l3mdev%s' % found.group(0)) luCommand(rtr,'ss -naep',':179','pass','IPv4:bgp, l3mdev{}'.format(found.group(0)))
luCommand(rtr,'ss -aep',':.:bgp','pass','IPv6:bgp') luCommand(rtr,'ss -naep',':.*:179','pass','IPv6:bgp')
luCommand(rtr,'sysctl net.ipv4.tcp_l3mdev_accept',' = {}'.format(l3mdev_accept),'pass','l3mdev matches expected (real/expected{}/{})'.format(found.group(0),l3mdev_accept))
rtrs = ['r1', 'r3', 'r4'] rtrs = ['r1', 'r3', 'r4']
for rtr in rtrs: for rtr in rtrs: