| Message ID | 20210609133611.2013-1-martinvarghesenokia@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] tests: Fixed L3 over patch port tests | expand |
LGTM. Acked-by: Jan Scheurich <jan.scheurich@ericsson.com> > -----Original Message----- > From: Martin Varghese <martinvarghesenokia@gmail.com> > Sent: Wednesday, 9 June, 2021 15:36 > To: dev@openvswitch.org; i.maximets@ovn.org; Jan Scheurich > <jan.scheurich@ericsson.com> > Cc: Martin Varghese <martin.varghese@nokia.com> > Subject: [PATCH] tests: Fixed L3 over patch port tests > > From: Martin Varghese <martin.varghese@nokia.com> > > Normal action is replaced with output to GRE port for sending > l3 packets over GRE tunnel. Normal action cannot be used with > l3 packets. > > Fixes: d03d0cf2b71b ("tests: Extend PTAP unit tests with decap action") > Signed-off-by: Martin Varghese <martin.varghese@nokia.com> > --- > tests/packet-type-aware.at | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/packet-type-aware.at b/tests/packet-type-aware.at index > 540cf98f3..73aa14cea 100644 > --- a/tests/packet-type-aware.at > +++ b/tests/packet-type-aware.at > @@ -697,7 +697,7 @@ AT_CHECK([ > ovs-ofctl del-flows br1 && > ovs-ofctl del-flows br2 && > ovs-ofctl add-flow br0 in_port=n0,actions=decap,output=p0 -OOpenFlow13 > && > - ovs-ofctl add-flow br1 in_port=p1,actions=NORMAL && > + ovs-ofctl add-flow br1 in_port=p1,actions=output=gre1 && > ovs-ofctl add-flow br2 in_port=LOCAL,actions=output=n2 ], [0]) > > @@ -708,7 +708,7 @@ AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br0 | > ofctl_strip | grep actions], > > AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br1 | ofctl_strip | grep > actions], [0], [dnl > - reset_counts in_port=20 actions=NORMAL > + reset_counts in_port=20 actions=output:100 > ]) > > AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br2 | ofctl_strip | grep > actions], @@ -726,7 +726,7 @@ ovs-appctl time/warp 1000 AT_CHECK([ > ovs-appctl dpctl/dump-flows --names dummy@ovs-dummy | strip_used | > grep -v ipv6 | sort ], [0], [flow-dump from the main thread: > - > recirc_id(0),in_port(n0),packet_type(ns=0,id=0),eth(src=3a:6d:d2:09:9c:ab,dst=1 > e:2c:e9:2a:66:9e),eth_type(0x0800),ipv4(tos=0/0x3,frag=no), packets:1, > bytes:98, used:0.0s, > actions:pop_eth,clone(tnl_push(tnl_port(gre_sys),header(size=38,type=3,eth(dst > =de:af:be:ef:ba:be,src=aa:55:00:00:00:02,dl_type=0x0800),ipv4(src=10.0.0.1,dst > =10.0.0.2,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x0,proto=0x800))),out > _port(br2)),n2) > +recirc_id(0),in_port(n0),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(t > +os=0/0x3,frag=no), packets:1, bytes:98, used:0.0s, > +actions:pop_eth,clone(tnl_push(tnl_port(gre_sys),header(size=38,type=3, > +eth(dst=de:af:be:ef:ba:be,src=aa:55:00:00:00:02,dl_type=0x0800),ipv4(sr > +c=10.0.0.1,dst=10.0.0.2,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0 > +x0,proto=0x800))),out_port(br2)),n2) > ]) > > AT_CHECK([ > -- > 2.18.4
On 6/9/21 3:59 PM, Jan Scheurich wrote: > LGTM. > Acked-by: Jan Scheurich <jan.scheurich@ericsson.com> > >> -----Original Message----- >> From: Martin Varghese <martinvarghesenokia@gmail.com> >> Sent: Wednesday, 9 June, 2021 15:36 >> To: dev@openvswitch.org; i.maximets@ovn.org; Jan Scheurich >> <jan.scheurich@ericsson.com> >> Cc: Martin Varghese <martin.varghese@nokia.com> >> Subject: [PATCH] tests: Fixed L3 over patch port tests >> >> From: Martin Varghese <martin.varghese@nokia.com> >> >> Normal action is replaced with output to GRE port for sending >> l3 packets over GRE tunnel. Normal action cannot be used with >> l3 packets. >> >> Fixes: d03d0cf2b71b ("tests: Extend PTAP unit tests with decap action") >> Signed-off-by: Martin Varghese <martin.varghese@nokia.com> >> --- >> tests/packet-type-aware.at | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) Thanks! Applied to master. Best regards, Ilya Maximets.
diff --git a/tests/packet-type-aware.at b/tests/packet-type-aware.at index 540cf98f3..73aa14cea 100644 --- a/tests/packet-type-aware.at +++ b/tests/packet-type-aware.at @@ -697,7 +697,7 @@ AT_CHECK([ ovs-ofctl del-flows br1 && ovs-ofctl del-flows br2 && ovs-ofctl add-flow br0 in_port=n0,actions=decap,output=p0 -OOpenFlow13 && - ovs-ofctl add-flow br1 in_port=p1,actions=NORMAL && + ovs-ofctl add-flow br1 in_port=p1,actions=output=gre1 && ovs-ofctl add-flow br2 in_port=LOCAL,actions=output=n2 ], [0]) @@ -708,7 +708,7 @@ AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br0 | ofctl_strip | grep actions], AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br1 | ofctl_strip | grep actions], [0], [dnl - reset_counts in_port=20 actions=NORMAL + reset_counts in_port=20 actions=output:100 ]) AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br2 | ofctl_strip | grep actions], @@ -726,7 +726,7 @@ ovs-appctl time/warp 1000 AT_CHECK([ ovs-appctl dpctl/dump-flows --names dummy@ovs-dummy | strip_used | grep -v ipv6 | sort ], [0], [flow-dump from the main thread: -recirc_id(0),in_port(n0),packet_type(ns=0,id=0),eth(src=3a:6d:d2:09:9c:ab,dst=1e:2c:e9:2a:66:9e),eth_type(0x0800),ipv4(tos=0/0x3,frag=no), packets:1, bytes:98, used:0.0s, actions:pop_eth,clone(tnl_push(tnl_port(gre_sys),header(size=38,type=3,eth(dst=de:af:be:ef:ba:be,src=aa:55:00:00:00:02,dl_type=0x0800),ipv4(src=10.0.0.1,dst=10.0.0.2,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x0,proto=0x800))),out_port(br2)),n2) +recirc_id(0),in_port(n0),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(tos=0/0x3,frag=no), packets:1, bytes:98, used:0.0s, actions:pop_eth,clone(tnl_push(tnl_port(gre_sys),header(size=38,type=3,eth(dst=de:af:be:ef:ba:be,src=aa:55:00:00:00:02,dl_type=0x0800),ipv4(src=10.0.0.1,dst=10.0.0.2,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x0,proto=0x800))),out_port(br2)),n2) ]) AT_CHECK([