[ovs-dev] [PATCH ovn v3 1/2] tests: add make check-system-dpdk to test suite.

2023-06-19 Thread Eelco Chaudron 
Allow the ovn-system tests to run on the OVS-DPDK infrastructure,
i.e., DPDK ports and mbuf memory.

Co-authored-by: David Marchand 
Signed-off-by: David Marchand 
Signed-off-by: Eelco Chaudron 
---

v2: No changes.
v3: Add 'dpdk-extra="--log-level=pmd.*:error --no-pci"' to test initialization.

 tests/automake.mk  |   23 +++-
 tests/ofproto-macros.at|9 ++-
 tests/system-dpdk-macros.at|  109 
 tests/system-dpdk-testsuite.at |   25 +
 tests/system-ovn.at|   11 
 5 files changed, 167 insertions(+), 10 deletions(-)
 create mode 100644 tests/system-dpdk-macros.at
 create mode 100644 tests/system-dpdk-testsuite.at

diff --git a/tests/automake.mk b/tests/automake.mk
index fd5ee14af..eea0d00f4 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -2,11 +2,13 @@ EXTRA_DIST += \
$(COMMON_MACROS_AT) \
$(TESTSUITE_AT) \
$(SYSTEM_TESTSUITE_AT) \
+   $(SYSTEM_DPDK_TESTSUITE_AT) \
$(SYSTEM_KMOD_TESTSUITE_AT) \
$(SYSTEM_USERSPACE_TESTSUITE_AT) \
$(PERF_TESTSUITE_AT) \
$(MULTINODE_TESTSUITE_AT) \
$(TESTSUITE) \
+   $(SYSTEM_DPDK_TESTSUITE) \
$(SYSTEM_KMOD_TESTSUITE) \
$(SYSTEM_USERSPACE_TESTSUITE) \
$(PERF_TESTSUITE) \
@@ -44,20 +46,22 @@ TESTSUITE_AT = \
tests/ovn-ipsec.at \
tests/ovn-vif-plug.at
 
+SYSTEM_DPDK_TESTSUITE_AT = \
+   tests/system-dpdk-testsuite.at \
+   tests/system-dpdk-macros.at
+
 SYSTEM_KMOD_TESTSUITE_AT = \
-   tests/system-common-macros.at \
+   tests/system-kmod-macros.at \
tests/system-kmod-testsuite.at \
-   tests/system-kmod-macros.at
+   tests/system-ovn-kmod.at
 
 SYSTEM_USERSPACE_TESTSUITE_AT = \
tests/system-userspace-testsuite.at \
-   tests/system-ovn.at \
tests/system-userspace-macros.at
 
 SYSTEM_TESTSUITE_AT = \
tests/system-common-macros.at \
-   tests/system-ovn.at \
-   tests/system-ovn-kmod.at
+   tests/system-ovn.at
 
 PERF_TESTSUITE_AT = \
tests/perf-testsuite.at \
@@ -73,6 +77,7 @@ check_SCRIPTS += tests/atlocal
 TESTSUITE = $(srcdir)/tests/testsuite
 TESTSUITE_PATCH = $(srcdir)/tests/testsuite.patch
 TESTSUITE_DIR = $(abs_top_builddir)/tests/testsuite.dir
+SYSTEM_DPDK_TESTSUITE = $(srcdir)/tests/system-dpdk-testsuite
 SYSTEM_KMOD_TESTSUITE = $(srcdir)/tests/system-kmod-testsuite
 SYSTEM_USERSPACE_TESTSUITE = $(srcdir)/tests/system-userspace-testsuite
 PERF_TESTSUITE = $(srcdir)/tests/perf-testsuite
@@ -180,6 +185,10 @@ check-userspace-valgrind: all $(valgrind_wrappers) 
$(check_DATA)
 check-helgrind: all $(valgrind_wrappers) $(check_DATA)
-$(SHELL) '$(TESTSUITE)' -C tests CHECK_VALGRIND=true 
VALGRIND='$(HELGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d 
$(TESTSUITEFLAGS)
 
+check-system-dpdk: all
+   set $(SHELL) '$(SYSTEM_DPDK_TESTSUITE)' -C tests  
AUTOTEST_PATH='$(AUTOTEST_PATH)'; \
+   $(SUDO) "$$@" $(TESTSUITEFLAGS) -j1 || (test X'$(RECHECK)' = Xyes && 
$(SUDO) "$$@" --recheck)
+
 # Run kmod tests. Assume kernel modules has been installed or linked into the 
kernel
 check-kernel: all
