From: wenxu <wenxu@xxxxxxxxxxxxxxx> Add vlan_filtering enabled bridge and vlan case. Add a vlan_filtering bridge device to the Router1 (nsr1) container and attach the veth0 device to the bridge. Set the IP address to the bridge device to exercise the bridge forwarding path. The veth0 add in the vlan 10 domain and the br0 also add in the vlan 10 domain with untaged. Signed-off-by: wenxu <wenxu@xxxxxxxxxxxxxxx> --- tools/testing/selftests/netfilter/nft_flowtable.sh | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/netfilter/nft_flowtable.sh b/tools/testing/selftests/netfilter/nft_flowtable.sh index d4ffebb..5882982 100755 --- a/tools/testing/selftests/netfilter/nft_flowtable.sh +++ b/tools/testing/selftests/netfilter/nft_flowtable.sh @@ -37,6 +37,7 @@ checktool "nft --version" "run test without nft tool" checktool "ip -Version" "run test without ip tool" checktool "which nc" "run test without nc (netcat)" checktool "ip netns add nsr1" "create net namespace" +checktool "bridge -Version" "run test without bridge tool" ip netns add ns1 ip netns add ns2 @@ -431,12 +432,32 @@ else ret=1 fi -# restore test topology (remove bridge and VLAN) -ip -net nsr1 link set veth0 nomaster +# Another test: +# Add vlan filtering bridge interface br0 to Router1, with NAT and VLAN. +ip -net nsr1 link set veth0.10 nomaster ip -net nsr1 link set veth0 down ip -net nsr1 link set veth0.10 down ip -net nsr1 link delete veth0.10 type vlan ip -net nsr1 link delete br0 type bridge +ip -net nsr1 link add name br0 type bridge vlan_filtering 1 +ip -net nsr1 link set up dev veth0 +ip -net nsr1 link set veth0 master br0 +ip -net nsr1 addr add 10.0.1.1/24 dev br0 +bridge -n nsr1 vlan add dev veth0 vid 10 pvid +bridge -n nsr1 vlan add dev br0 vid 10 pvid untagged self + +if test_tcp_forwarding_nat ns1 ns2; then + echo "PASS: flow offloaded for ns1/ns2 with vlan filtering bridge NAT and VLAN" +else + echo "FAIL: flow offload for ns1/ns2 with vlan filtering bridge NAT and VLAN" 1>&2 + ip netns exec nsr1 nft list ruleset + ret=1 +fi + +# restore test topology (remove bridge and VLAN) +ip -net nsr1 link set veth0 nomaster +ip -net nsr1 link set veth0 down +ip -net nsr1 link delete br0 type bridge ip -net ns1 addr flush dev eth0.10 ip -net ns1 link set eth0.10 down ip -net ns1 link set eth0 down -- 1.8.3.1
