diff mbox series

[ovs-dev,11/15] test: Fix 'conntrack - Multiple ICMP traverse' for tc case.

Message ID 166238339202.2220027.8682905206439901169.stgit@ebuild
State Superseded
Headers show
Series tests: Add system-traffic.at tests to check-offloads. | expand

Checks

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

Commit Message

Eelco Chaudron Sept. 5, 2022, 1:09 p.m. UTC
tc does not include ethernet header length in packet byte count.
This fix will allow the packets that go trough tc to be 14 bytes less.

This difference in the TC implementation is already described in
tc-offload.rst.

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
---
 tests/system-offloads-testsuite.at |    1 -
 tests/system-traffic.at            |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Roi Dayan Nov. 7, 2022, 10:08 a.m. UTC | #1
On 05/09/2022 16:09, Eelco Chaudron wrote:
> tc does not include ethernet header length in packet byte count.
> This fix will allow the packets that go trough tc to be 14 bytes less.
> 
> This difference in the TC implementation is already described in
> tc-offload.rst.
> 
> Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
> ---
>  tests/system-offloads-testsuite.at |    1 -
>  tests/system-traffic.at            |    2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tests/system-offloads-testsuite.at b/tests/system-offloads-testsuite.at
> index 30b2bf60b..43b4d8e9e 100644
> --- a/tests/system-offloads-testsuite.at
> +++ b/tests/system-offloads-testsuite.at
> @@ -88,7 +88,6 @@ conntrack - multi-stage pipeline, local
>  conntrack - ICMP related with NAT
>  conntrack - DNAT load balancing
>  conntrack - DNAT load balancing with NC
> -conntrack - Multiple ICMP traverse
>  conntrack - can match and clear ct_state from outside OVS
>  IGMP - flood under normal action"
>  echo "$ovs_test_skip_list" | sed "s/<SPC>/ /g"])
> diff --git a/tests/system-traffic.at b/tests/system-traffic.at
> index ae33ea377..fb823f2a8 100644
> --- a/tests/system-traffic.at
> +++ b/tests/system-traffic.at
> @@ -6893,7 +6893,7 @@ AT_CHECK([DPCTL_DUMP_CONNTRACK | FORMAT_CT(10.1.1)], [0], [dnl
>  icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
>  ])
>  
> -AT_CHECK([ovs-ofctl dump-flows br0 | grep table=2, | OFPROTO_CLEAR_DURATION_IDLE],
> +AT_CHECK([ovs-ofctl dump-flows br0 | grep table=2, | OFPROTO_CLEAR_DURATION_IDLE | sed 's/n_bytes=70,/n_bytes=84,/'],
>           [0], [dnl
>   cookie=0x0, duration=<cleared>, table=2, n_packets=2, n_bytes=84, idle_age=<cleared>, priority=10,ct_state=+new+trk,in_port=1 actions=drop
>   cookie=0x0, duration=<cleared>, table=2, n_packets=0, n_bytes=0, idle_age=<cleared>, priority=10,ct_state=+est+trk actions=drop
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Acked-by: Roi Dayan <roid@nvidia.com>
diff mbox series

Patch

diff --git a/tests/system-offloads-testsuite.at b/tests/system-offloads-testsuite.at
index 30b2bf60b..43b4d8e9e 100644
--- a/tests/system-offloads-testsuite.at
+++ b/tests/system-offloads-testsuite.at
@@ -88,7 +88,6 @@  conntrack - multi-stage pipeline, local
 conntrack - ICMP related with NAT
 conntrack - DNAT load balancing
 conntrack - DNAT load balancing with NC
-conntrack - Multiple ICMP traverse
 conntrack - can match and clear ct_state from outside OVS
 IGMP - flood under normal action"
 echo "$ovs_test_skip_list" | sed "s/<SPC>/ /g"])
diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index ae33ea377..fb823f2a8 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -6893,7 +6893,7 @@  AT_CHECK([DPCTL_DUMP_CONNTRACK | FORMAT_CT(10.1.1)], [0], [dnl
 icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
 ])
 
-AT_CHECK([ovs-ofctl dump-flows br0 | grep table=2, | OFPROTO_CLEAR_DURATION_IDLE],
+AT_CHECK([ovs-ofctl dump-flows br0 | grep table=2, | OFPROTO_CLEAR_DURATION_IDLE | sed 's/n_bytes=70,/n_bytes=84,/'],
          [0], [dnl
  cookie=0x0, duration=<cleared>, table=2, n_packets=2, n_bytes=84, idle_age=<cleared>, priority=10,ct_state=+new+trk,in_port=1 actions=drop
  cookie=0x0, duration=<cleared>, table=2, n_packets=0, n_bytes=0, idle_age=<cleared>, priority=10,ct_state=+est+trk actions=drop