Skip to content

Commit

Permalink
selftests: openvswitch: Be more verbose with selftest debugging.
Browse files Browse the repository at this point in the history
The openvswitch selftest is difficult to debug for anyone that isn't
directly familiar with the openvswitch module and the specifics of the
test cases.  Many times when something fails, the debug log will be
sparsely populated and it takes some time to understand where a failure
occured.

Increase the amount of details logged to the debug log by trapping all
'info' logs, and all 'ovs_sbx' commands.

Signed-off-by: Aaron Conole <aconole@redhat.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240702132830.213384-4-aconole@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Aaron Conole authored and Jakub Kicinski committed Jul 4, 2024
1 parent 818481d commit 7abfd8e
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions tools/testing/selftests/net/openvswitch/openvswitch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ tests="
drop_reason drop: test drop reasons are emitted"

info() {
[ $VERBOSE = 0 ] || echo $*
[ "${ovs_dir}" != "" ] &&
echo "`date +"[%m-%d %H:%M:%S]"` $*" >> ${ovs_dir}/debug.log
[ $VERBOSE = 0 ] || echo $*
}

ovs_base=`pwd`
Expand Down Expand Up @@ -65,7 +67,8 @@ ovs_setenv() {

ovs_sbx() {
if test "X$2" != X; then
(ovs_setenv $1; shift; "$@" >> ${ovs_dir}/debug.log)
(ovs_setenv $1; shift;
info "run cmd: $@"; "$@" >> ${ovs_dir}/debug.log)
else
ovs_setenv $1
fi
Expand Down Expand Up @@ -139,7 +142,7 @@ ovs_add_flow () {
info "Adding flow to DP: sbx:$1 br:$2 flow:$3 act:$4"
ovs_sbx "$1" python3 $ovs_base/ovs-dpctl.py add-flow "$2" "$3" "$4"
if [ $? -ne 0 ]; then
echo "Flow [ $3 : $4 ] failed" >> ${ovs_dir}/debug.log
info "Flow [ $3 : $4 ] failed"
return 1
fi
return 0
Expand Down

0 comments on commit 7abfd8e

Please sign in to comment.