From patchwork Thu Feb 1 16:17:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1894063 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Md8fWiET; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQkd66jkVz23gD for ; Fri, 2 Feb 2024 03:19:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C2C464223A; Thu, 1 Feb 2024 16:19:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C2C464223A Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Md8fWiET X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gms706dn9yvz; Thu, 1 Feb 2024 16:19:34 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9472B4252F; Thu, 1 Feb 2024 16:18:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9472B4252F Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9685BC0DDC; Thu, 1 Feb 2024 16:18:45 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 281F7C0DD4 for ; Thu, 1 Feb 2024 16:18:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 637424223B for ; Thu, 1 Feb 2024 16:18:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 637424223B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z2bFAyvWp5VY for ; Thu, 1 Feb 2024 16:18:40 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 66F3142244 for ; Thu, 1 Feb 2024 16:18:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 66F3142244 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706804312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vwjp/5c4GuIUeemXELjeVkjKiZr3BVSLNuSw2iMDO+s=; b=Md8fWiETMWWUxx5k4tCT2WoxO62wmSzKAXwtQk4eM2zOzBgGvKKbRlM6eAFPwDi4285FBU 6LU3J4HSfMXckCTSm9u3YMXiV3hvm/gUS6D13XbLdcZQ+nPxvOb2mC7NSGREQ1rK3uC8mC 1EgLWPJ3ZB/t/jDrTNZ9jjUC24/faD0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-6MabapcWMzWXXY1ZA9WswA-1; Thu, 01 Feb 2024 11:18:30 -0500 X-MC-Unique: 6MabapcWMzWXXY1ZA9WswA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79579101376C for ; Thu, 1 Feb 2024 16:18:30 +0000 (UTC) Received: from amusil.redhat.com (unknown [10.45.224.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED476111F9; Thu, 1 Feb 2024 16:18:29 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Thu, 1 Feb 2024 17:17:56 +0100 Message-ID: <20240201161804.210604-19-amusil@redhat.com> In-Reply-To: <20240201161804.210604-1-amusil@redhat.com> References: <20240201161804.210604-1-amusil@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 18/26] tests: Add macro for OFTABLE_LOOKUP_FDB table number. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Add macro for OFTABLE_LOOKUP_FDB and replace all table=72 occurrences in OF with table=OFTABLE_LOOKUP_FDB. Signed-off-by: Ales Musil --- tests/ovn-macros.at | 1 + tests/ovn.at | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index a295dc393..7efaa633a 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -1001,3 +1001,4 @@ m4_define([OFTABLE_CHK_LB_HAIRPIN], [68]) m4_define([OFTABLE_CHK_LB_HAIRPIN_REPLY], [69]) m4_define([OFTABLE_CT_SNAT_HAIRPIN], [70]) m4_define([OFTABLE_GET_FDB], [71]) +m4_define([OFTABLE_LOOKUP_FDB], [72]) diff --git a/tests/ovn.at b/tests/ovn.at index 1f6a2aae0..35052bb35 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -31638,8 +31638,8 @@ AT_CHECK_UNQUOTED([cat hv2_offlows_table71.txt | grep -v NXST | cut -d ' ' -f8- priority=100,metadata=0x$dp_key,dl_dst=50:54:00:00:00:13 actions=load:0x$port_key->NXM_NX_REG15[[]] ]) -as hv1 ovs-ofctl dump-flows br-int table=72 > hv1_offlows_table72.txt -as hv2 ovs-ofctl dump-flows br-int table=72 > hv2_offlows_table72.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv1_offlows_table72.txt +as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv2_offlows_table72.txt AT_CAPTURE_FILE([hv1_offlows_table72.txt]) AT_CAPTURE_FILE([hv2_offlows_table72.txt]) @@ -31661,7 +31661,7 @@ wait_for_ports_up sw0-p4 check ovn-nbctl --wait=hv sync as hv3 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv3_offlows_table71.txt -as hv3 ovs-ofctl dump-flows br-int table=72 > hv3_offlows_table72.txt +as hv3 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv3_offlows_table72.txt AT_CAPTURE_FILE([hv3_offlows_table71.txt]) @@ -31714,9 +31714,9 @@ priority=100,metadata=0x$dp_key,dl_dst=50:54:00:00:00:13 actions=load:0x$port_ke priority=100,metadata=0x$dp_key,dl_dst=50:54:00:00:00:14 actions=load:0x$port_key->NXM_NX_REG15[[]] ]) -as hv1 ovs-ofctl dump-flows br-int table=72 > hv1_offlows_table72.txt -as hv2 ovs-ofctl dump-flows br-int table=72 > hv2_offlows_table72.txt -as hv3 ovs-ofctl dump-flows br-int table=72 > hv3_offlows_table72.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv1_offlows_table72.txt +as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv2_offlows_table72.txt +as hv3 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv3_offlows_table72.txt AT_CAPTURE_FILE([hv1_offlows_table72.txt]) AT_CAPTURE_FILE([hv2_offlows_table72.txt]) @@ -31907,8 +31907,8 @@ AT_CHECK([cat hv1_offlows_table71.txt | grep -v NXST], [1], [dnl AT_CHECK([cat hv2_offlows_table71.txt | grep -v NXST], [1], [dnl ]) -as hv1 ovs-ofctl dump-flows br-int table=72 > hv1_offlows_table72.txt -as hv2 ovs-ofctl dump-flows br-int table=72 > hv2_offlows_table72.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv1_offlows_table72.txt +as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB > hv2_offlows_table72.txt AT_CAPTURE_FILE([hv1_offlows_table72.txt]) AT_CAPTURE_FILE([hv2_offlows_table72.txt]) @@ -37399,7 +37399,7 @@ check_flow_count() { hv=$1 count=$2 echo "Checking flow count for $hv is $count" - OVS_WAIT_UNTIL([test $count = $(as $hv ovs-ofctl dump-flows br-int table=72 | grep -v "NXST_FLOW reply" | wc -l)]) + OVS_WAIT_UNTIL([test $count = $(as $hv ovs-ofctl dump-flows br-int table=OFTABLE_LOOKUP_FDB | grep -v "NXST_FLOW reply" | wc -l)]) } # Sending packet in both direction. Should create FDB entries for vifs