diff mbox series

[ovs-dev,dpdk-latest] system-dpdk: Update vhost tests to be compatible with DPDK 22.03.

Message ID 20220517141106.592229-1-sunil.pai.g@intel.com
State New
Headers show
Series [ovs-dev,dpdk-latest] system-dpdk: Update vhost tests to be compatible with DPDK 22.03. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/intel-ovs-compilation fail test: fail
ovsrobot/github-robot-_Build_and_Test fail github build: failed

Commit Message

Pai G, Sunil May 17, 2022, 2:11 p.m. UTC
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.pai.g@intel.com>
---
 tests/system-dpdk.at | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Comments

Maxime Coquelin May 17, 2022, 3:10 p.m. UTC | #1
Hi Sunil;

On 5/17/22 16:11, Sunil Pai G wrote:
> 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.pai.g@intel.com>
> ---
>   tests/system-dpdk.at | 22 +++++++++++-----------
>   1 file changed, 11 insertions(+), 11 deletions(-)
> 


Thanks for taking care of the adaptation:
Acked-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Maxime
Cian Ferriter May 19, 2022, 3:09 p.m. UTC | #2
> -----Original Message-----
> From: Pai G, Sunil <sunil.pai.g@intel.com>
> Sent: Tuesday 17 May 2022 15:11
> To: dev@openvswitch.org
> Cc: Stokes, Ian <ian.stokes@intel.com>; david.marchand@redhat.com; maxime.coquelin@redhat.com;
> Ferriter, Cian <cian.ferriter@intel.com>
> Subject: [PATCH dpdk-latest] system-dpdk: Update vhost tests to be compatible with DPDK 22.03.
> 
> 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.pai.g@intel.com>

I've tested the before and after cases here with latest OVS master and latest DPDK main and I can verify that:

All 3 vhost-user tests fail before:
  3: OVS-DPDK - add vhost-user-client port           FAILED (system-dpdk.at:66)
  4: OVS-DPDK - ping vhost-user ports                FAILED (system-dpdk.at:100)
  5: OVS-DPDK - ping vhost-user-client ports         FAILED (system-dpdk.at:175)

All 3 pass after:
  3: OVS-DPDK - add vhost-user-client port           ok
  4: OVS-DPDK - ping vhost-user ports                ok
  5: OVS-DPDK - ping vhost-user-client ports         ok

The AT changes look good to me, I'm happy to Ack.
Acked-by: Cian Ferriter <cian.ferriter@intel.com>
diff mbox series

Patch

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
 ])")