set $(SHELL) '$(SYSTEM_KMOD_TESTSUITE)' -C tests  
AUTOTEST_PATH='$(AUTOTEST_PATH)'; \
@@ -232,6 +241,10 @@ $(TESTSUITE): package.m4 $(TESTSUITE_AT) 
$(COMMON_MACROS_AT)
$(AM_V_at)mv $@.tmp $@
 endif
 
+$(SYSTEM_DPDK_TESTSUITE): package.m4 $(SYSTEM_TESTSUITE_AT) 
$(SYSTEM_DPDK_TESTSUITE_AT) $(COMMON_MACROS_AT)
+   $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+   $(AM_V_at)mv $@.tmp $@
+
 $(SYSTEM_KMOD_TESTSUITE): package.m4 $(SYSTEM_TESTSUITE_AT) 
$(SYSTEM_KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT)
$(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
$(AM_V_at)mv $@.tmp $@
diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 2e0bbd20b..f4ebdafc7 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -218,11 +218,12 @@ m4_define([_OVS_VSWITCHD_START],
 /ofproto|INFO|using datapath ID/d
 /netdev_linux|INFO|.*device has unknown hardware address family/d
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d
-/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /netdev: Flow API/d
 /probe tc:/d
-/tc: Using policy/d']])
+/tc: Using policy/d
+/dpdk|INFO|/d
+/dpdk|WARN|/d']])
 ])
 
 # OVS_VSWITCHD_START([vsctl-args], [vsctl-output], [=override],
@@ -247,7 +248,7 @@ m4_define([OVS_VSWITCHD_START],
AT_CHECK([add_of_br 0 $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2])
 ])
 
-# check_logs scans through all *.log files (except '*.log' and testsuite.log)
+# check_logs scans through all *.log files (except '*.log' and 
'*testsuite.log')
 # and reports all WARN, ERR, EMER log entries.  User can add custom sed filters
 # in $1.
 m4_divert_push([PREPARE_TESTS])
@@ -255,7 +256,7 @@ check_logs () {
 local logs
 for log in *

Re: [ovs-dev] [PATCH ovn v3 1/2] tests: add make check-system-dpdk to test suite.

2023-06-27 Thread Dumitru Ceara 
On 6/19/23 11:30, Eelco Chaudron wrote:
> Allow the ovn-system tests to run on the OVS-DPDK infrastructure,
> i.e., DPDK ports and mbuf memory.
> 
> Co-authored-by: David Marchand 
> Signed-off-by: David Marchand 
> Signed-off-by: Eelco Chaudron 
> ---

Hi Eelco,

Acked-by: Dumitru Ceara 

Thanks,
Dumitru

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Re: [ovs-dev] [PATCH ovn v3 1/2] tests: add make check-system-dpdk to test suite.

2023-07-04 Thread Ales Musil 
On Tue, Jun 27, 2023 at 7:12 PM Dumitru Ceara  wrote:

> On 6/19/23 11:30, Eelco Chaudron wrote:
> > Allow the ovn-system tests to run on the OVS-DPDK infrastructure,
> > i.e., DPDK ports and mbuf memory.
> >
> > Co-authored-by: David Marchand 
> > Signed-off-by: David Marchand 
> > Signed-off-by: Eelco Chaudron 
> > ---
>
> Hi Eelco,
>
> Acked-by: Dumitru Ceara 
>
> Thanks,
> Dumitru
>
> ___
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
>
Looks good to me, thanks.

Acked-by: Ales Musil 

-- 

Ales Musil

Senior Software Engineer - OVN Core

Red Hat EMEA 

amu...@redhat.comIM: amusil

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Re: [ovs-dev] [PATCH ovn v3 1/2] tests: add make check-system-dpdk to test suite.

2023-07-05 Thread Dumitru Ceara 
On 7/4/23 10:55, Ales Musil wrote:
> On Tue, Jun 27, 2023 at 7:12 PM Dumitru Ceara  wrote:
> 
>> On 6/19/23 11:30, Eelco Chaudron wrote:
>>> Allow the ovn-system tests to run on the OVS-DPDK infrastructure,
>>> i.e., DPDK ports and mbuf memory.
>>>
>>> Co-authored-by: David Marchand 
>>> Signed-off-by: David Marchand 
>>> Signed-off-by: Eelco Chaudron 
>>> ---
>>
>> Hi Eelco,
>>
>> Acked-by: Dumitru Ceara 
>>
>> Thanks,
>> Dumitru
>>
>> ___
>> dev mailing list
>> d...@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>
>>
> Looks good to me, thanks.
> 
> Acked-by: Ales Musil 
> 

Thanks, Eelco and Ales!  I applied this to main.

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev