[ovs-dev] [PATCH] tests: Add force/commit test to system-traffic.at

[Greg Rose]

On 07/17/2017 11:07 AM, Ben Pfaff wrote:
> On Mon, Jul 17, 2017 at 10:54:31AM -0700, Greg Rose wrote:
> > On 07/17/2017 10:44 AM, gvrose8192 at gmail.com wrote:
> >> From: Greg Rose <gvrose8192 at gmail.com>
> >>
> >> Add a new test for the kernel module datapath to test if the
> >> conntrack force direction change and commit is working correctly.
> >> This test was used to find and root cause BZ 18090854.
> >>
> >> Signed-off-by: Joe Stringer <joe at ovn.org>
> >> Signed-off-by: Greg Rose <gvrose8192 at gmail.com>
> >> ---
> >>   tests/system-traffic.at | 12 +++++++++++-
> >>   1 file changed, 11 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/tests/system-traffic.at b/tests/system-traffic.at
> >> index b2393f5..e83ad3a 100644
> >> --- a/tests/system-traffic.at
> >> +++ b/tests/system-traffic.at
> >> @@ -789,7 +789,7 @@ ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
> >>   AT_DATA([flows.txt], [dnl
> >>   priority=1,action=drop
> >>   priority=10,arp,action=normal
> >> -priority=100,in_port=1,udp,action=ct(commit),controller
> >> +priority=100,in_port=1,udp,action=ct(force,commit),controller
> >>   priority=100,in_port=2,ct_state=-trk,udp,action=ct(table=0)
> >>   priority=100,in_port=2,ct_state=+trk+est,udp,action=ct(force,commit,table=1)
> >>   table=1,in_port=2,ct_state=+trk,udp,action=controller
> >> @@ -826,6 +826,16 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "orig=.src=10\.1\.1\.2,"], [],
> >>   udp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1),reply=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2)
> >>   ])
> >> +ovs-appctl vlog/set dpif:dbg
> >> +
> >> +dnl OK, now send another packet from port 1 and see that it switches again
> >> +AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"])
> >> +AT_CHECK([ovs-appctl revalidator/purge], [0])
> >> +
> >> +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep "orig=.src=10\.1\.1\.1,"], [], [dnl
> >> +udp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=1,dport=2),reply=(src=10.1.1.2,dst=10.1.1.1,sport=2,dport=1)
> >> +])
> >> +
> >>   OVS_TRAFFIC_VSWITCHD_STOP
> >>   AT_CLEANUP
> >>
> > git send-email --from="joe at ovn.org" didn't work I guess.
> >
> > Joe Stringer is the author.  Sorry for the mistake.
>
> To send someone else's patch, ensure that the author is correct in the
> commit itself.  Sometimes this takes "git commit --amend
> --author='...'".  Then send it the usual way with "git send-email",
> which will leave you as the envelope sender of the email and put the
> real author as the first line "From: ...author...".
>
Right, next time no short cut attempt...

Thanks Ben.