[ovs-dev] [PATCH v3 3/6] Adding nsh.at for NSH unit tests

[Yang, Yi Y]

Fixed in the new version v4.

https://mail.openvswitch.org/pipermail/ovs-dev/2017-August/336864.html



-----Original Message-----
From: Ben Pfaff [mailto:blp at ovn.org] 
Sent: Saturday, August 5, 2017 4:11 AM
To: Yang, Yi Y <yi.y.yang at intel.com>
Cc: dev at openvswitch.org; Jan Scheurich <jan.scheurich at ericsson.com>
Subject: Re: [PATCH v3 3/6] Adding nsh.at for NSH unit tests

On Thu, Aug 03, 2017 at 09:14:57AM +0800, Yi Yang wrote:
> From: Jan Scheurich <jan.scheurich at ericsson.com>
> 
> 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 <jan.scheurich at ericsson.com>

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:5
+4:00:00:00:05,dl_dst=50:54:00:00:00:07,nw_src=192.168.0.1,nw_dst=192.16
+8.0.2,nw_tos=0,nw_ecn=0,nw_ttl=128,icmp_type=8,icmp_code=0
 ])
 
 OVS_VSWITCHD_STOP