[ovs-dev] system-ovn.at: Fix ICMP conntrack output.

Message ID	20160728174837.7766-1-joe@ovn.org
State	Accepted
Headers	show Return-Path: <dev-bounces@openvswitch.org> Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at ovn.org designates 217.70.183.194 as permitted sender) sender: joe@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 3C01CC5A6A; Thu, 28 Jul 2016 19:48:47 +0200 (CEST) From: Joe Stringer <joe@ovn.org> To: dev@openvswitch.org Date: Thu, 28 Jul 2016 10:48:37 -0700 Message-Id: <20160728174837.7766-1-joe@ovn.org> Cc: guru@ovn.org Subject: [ovs-dev] [PATCH] system-ovn.at: Fix ICMP conntrack output. Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dev-bounces@openvswitch.org Sender: "dev" <dev-bounces@openvswitch.org>

Message ID

20160728174837.7766-1-joe@ovn.org

State

Accepted

Headers

Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at ovn.org designates
	217.70.183.194 as permitted sender)
From: Joe Stringer <joe@ovn.org>
To: dev@openvswitch.org
Date: Thu, 28 Jul 2016 10:48:37 -0700
Message-Id: <20160728174837.7766-1-joe@ovn.org>
Cc: guru@ovn.org
Subject: [ovs-dev] [PATCH] system-ovn.at: Fix ICMP conntrack output.
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: dev-bounces@openvswitch.org
Sender: "dev" <dev-bounces@openvswitch.org>

Commit Message

Joe Stringer July 28, 2016, 5:48 p.m. UTC

Recent changes to the dump-conntrack command provide more info
(type,code), but the system-ovn tests weren't updated for this.
Update the tests.

Signed-off-by: Joe Stringer <joe@ovn.org>
---
 tests/system-ovn.at | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Joe Stringer July 28, 2016, 5:52 p.m. UTC | #1

On 28 July 2016 at 10:48, Joe Stringer <joe@ovn.org> wrote:
> Recent changes to the dump-conntrack command provide more info
> (type,code), but the system-ovn tests weren't updated for this.
> Update the tests.
>
> Signed-off-by: Joe Stringer <joe@ovn.org>

I'm aware of two other failures in these tests, which I haven't tried
to address:
1) Logs complain about a duplicate flow. This was discussed during
this morning's OVN IRC meeting.
2) There is a "hard failure" on the last test. IIRC this means that an
OVS_WAIT_WHILE or OVS_WAIT_UNTIL failed.

Gurucharan Shetty July 28, 2016, 6:19 p.m. UTC | #2

On 28 July 2016 at 10:48, Joe Stringer <joe@ovn.org> wrote:

> Recent changes to the dump-conntrack command provide more info
> (type,code), but the system-ovn tests weren't updated for this.
> Update the tests.
>
> Signed-off-by: Joe Stringer <joe@ovn.org>
>

Acked-by: Gurucharan Shetty <guru@ovn.org>


> ---
>  tests/system-ovn.at | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/system-ovn.at b/tests/system-ovn.at
> index fd091b83d667..2a94d68a6e60 100755
> --- a/tests/system-ovn.at
> +++ b/tests/system-ovn.at
> @@ -111,7 +111,7 @@ NS_CHECK_EXEC([alice1], [ping -q -c 3 -i 0.3 -w 2
> 30.0.0.2 | FORMAT_PING], \
>  # Check conntrack entries.
>  AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(172.16.1.2) | \
>  sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
>
> -icmp,orig=(src=172.16.1.2,dst=30.0.0.2,id=<cleared>),reply=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>),zone=<cleared>
>
> +icmp,orig=(src=172.16.1.2,dst=30.0.0.2,id=<cleared>,type=8,code=0),reply=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>,type=0,code=0),zone=<cleared>
>  ])
>
>  # South-North SNAT: 'bar1' pings 'alice1'. But 'alice1' receives traffic
> @@ -124,7 +124,7 @@ NS_CHECK_EXEC([bar1], [ping -q -c 3 -i 0.3 -w 2
> 172.16.1.2 | FORMAT_PING], \
>  # We verify that SNAT indeed happened via 'dump-conntrack' command.
>  AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.1) | \
>  sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
>
> -icmp,orig=(src=192.168.2.2,dst=172.16.1.2,id=<cleared>),reply=(src=172.16.1.2,dst=30.0.0.1,id=<cleared>),zone=<cleared>
>
> +icmp,orig=(src=192.168.2.2,dst=172.16.1.2,id=<cleared>,type=8,code=0),reply=(src=172.16.1.2,dst=30.0.0.1,id=<cleared>,type=0,code=0),zone=<cleared>
>  ])
>
>  # Add static routes to handle east-west NAT.
> @@ -143,14 +143,14 @@ NS_CHECK_EXEC([bar1], [ping -q -c 3 -i 0.3 -w 2
> 30.0.0.2 | FORMAT_PING], \
>  # 30.0.0.2 to R2, it hits the DNAT rule and converts 30.0.0.2 to
> 192.168.1.2
>  AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.2) | \
>  sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
>
> -icmp,orig=(src=192.168.2.2,dst=30.0.0.2,id=<cleared>),reply=(src=192.168.1.2,dst=192.168.2.2,id=<cleared>),zone=<cleared>
>
> +icmp,orig=(src=192.168.2.2,dst=30.0.0.2,id=<cleared>,type=8,code=0),reply=(src=192.168.1.2,dst=192.168.2.2,id=<cleared>,type=0,code=0),zone=<cleared>
>  ])
>
>  # As we have a SNAT rule that converts 192.168.2.2 to 30.0.0.1, the
> source is
>  # SNATted and 'foo1' receives it.
>  AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.1) | \
>  sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
>
> -icmp,orig=(src=192.168.2.2,dst=192.168.1.2,id=<cleared>),reply=(src=192.168.1.2,dst=30.0.0.1,id=<cleared>),zone=<cleared>
>
> +icmp,orig=(src=192.168.2.2,dst=192.168.1.2,id=<cleared>,type=8,code=0),reply=(src=192.168.1.2,dst=30.0.0.1,id=<cleared>,type=0,code=0),zone=<cleared>
>  ])
>
>  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> @@ -255,7 +255,7 @@ NS_CHECK_EXEC([foo1], [ping -q -c 3 -i 0.3 -w 2
> 172.16.1.2 | FORMAT_PING], \
>  # We verify that SNAT indeed happened via 'dump-conntrack' command.
>  AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(172.16.1.1) | \
>  sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
>
> -icmp,orig=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>),reply=(src=172.16.1.2,dst=172.16.1.1,id=<cleared>),zone=<cleared>
>
> +icmp,orig=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>,type=8,code=0),reply=(src=172.16.1.2,dst=172.16.1.1,id=<cleared>,type=0,code=0),zone=<cleared>
>  ])
>
>  OVS_APP_EXIT_AND_WAIT([ovn-controller])
> --
> 2.9.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>

