tests: Fix IPFIX test cases issue.

IPFIX statistics 'tx pkts' means the number of successfully
sending IPFIX packets, while 'tx errs' means sending error
IPFIX packets. These two parameters can be affected by whether
listening on port 4739 on local host. This case should be
solved entirely by introducing PARSE_LISTENING_PORT as sFlow,
but it depends on implementing IPFIX packet analysis and it
will take some time. Disable these field first, as IPFIX statistics
check are failed on Windows due to 'tx pkts' and 'tx errs' fields.
Windows marks all packets sending successfully, even if port 4739
on local host is not listened.

Remove XFAIL check for 'Flow IPFIX sanity check - tunnel set',
as this test had “UNEXPECTED PASS” on Windows.

More detail, please refer the following link.
https://www.mail-archive.com/dev@openvswitch.org/msg65229.html

Reported-by: Paul Boca <pboca@cloudbasesolutions.com>
Acked-by: Paul Boca <pboca@cloudbasesolutions.com>
Signed-off-by: Benli Ye <daniely@vmware.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 87f9efd..647c3ea 100644 (file)
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -6221,10 +6221,10 @@ for i in `seq 1 20`; do
 done
 
 dnl There are 4 extra IPFIX template packets.
-AT_CHECK([ovs-ofctl dump-ipfix-bridge br0], [0], [dnl
+AT_CHECK([ovs-ofctl dump-ipfix-bridge br0 | sed 's/tx pkts=[[0-9]]*/tx pkts=24/' | sed 's/tx errs=[[0-9]]*/tx errs=0/'], [0], [dnl
 NXST_IPFIX_BRIDGE reply (xid=0x2):
-  bridge ipfix: flows=20, current flows=0, sampled pkts=20, ipv4 ok=0, ipv6 ok=0, tx pkts=12
-                pkts errs=20, ipv4 errs=20, ipv6 errs=0, tx errs=12
+  bridge ipfix: flows=20, current flows=0, sampled pkts=20, ipv4 ok=0, ipv6 ok=0, tx pkts=24
+                pkts errs=20, ipv4 errs=20, ipv6 errs=0, tx errs=0
 ])
 
 dnl Remove the IPFIX configuration.
@@ -6286,7 +6286,6 @@ AT_CLEANUP
 
 dnl Flow IPFIX sanity check for tunnel set
 AT_SETUP([ofproto-dpif - Flow IPFIX sanity check - tunnel set])
-AT_XFAIL_IF([test "$IS_WIN32" = "yes"])
 OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
                     options:key=5 ofport_request=1\
@@ -6386,10 +6385,10 @@ for i in `seq 1 20`; do
 done
 
 dnl There are 4 extra IPFIX template packets.
-AT_CHECK([ovs-ofctl dump-ipfix-flow br0], [0], [dnl
+AT_CHECK([ovs-ofctl dump-ipfix-flow br0 | sed 's/tx pkts=[[0-9]]*/tx pkts=24/' | sed 's/tx errs=[[0-9]]*/tx errs=0/'], [0], [dnl
 NXST_IPFIX_FLOW reply (xid=0x2): 1 ids
-  id   1: flows=20, current flows=0, sampled pkts=20, ipv4 ok=0, ipv6 ok=0, tx pkts=12
-          pkts errs=20, ipv4 errs=20, ipv6 errs=0, tx errs=12
+  id   1: flows=20, current flows=0, sampled pkts=20, ipv4 ok=0, ipv6 ok=0, tx pkts=24
+          pkts errs=20, ipv4 errs=20, ipv6 errs=0, tx errs=0
 ])
 
 dnl Remove the flow which contains sample action.