From patchwork Fri Oct 6 15:12:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 149298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp401959vqo; Fri, 6 Oct 2023 08:14:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGi5SxSmGx7Z79BUQF4RxPFp/zeTV57sYb7d/KxCgUwZ0ynrMeXgVrjag1EmmeRKkXPnmS+ X-Received: by 2002:a17:90b:1c0f:b0:261:2824:6b8c with SMTP id oc15-20020a17090b1c0f00b0026128246b8cmr7057909pjb.13.1696605288099; Fri, 06 Oct 2023 08:14:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696605288; cv=none; d=google.com; s=arc-20160816; b=i1/lXoa3AWeQmbFg3dxBNiXCV6d3Rd/AUl/9xyDoKkeV3xFyJO8Au1yksifMCuF7MC Yeow+MpevydBuKM4x1i/kmg45rBmF968mgDkcyH2Ybyl04aFhYNravRGUtPeQpgiUSUL tJR/1OMtOAwoCRdd0k1hzsy5nBhHHsQ9L3qJ57muH6P3Rl7+AqWPXpmuSojhwvK0F+S/ Zc2y1JyRjnoB5zPsCT7Cww2v3XGI/UITWDhirAE1yD9sLolAOTWQTGvLppbko0zmj3m8 Q92yVCgOP5XJQaAHj9Btmty2uoEjgzFNJKQ3PDUQn5wVuM8kq95yRDv9dVcP4p+wy84I NdRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BBBTecis4bs5YluD0BKJX2HGCbDC8Ki7O67H1hXsk1U=; fh=MdzQONQ/gulM6swFM9amSgUVTs752ZpsSWOQLplcSFQ=; b=EOL2FERtHEPHga2i92E6YimuQWCBX1bR1NPPp4gVOLWPoAdTrapMnslG9FqNLJ/giA QZHQrXO6VN7bLiNYUbpUkLr6/L8Qj2gcJzzDN4e1O/F8UW8HKv+mQLqc8mfyC9dcuHho 2EaGwXAr1lmJNYH4/YAyTy3RWyAPCDNDaibkaAPsbCkPdKWc1Wgl8Gl6Wg1r1k22Hkyv dSXHvCv9II7ib04taG8zhVR2Ry4OJEAJ5sDqs7YcjAqXt/BqD/Q8xRJrlYuZ9iKphCXC DUlfQyhjG2HZ8t7OqaKJ/DE4Injl9O4dGMlW6mwXv20jaRfzHamGRTDkeuE//E3B+SUS Ha8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M0iBQyAw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id na14-20020a17090b4c0e00b002632a1243dbsi6644959pjb.104.2023.10.06.08.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 08:14:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M0iBQyAw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DBB29802D523; Fri, 6 Oct 2023 08:14:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232750AbjJFPOc (ORCPT + 18 others); Fri, 6 Oct 2023 11:14:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232779AbjJFPOa (ORCPT ); Fri, 6 Oct 2023 11:14:30 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78735F7 for ; Fri, 6 Oct 2023 08:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696605195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BBBTecis4bs5YluD0BKJX2HGCbDC8Ki7O67H1hXsk1U=; b=M0iBQyAwqhIQ9HRp43WbIjKDTuxXTw1A7CuPaLFgNL3+2MOY/EXZy+9Fa80EzMJgNoOcrB SLtWhuRX3vJlJ19TA0Ft6p4nZYbQaxmA11p/goPL37G/yxyONMnE9JjDSdfEmNl5ZoCunh ITE6Rc5bpdT7SkxsjPMU+InwFqNQa3g= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-22-J__u-p-BPL6NobSryWhYgw-1; Fri, 06 Oct 2023 11:13:02 -0400 X-MC-Unique: J__u-p-BPL6NobSryWhYgw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E2FF23C1E9D3; Fri, 6 Oct 2023 15:13:01 +0000 (UTC) Received: from RHTPC1VM0NT.lan (unknown [10.22.33.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65D6A40D1EA; Fri, 6 Oct 2023 15:13:01 +0000 (UTC) From: Aaron Conole To: netdev@vger.kernel.org Cc: dev@openvswitch.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Pravin B Shelar , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Adrian Moreno , Eelco Chaudron Subject: [PATCH net 4/4] selftests: openvswitch: Fix the ct_tuple for v4 Date: Fri, 6 Oct 2023 11:12:58 -0400 Message-Id: <20231006151258.983906-5-aconole@redhat.com> In-Reply-To: <20231006151258.983906-1-aconole@redhat.com> References: <20231006151258.983906-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 06 Oct 2023 08:14:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779019586797969340 X-GMAIL-MSGID: 1779019586797969340 Caught during code review. Fixes: e52b07aa1a54 ("selftests: openvswitch: add flow dump support") Signed-off-by: Aaron Conole --- tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py index 153042c1e8c13..ed7bef7ca6883 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -1119,12 +1119,14 @@ class ovskey(nla): "src", lambda x: str(ipaddress.IPv4Address(x)), int, + convert_ipv4, ), ( "dst", "dst", - lambda x: str(ipaddress.IPv6Address(x)), + lambda x: str(ipaddress.IPv4Address(x)), int, + convert_ipv4, ), ("tp_src", "tp_src", "%d", int), ("tp_dst", "tp_dst", "%d", int),