| Message ID | CAPWQB7FZdYqGSVCYaQpy1x3SkXg_5qbFVwcr_q5oOjLVzpbG7w@mail.gmail.com |
|---|---|
| State | Not Applicable |
| Headers | show |
> On Apr 27, 2017, at 4:55 PM, Joe Stringer <joe@ovn.org> wrote: > > On 10 March 2017 at 16:10, Jarno Rajahalme <jarno@ovn.org> wrote: >> Normally ICMPP responses are in the reply direction of a conntrack > > 's/ICMPP/ICMP/' > >> entry. This test exercises an ICMP response to the original direction >> of the conntrack entry. >> >> Signed-off-by: Jarno Rajahalme <jarno@ovn.org> >> --- > > Somehow this slipped past my radar. Might want to roll in the > incremental I posted below, but otherwise LGTM. > > Acked-by: Joe Stringer <joe@ovn.org> > Thanks for the review! Applied to master, Jarno > diff --git a/tests/system-traffic.at b/tests/system-traffic.at > index 62eb7bda7e31..f66ed10501a5 100644 > --- a/tests/system-traffic.at > +++ b/tests/system-traffic.at > @@ -1392,7 +1392,7 @@ priority=1,action=drop > table=1,ip,action=ct(zone=34673,table=2) > table=2,in_port=2,udp,action=ct(commit,zone=34673),1 > table=2,in_port=1,udp,action=ct(commit,zone=34673),2 > -table=2,in_port=2,icmp,action=1 > +table=2,in_port=2,ct_state=+rel,icmp,action=1 > ]) > > AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) > @@ -1421,7 +1421,7 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip > | sort | grep -v drop], [0], [d > table=1, n_packets=4, n_bytes=224, ip actions=ct(table=2,zone=34673) > table=2, n_packets=1, n_bytes=42, udp,in_port=1 > actions=ct(commit,zone=34673),output:2 > table=2, n_packets=1, n_bytes=42, udp,in_port=2 > actions=ct(commit,zone=34673),output:1 > - table=2, n_packets=2, n_bytes=140, icmp,in_port=2 actions=output:1 > + table=2, n_packets=2, n_bytes=140, ct_state=+rel,icmp,in_port=2 > actions=output:1 > NXST_FLOW reply: > ])
diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 62eb7bda7e31..f66ed10501a5 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -1392,7 +1392,7 @@ priority=1,action=drop table=1,ip,action=ct(zone=34673,table=2) table=2,in_port=2,udp,action=ct(commit,zone=34673),1 table=2,in_port=1,udp,action=ct(commit,zone=34673),2 -table=2,in_port=2,icmp,action=1 +table=2,in_port=2,ct_state=+rel,icmp,action=1 ]) AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt]) @@ -1421,7 +1421,7 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort | grep -v drop], [0], [d table=1, n_packets=4, n_bytes=224, ip actions=ct(table=2,zone=34673) table=2, n_packets=1, n_bytes=42, udp,in_port=1 actions=ct(commit,zone=34673),output:2 table=2, n_packets=1, n_bytes=42, udp,in_port=2 actions=ct(commit,zone=34673),output:1 - table=2, n_packets=2, n_bytes=140, icmp,in_port=2 actions=output:1 + table=2, n_packets=2, n_bytes=140, ct_state=+rel,icmp,in_port=2