On Thu, Aug 03, 2017 at 09:14:57AM +0800, Yi Yang wrote: > From: Jan Scheurich <[email protected]> > > First basic NSH test case implemented and working. > > Unconditionally show matched packet_type in megaflows, even when > matching on eth. > > Signed-off-by: Jan Scheurich <[email protected]>
I needed to add the following to fix one remaining test (maybe because it was added recently). Please fold it in. --8<--------------------------cut here-------------------------->8-- diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 8aaa1d264ff7..284a65ec6524 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -4785,7 +4785,7 @@ AT_CHECK([grep "Final flow:" stdout], [0], [Final flow: icmp,tun_id=0x6,in_port= ]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy "$flow,recirc_id(1)" -generate], [0], [stdout]) -AT_CHECK([grep "Final flow:" stdout], [0], [Final flow: recirc_id=0x1,icmp,tun_id=0x6,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=128,icmp_type=8,icmp_code=0 +AT_CHECK([grep "Final flow:" stdout], [0], [Final flow: recirc_id=0x1,eth,icmp,tun_id=0x6,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_tos=0,nw_ecn=0,nw_ttl=128,icmp_type=8,icmp_code=0 ]) OVS_VSWITCHD_STOP _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