Joe Stringer July 28, 2016, 6:37 p.m. UTC | #3

On 28 July 2016 at 11:19, Guru Shetty <guru@ovn.org> wrote:
>
>
> On 28 July 2016 at 10:48, Joe Stringer <joe@ovn.org> wrote:
>>
>> Recent changes to the dump-conntrack command provide more info
>> (type,code), but the system-ovn tests weren't updated for this.
>> Update the tests.
>>
>> Signed-off-by: Joe Stringer <joe@ovn.org>
>
>
> Acked-by: Gurucharan Shetty <guru@ovn.org>

Thanks, applied.

diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index fd091b83d667..2a94d68a6e60 100755
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -111,7 +111,7 @@  NS_CHECK_EXEC([alice1], [ping -q -c 3 -i 0.3 -w 2 30.0.0.2 | FORMAT_PING], \
 # Check conntrack entries.
 AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(172.16.1.2) | \
 sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
-icmp,orig=(src=172.16.1.2,dst=30.0.0.2,id=<cleared>),reply=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>),zone=<cleared>
+icmp,orig=(src=172.16.1.2,dst=30.0.0.2,id=<cleared>,type=8,code=0),reply=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>,type=0,code=0),zone=<cleared>
 ])
 
 # South-North SNAT: 'bar1' pings 'alice1'. But 'alice1' receives traffic
@@ -124,7 +124,7 @@  NS_CHECK_EXEC([bar1], [ping -q -c 3 -i 0.3 -w 2 172.16.1.2 | FORMAT_PING], \
 # We verify that SNAT indeed happened via 'dump-conntrack' command.
 AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.1) | \
 sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
-icmp,orig=(src=192.168.2.2,dst=172.16.1.2,id=<cleared>),reply=(src=172.16.1.2,dst=30.0.0.1,id=<cleared>),zone=<cleared>
+icmp,orig=(src=192.168.2.2,dst=172.16.1.2,id=<cleared>,type=8,code=0),reply=(src=172.16.1.2,dst=30.0.0.1,id=<cleared>,type=0,code=0),zone=<cleared>
 ])
 
 # Add static routes to handle east-west NAT.
@@ -143,14 +143,14 @@  NS_CHECK_EXEC([bar1], [ping -q -c 3 -i 0.3 -w 2 30.0.0.2 | FORMAT_PING], \
 # 30.0.0.2 to R2, it hits the DNAT rule and converts 30.0.0.2 to 192.168.1.2
 AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.2) | \
 sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
-icmp,orig=(src=192.168.2.2,dst=30.0.0.2,id=<cleared>),reply=(src=192.168.1.2,dst=192.168.2.2,id=<cleared>),zone=<cleared>
+icmp,orig=(src=192.168.2.2,dst=30.0.0.2,id=<cleared>,type=8,code=0),reply=(src=192.168.1.2,dst=192.168.2.2,id=<cleared>,type=0,code=0),zone=<cleared>
 ])
 
 # As we have a SNAT rule that converts 192.168.2.2 to 30.0.0.1, the source is
 # SNATted and 'foo1' receives it.
 AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.1) | \
 sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
-icmp,orig=(src=192.168.2.2,dst=192.168.1.2,id=<cleared>),reply=(src=192.168.1.2,dst=30.0.0.1,id=<cleared>),zone=<cleared>
+icmp,orig=(src=192.168.2.2,dst=192.168.1.2,id=<cleared>,type=8,code=0),reply=(src=192.168.1.2,dst=30.0.0.1,id=<cleared>,type=0,code=0),zone=<cleared>
 ])
 
 OVS_APP_EXIT_AND_WAIT([ovn-controller])
@@ -255,7 +255,7 @@  NS_CHECK_EXEC([foo1], [ping -q -c 3 -i 0.3 -w 2 172.16.1.2 | FORMAT_PING], \
 # We verify that SNAT indeed happened via 'dump-conntrack' command.
 AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(172.16.1.1) | \
 sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl
-icmp,orig=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>),reply=(src=172.16.1.2,dst=172.16.1.1,id=<cleared>),zone=<cleared>
+icmp,orig=(src=192.168.1.2,dst=172.16.1.2,id=<cleared>,type=8,code=0),reply=(src=172.16.1.2,dst=172.16.1.1,id=<cleared>,type=0,code=0),zone=<cleared>
 ])
 
 OVS_APP_EXIT_AND_WAIT([ovn-controller])

[ovs-dev] system-ovn.at: Fix ICMP conntrack output.

Commit Message

Comments

Patch