From patchwork Tue Aug 21 14:18:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 960382 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vt7g5zGNz9s4v for ; Wed, 22 Aug 2018 00:18:23 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id F3E13E3E; Tue, 21 Aug 2018 14:18:20 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 2E4EEC93 for ; Tue, 21 Aug 2018 14:18:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9AC5DE6 for ; Tue, 21 Aug 2018 14:18:16 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 8B6941C000C; Tue, 21 Aug 2018 14:18:14 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Tue, 21 Aug 2018 17:18:06 +0300 Message-Id: <20180821141806.20040-1-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH] tunnel, tests: Sort flow output in ERSPAN v1/v2 metadata X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Sort the flows by input port in the test: tunnel.at:512: testing tunnel - ERSPAN v1/v2 metadata ... This tests fails on Windows due to the hash function sensitivity described in: https://mail.openvswitch.org/pipermail/ovs-dev/2018-August/350685.html Signed-off-by: Alin Gabriel Serdean Acked-by: Ben Pfaff Acked-by: William Tu --- tests/tunnel.at | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/tunnel.at b/tests/tunnel.at index ae379db12..f5f7afb0a 100644 --- a/tests/tunnel.at +++ b/tests/tunnel.at @@ -583,9 +583,8 @@ dnl test wildcard mask: recevie all v2 regardless of its metadata AT_CHECK([ovs-ofctl del-flows br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=1,tun_erspan_hwid=0xf/0x1]) AT_CHECK([ovs-ofctl add-flow br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=0/0,tun_erspan_hwid=0x0/0x0,actions=2]) -AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], +AT_CHECK([ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip], [0], [dnl -NXST_FLOW reply: in_port=1 actions=output:3 in_port=2 actions=output:4 tun_erspan_ver=1,tun_erspan_idx=0x7,in_port=3 actions=output:1