| Message ID | 20230608064448.2437-1-vladimir@nikishkin.pw (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 26a4dd839eeba3638df8441223903baa49c6f0da |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] selftests: net: vxlan: Fix selftest regression after changes in iproute2. | expand |
On Thu, Jun 08, 2023 at 02:44:48PM +0800, Vladimir Nikishkin wrote: > The iproute2 output that eventually landed upstream is different than > the one used in this test, resulting in failures. Fix by adjusting the > test to use iproute2's JSON output, which is more stable than regular > output. > > Fixes: 305c04189997 ("selftests: net: vxlan: Add tests for vxlan nolocalbypass option.") > Signed-off-by: Vladimir Nikishkin <vladimir@nikishkin.pw> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Tested-by: Ido Schimmel <idosch@nvidia.com>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 8 Jun 2023 14:44:48 +0800 you wrote: > The iproute2 output that eventually landed upstream is different than > the one used in this test, resulting in failures. Fix by adjusting the > test to use iproute2's JSON output, which is more stable than regular > output. > > Fixes: 305c04189997 ("selftests: net: vxlan: Add tests for vxlan nolocalbypass option.") > Signed-off-by: Vladimir Nikishkin <vladimir@nikishkin.pw> > > [...] Here is the summary with links: - [net-next,v2] selftests: net: vxlan: Fix selftest regression after changes in iproute2. https://git.kernel.org/netdev/net-next/c/26a4dd839eeb You are awesome, thank you!
diff --git a/tools/testing/selftests/net/test_vxlan_nolocalbypass.sh b/tools/testing/selftests/net/test_vxlan_nolocalbypass.sh index 46067db53068..f75212bf142c 100755 --- a/tools/testing/selftests/net/test_vxlan_nolocalbypass.sh +++ b/tools/testing/selftests/net/test_vxlan_nolocalbypass.sh @@ -130,7 +130,7 @@ nolocalbypass() run_cmd "tc -n ns1 qdisc add dev lo clsact" run_cmd "tc -n ns1 filter add dev lo ingress pref 1 handle 101 proto ip flower ip_proto udp dst_port 4790 action drop" - run_cmd "ip -n ns1 -d link show dev vx0 | grep ' localbypass'" + run_cmd "ip -n ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == true'" log_test $? 0 "localbypass enabled" run_cmd "ip netns exec ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q" @@ -140,7 +140,7 @@ nolocalbypass() run_cmd "ip -n ns1 link set dev vx0 type vxlan nolocalbypass" - run_cmd "ip -n ns1 -d link show dev vx0 | grep 'nolocalbypass'" + run_cmd "ip -n ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == false'" log_test $? 0 "localbypass disabled" run_cmd "ip netns exec ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q" @@ -150,7 +150,7 @@ nolocalbypass() run_cmd "ip -n ns1 link set dev vx0 type vxlan localbypass" - run_cmd "ip -n ns1 -d link show dev vx0 | grep ' localbypass'" + run_cmd "ip -n ns1 -d -j link show dev vx0 | jq -e '.[][\"linkinfo\"][\"info_data\"][\"localbypass\"] == true'" log_test $? 0 "localbypass enabled" run_cmd "ip netns exec ns1 mausezahn vx0 -a $smac -b $dmac -c 1 -p 100 -q"
The iproute2 output that eventually landed upstream is different than the one used in this test, resulting in failures. Fix by adjusting the test to use iproute2's JSON output, which is more stable than regular output. Fixes: 305c04189997 ("selftests: net: vxlan: Add tests for vxlan nolocalbypass option.") Signed-off-by: Vladimir Nikishkin <vladimir@nikishkin.pw> --- v1=>v2: Fix indentation by tabs. tools/testing/selftests/net/test_vxlan_nolocalbypass.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)