selftests: Fix failing VXLAN VNI filtering test

[ Upstream commit b963d9d5b9437a6b99504987310f98537c9e77d4 ]

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")
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Link: https://lore.kernel.org/r/20230207141819.256689-1-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/testing/selftests/net/test_vxlan_vnifiltering.sh b/tools/testing/selftests/net/test_vxlan_vnifiltering.sh
index 704997ffc2449b6e1708dbab6d95f2b03af01612..8c3ac0a7254510881b05c8166b35030b4eafadb8 100755 (executable)
--- a/tools/testing/selftests/net/test_vxlan_vnifiltering.sh
+++ b/tools/testing/selftests/net/test_vxlan_vnifiltering.sh
@@ -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