Skip to contentSkip to conversation

selftests: Fix failing VXLAN VNI filtering test

PATCH Applied Ido Schimmel 3 participants 3 messages Feb 7, 2023 – Feb 9, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests: Fix failing VXLAN VNI filtering test

iproute2 does not recognize the "group6" and "remote6" keywords. Fix by using "group" and "remote" instead.

Before:

 # ./test_vxlan_vnifiltering.sh
 [...]
 Tests passed:  25
 Tests failed:   2

After:

 # ./test_vxlan_vnifiltering.sh
 [...]
 Tests passed:  27
 Tests failed:   0
Fixes 3edf5f66c12a ("selftests: add new tests for vxlan vnifiltering")
---
 .../selftests/net/test_vxlan_vnifiltering.sh   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)
tools/testing/selftests/net/test_vxlan_vnifiltering.sh +5 -13
index 704997ffc244..8c3ac0a72545 100755
@@ -293,19 +293,11 @@ setup-vm() {
 	elif [[ -n $vtype && $vtype == "vnifilterg" ]]; then
 	   # Add per vni group config with 'bridge vni' api
 	   if [ -n "$group" ]; then
-	      if [ "$family" == "v4" ]; then
-		 if [ $mcast -eq 1 ]; then
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid group $group
-		 else
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid remote $group
-		 fi
-	      else
-		 if [ $mcast -eq 1 ]; then
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid group6 $group
-		 else
-		    bridge -netns hv-$hvid vni add dev $vxlandev vni $tid remote6 $group
-		 fi
-	      fi
+		if [ $mcast -eq 1 ]; then
+			bridge -netns hv-$hvid vni add dev $vxlandev vni $tid group $group
+		else
+			bridge -netns hv-$hvid vni add dev $vxlandev vni $tid remote $group
+		fi
 	   fi
 	fi
 	done
Signature · 1 line
2.37.3
Reviewed-by Alexander Duyck on v1 1/1
#1 lore raw
Quoted 12 lines · Ido Schimmel

iproute2 does not recognize the "group6" and "remote6" keywords. Fix by using "group" and "remote" instead.

Before:

 # ./test_vxlan_vnifiltering.sh
 [...]
 Tests passed:  25
 Tests failed:   2

After:

Quoted 7 lines
 # ./test_vxlan_vnifiltering.sh
 [...]
 Tests passed:  27
 Tests failed:   0
Fixes 3edf5f66c12a ("selftests: add new tests for vxlan vnifiltering")

Looks good to me. From what I can tell the group6/remote6 stuff does apply to the ip link VXLAN stuff but doesn't apply the VNI stuff for the bridge. I'm suspecting that may be where they picked it up from.

#2 lore raw
In reply to Ido Schimmel
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 11 lines · On Tue, 7 Feb 2023 16:18:19 +0200 you wrote:

iproute2 does not recognize the "group6" and "remote6" keywords. Fix by using "group" and "remote" instead.

Before:

 # ./test_vxlan_vnifiltering.sh
 [...]
 Tests passed:  25
 Tests failed:   2

[...]

Here is the summary with links:
- [net] selftests: Fix failing VXLAN VNI filtering test

    https://git.kernel.org/netdev/net/c/b963d9d5b943

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html