The DPDK commit [1] improves the socket layer logs in the vhost library
to ease log filtering and debugging.
Update the system-dpdk vhost tests to reflect this change.
[1] c85c35b1d447 ("vhost: improve socket layer logs")
Signed-off-by: Sunil Pai G <sunil.pa...@intel.com>
---
tests/system-dpdk.at | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at
index 7d2715c4a..f73612f67 100644
--- a/tests/system-dpdk.at
+++ b/tests/system-dpdk.at
@@ -63,14 +63,14 @@ AT_CHECK([ovs-vsctl show], [], [stdout])
sleep 2
dnl Parse log file
-AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created"
ovs-vswitchd.log], [], [stdout])
+AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user
client: socket created" ovs-vswitchd.log], [], [stdout])
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client'
mode, using client socket" ovs-vswitchd.log], [], [stdout])
-AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..."
ovs-vswitchd.log], [], [stdout])
+AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..."
ovs-vswitchd.log], [], [stdout])
dnl Clean up
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout],
[stderr])
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
-\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such
file or directory@d
+\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file
or directory@d
])")
AT_CLEANUP
dnl --------------------------------------------------------------------------
@@ -97,11 +97,11 @@ AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuser0 -- set
Interface dpdkvhostuser0
AT_CHECK([ovs-vsctl show], [], [stdout])
dnl Parse log file
-AT_CHECK([grep "VHOST_CONFIG: vhost-user server: socket created" \
+AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) vhost-user server:
socket created" \
ovs-vswitchd.log], [], [stdout])
AT_CHECK([grep "Socket $OVS_RUNDIR/dpdkvhostuser0 created for vhost-user port
dpdkvhostuser0" \
ovs-vswitchd.log], [], [stdout])
-AT_CHECK([grep "VHOST_CONFIG: bind to $OVS_RUNDIR/dpdkvhostuser0"
ovs-vswitchd.log], [],
+AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) binding succeeded"
ovs-vswitchd.log], [],
[stdout])
dnl Set up namespaces
@@ -142,8 +142,8 @@ pkill -f -x -9 'tail -f /dev/null'
dnl Clean up
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuser0], [], [stdout], [stderr])
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
-\@VHOST_CONFIG: recvmsg failed@d
-\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostuser0: No such file
or directory@d
+\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) recvmsg failed@d
+\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) failed to connect: No such file
or directory@d
\@dpdkvhostuser ports are considered deprecated; please migrate to
dpdkvhostuserclient ports.@d
\@failed to enumerate system datapaths: No such file or directory@d
])")
@@ -172,9 +172,9 @@ AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuserclient0 --
set Interface \
AT_CHECK([ovs-vsctl show], [], [stdout])
dnl Parse log file
-AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created"
ovs-vswitchd.log], [], [stdout])
+AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user
client: socket created" ovs-vswitchd.log], [], [stdout])
AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client'
mode, using client socket" ovs-vswitchd.log], [], [stdout])
-AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..."
ovs-vswitchd.log], [], [stdout])
+AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..."
ovs-vswitchd.log], [], [stdout])
dnl Set up namespaces
ADD_NAMESPACES(ns1, ns2)
@@ -214,8 +214,8 @@ pkill -f -x -9 'tail -f /dev/null'
dnl Clean up
AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout],
[stderr])
OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [
-\@VHOST_CONFIG: recvmsg failed@d
-\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such
file or directory@d
+\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) recvmsg failed@d
+\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file
or directory@d
\@dpdkvhostuser ports are considered deprecated; please migrate to
dpdkvhostuserclient ports.@d
\@failed to enumerate system datapaths: No such file or directory@d
])")
--
2.25.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
