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 <acon...@redhat.com>
---
 tools/testing/selftests/net/openvswitch/openvswitch.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/openvswitch/openvswitch.sh 
b/tools/testing/selftests/net/openvswitch/openvswitch.sh
index 87b80bee6df4..a5dbde482ba4 100755
--- a/tools/testing/selftests/net/openvswitch/openvswitch.sh
+++ b/tools/testing/selftests/net/openvswitch/openvswitch.sh
@@ -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`
@@ -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
@@ -139,9 +142,10 @@ 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
+       info "Flow added."
        return 0
 }
 
-- 
2.41.0


Reply via email to