Re: [ovs-dev] [PATCH v8 02/15] tests: Include working system-traffic tests into the system-offloads-testsuite.
On 26 Jan 2023, at 21:10, Ilya Maximets wrote: > On 1/24/23 13:45, Eelco Chaudron wrote: >> Include and run the system-traffic.at tests as part of the system offload >> testsuite. Exclude all the tests that will not run without any special >> modifications. >> >> Signed-off-by: Eelco Chaudron >> Acked-by: Roi Dayan >> --- >> tests/automake.mk |1 >> tests/system-offloads-testsuite.at |1 >> tests/system-offloads.at | 106 >> >> 3 files changed, 108 insertions(+) >> create mode 100644 tests/system-offloads.at >> >> diff --git a/tests/automake.mk b/tests/automake.mk >> index c8de3fe28..79224b135 100644 >> --- a/tests/automake.mk >> +++ b/tests/automake.mk >> @@ -185,6 +185,7 @@ SYSTEM_TESTSUITE_AT = \ >> >> SYSTEM_OFFLOADS_TESTSUITE_AT = \ >> tests/system-common-macros.at \ >> +tests/system-offloads.at \ >> tests/system-offloads-traffic.at \ >> tests/system-offloads-testsuite.at >> >> diff --git a/tests/system-offloads-testsuite.at >> b/tests/system-offloads-testsuite.at >> index eb5d2d4b3..a2dfcbc94 100644 >> --- a/tests/system-offloads-testsuite.at >> +++ b/tests/system-offloads-testsuite.at >> @@ -23,3 +23,4 @@ m4_include([tests/system-common-macros.at]) >> m4_include([tests/system-kmod-macros.at]) >> >> m4_include([tests/system-offloads-traffic.at]) >> +m4_include([tests/system-offloads.at]) >> diff --git a/tests/system-offloads.at b/tests/system-offloads.at >> new file mode 100644 >> index 0..f6dd931b7 >> --- /dev/null >> +++ b/tests/system-offloads.at > > We typically name such files with a '-macros' suffix. Will rename to a better name with the -macros suffix. > >> @@ -0,0 +1,106 @@ >> +AT_COPYRIGHT([Copyright (c) 2022 Red Hat, Inc. > > * 2023 :) Well it was created in 2022, or was it 2021 :) >> + >> +Licensed under the Apache License, Version 2.0 (the "License"); >> +you may not use this file except in compliance with the License. >> +You may obtain a copy of the License at: >> + >> +http://www.apache.org/licenses/LICENSE-2.0 >> + >> +Unless required by applicable law or agreed to in writing, software >> +distributed under the License is distributed on an "AS IS" BASIS, >> +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. >> +See the License for the specific language governing permissions and >> +limitations under the License.]) >> + >> +# The goal is to run as many as possible of the system-traffic tests with >> +# OVS tc offload enabled. We do this by overriding the >> +# OVS_TRAFFIC_VSWITCHD_START() with offloading enabled. >> +m4_define([OVS_TRAFFIC_VSWITCHD_START], >> + [AT_CHECK([modprobe openvswitch]) >> + on_exit 'modprobe -r openvswitch' >> + m4_foreach([mod], [[vport_geneve], [vport_gre], [vport_lisp], >> [vport_stt], [vport_vxlan]], >> + [modprobe -q mod || echo "Module mod not loaded." >> + on_exit 'modprobe -q -r mod' >> + ]) >> + on_exit 'ovs-dpctl del-dp ovs-system' >> + on_exit 'ovs-appctl dpctl/flush-conntrack' >> + _OVS_VSWITCHD_START([], [-- set Open_vSwitch . >> other_config:hw-offload=true >> + $3]) > > Does this work? I'm guessing that the extra line break will break the > command. Seems to work, but maybe it is not used in any of the test cases. Anyway will move it to the same line. >> + dnl Add bridges, ports, etc. >> + AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| >> uuidfilt])], [0], [$2]) >> +]) ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH v8 02/15] tests: Include working system-traffic tests into the system-offloads-testsuite.
On 1/24/23 13:45, Eelco Chaudron wrote: > Include and run the system-traffic.at tests as part of the system offload > testsuite. Exclude all the tests that will not run without any special > modifications. > > Signed-off-by: Eelco Chaudron > Acked-by: Roi Dayan > --- > tests/automake.mk |1 > tests/system-offloads-testsuite.at |1 > tests/system-offloads.at | 106 > > 3 files changed, 108 insertions(+) > create mode 100644 tests/system-offloads.at > > diff --git a/tests/automake.mk b/tests/automake.mk > index c8de3fe28..79224b135 100644 > --- a/tests/automake.mk > +++ b/tests/automake.mk > @@ -185,6 +185,7 @@ SYSTEM_TESTSUITE_AT = \ > > SYSTEM_OFFLOADS_TESTSUITE_AT = \ > tests/system-common-macros.at \ > + tests/system-offloads.at \ > tests/system-offloads-traffic.at \ > tests/system-offloads-testsuite.at > > diff --git a/tests/system-offloads-testsuite.at > b/tests/system-offloads-testsuite.at > index eb5d2d4b3..a2dfcbc94 100644 > --- a/tests/system-offloads-testsuite.at > +++ b/tests/system-offloads-testsuite.at > @@ -23,3 +23,4 @@ m4_include([tests/system-common-macros.at]) > m4_include([tests/system-kmod-macros.at]) > > m4_include([tests/system-offloads-traffic.at]) > +m4_include([tests/system-offloads.at]) > diff --git a/tests/system-offloads.at b/tests/system-offloads.at > new file mode 100644 > index 0..f6dd931b7 > --- /dev/null > +++ b/tests/system-offloads.at We typically name such files with a '-macros' suffix. > @@ -0,0 +1,106 @@ > +AT_COPYRIGHT([Copyright (c) 2022 Red Hat, Inc. * 2023 :) > + > +Licensed under the Apache License, Version 2.0 (the "License"); > +you may not use this file except in compliance with the License. > +You may obtain a copy of the License at: > + > +http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, software > +distributed under the License is distributed on an "AS IS" BASIS, > +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +See the License for the specific language governing permissions and > +limitations under the License.]) > + > +# The goal is to run as many as possible of the system-traffic tests with > +# OVS tc offload enabled. We do this by overriding the > +# OVS_TRAFFIC_VSWITCHD_START() with offloading enabled. > +m4_define([OVS_TRAFFIC_VSWITCHD_START], > + [AT_CHECK([modprobe openvswitch]) > + on_exit 'modprobe -r openvswitch' > + m4_foreach([mod], [[vport_geneve], [vport_gre], [vport_lisp], > [vport_stt], [vport_vxlan]], > + [modprobe -q mod || echo "Module mod not loaded." > + on_exit 'modprobe -q -r mod' > + ]) > + on_exit 'ovs-dpctl del-dp ovs-system' > + on_exit 'ovs-appctl dpctl/flush-conntrack' > + _OVS_VSWITCHD_START([], [-- set Open_vSwitch . > other_config:hw-offload=true > + $3]) Does this work? I'm guessing that the extra line break will break the command. > + dnl Add bridges, ports, etc. > + AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| > uuidfilt])], [0], [$2]) > +]) ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH v8 02/15] tests: Include working system-traffic tests into the system-offloads-testsuite.
Include and run the system-traffic.at tests as part of the system offload testsuite. Exclude all the tests that will not run without any special modifications. Signed-off-by: Eelco Chaudron Acked-by: Roi Dayan --- tests/automake.mk |1 tests/system-offloads-testsuite.at |1 tests/system-offloads.at | 106 3 files changed, 108 insertions(+) create mode 100644 tests/system-offloads.at diff --git a/tests/automake.mk b/tests/automake.mk index c8de3fe28..79224b135 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -185,6 +185,7 @@ SYSTEM_TESTSUITE_AT = \ SYSTEM_OFFLOADS_TESTSUITE_AT = \ tests/system-common-macros.at \ + tests/system-offloads.at \ tests/system-offloads-traffic.at \ tests/system-offloads-testsuite.at diff --git a/tests/system-offloads-testsuite.at b/tests/system-offloads-testsuite.at index eb5d2d4b3..a2dfcbc94 100644 --- a/tests/system-offloads-testsuite.at +++ b/tests/system-offloads-testsuite.at @@ -23,3 +23,4 @@ m4_include([tests/system-common-macros.at]) m4_include([tests/system-kmod-macros.at]) m4_include([tests/system-offloads-traffic.at]) +m4_include([tests/system-offloads.at]) diff --git a/tests/system-offloads.at b/tests/system-offloads.at new file mode 100644 index 0..f6dd931b7 --- /dev/null +++ b/tests/system-offloads.at @@ -0,0 +1,106 @@ +AT_COPYRIGHT([Copyright (c) 2022 Red Hat, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at: + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License.]) + +# The goal is to run as many as possible of the system-traffic tests with +# OVS tc offload enabled. We do this by overriding the +# OVS_TRAFFIC_VSWITCHD_START() with offloading enabled. +m4_define([OVS_TRAFFIC_VSWITCHD_START], + [AT_CHECK([modprobe openvswitch]) + on_exit 'modprobe -r openvswitch' + m4_foreach([mod], [[vport_geneve], [vport_gre], [vport_lisp], [vport_stt], [vport_vxlan]], + [modprobe -q mod || echo "Module mod not loaded." + on_exit 'modprobe -q -r mod' + ]) + on_exit 'ovs-dpctl del-dp ovs-system' + on_exit 'ovs-appctl dpctl/flush-conntrack' + _OVS_VSWITCHD_START([], [-- set Open_vSwitch . other_config:hw-offload=true + $3]) + dnl Add bridges, ports, etc. + AT_CHECK([ovs-vsctl -- _ADD_BR([br0]) -- $1 m4_if([$2], [], [], [| uuidfilt])], [0], [$2]) +]) + +# The list below are tests that will not pass for a "test environment" specific +# issue. +m4_define([OVS_TEST_SKIP_LIST], +[ovs_test_skip_list=" +datapath - mpls actions +datapath - multiple mpls label pop +datapath - basic truncate action +datapath - truncate and output to gre tunnel by simulated packets +datapath - truncate and output to gre tunnel +conntrack - force commit +conntrack - preserve registers +conntrack - zones +conntrack - zones from field +conntrack - zones from other field +conntrack - zones from other field, more tests +conntrack - multiple zones +conntrack - multiple namespaces, internal ports +conntrack - ct_mark +conntrack - ct_mark bit-fiddling +conntrack - ct_mark from register +conntrack - ct_label +conntrack - ct_label bit-fiddling +conntrack - ct metadata, multiple zones +conntrack - ICMP related +conntrack - ICMP related to original direction +conntrack - IPv4 fragmentation + cvlan +conntrack - IPv4 fragmentation with fragments specified +conntrack - IPv6 fragmentation + cvlan +conntrack - Fragmentation over vxlan +conntrack - IPv6 Fragmentation over vxlan +conntrack - zone-based timeout policy +conntrack - IPv4 HTTP +conntrack - IPv6 HTTP +conntrack - multiple zones, local +conntrack - multi-stage pipeline, local +conntrack - FTP +conntrack - FTP over IPv6 +conntrack - IPv6 FTP Passive +conntrack - FTP with multiple expectations +conntrack - TFTP +conntrack - simple SNAT +conntrack - SNAT with port range +conntrack - SNAT with port range with exhaustion +conntrack - more complex SNAT +conntrack - all-zero IP SNAT +conntrack - simple DNAT +conntrack - DNAT with additional SNAT +conntrack - more complex DNAT +conntrack - ICMP related with NAT +conntrack - FTP SNAT prerecirc +conntrack - FTP SNAT prerecirc seqadj +conntrack - FTP SNAT postrecirc +conntrack - FTP SNAT postrecirc seqadj +conntrack - FTP SNAT orig tuple +conntrack - FTP SNAT orig tuple seqadj +conntrack - IPv4 FTP Passive with SNAT +conntrack - IPv4 FTP Passive with DNAT +conntrack - IPv4 FTP Passive with DNAT 2 +conntrack - IPv4 FTP Active with DNAT +conntrack - IPv4 FTP Active with DNAT with reverse skew +conntrack -
