From patchwork Tue Feb 6 09:40:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1895591 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=VaicC0OX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4TTdYq2Btbz23g2 for ; Tue, 6 Feb 2024 20:41:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4BF4C8218E; Tue, 6 Feb 2024 09:41:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sTSNGV8Ko7Ck; Tue, 6 Feb 2024 09:41:47 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5E4488224C Authentication-Results: smtp1.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=VaicC0OX Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5E4488224C; Tue, 6 Feb 2024 09:41:23 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id EEB08C0E09; Tue, 6 Feb 2024 09:41:08 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2D66EC0DDA for ; Tue, 6 Feb 2024 09:41:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B4F7D82115 for ; Tue, 6 Feb 2024 09:41:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xpUUr1lycKUy for ; Tue, 6 Feb 2024 09:41:00 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=amusil@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 7208782108 Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7208782108 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7208782108 for ; Tue, 6 Feb 2024 09:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707212459; 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=jUx03zRcGIORQzN9996/h7iWaj6HmRQHRbSNO6rYKO8=; b=VaicC0OX1QFnMKNTVzokLKOaZXlVQ7piY2aG04nzWkvl3fclYmwQrqFE6g/ENbScauR1YV ghDk7dkB5yT8lXx5mpqggt57iZYCo/k7crXeXJQ+sTPT6EiF//voZtpBKd82RWJTjCXg6b r6qze+pNbDdJKjYZ90JU674T/tKdjCE= 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-500-i_Sp_xs-PqWZIZ5xElRbDw-1; Tue, 06 Feb 2024 04:40:57 -0500 X-MC-Unique: i_Sp_xs-PqWZIZ5xElRbDw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 848E610201EC for ; Tue, 6 Feb 2024 09:40:57 +0000 (UTC) Received: from amusil.brq.redhat.com (unknown [10.43.17.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1083D492BF0; Tue, 6 Feb 2024 09:40:56 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Tue, 6 Feb 2024 10:40:32 +0100 Message-ID: <20240206094043.530335-19-amusil@redhat.com> In-Reply-To: <20240206094043.530335-1-amusil@redhat.com> References: <20240206094043.530335-1-amusil@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn v2 18/29] tests: Add macro for OFTABLE_GET_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_GET_FDB and replace all table=71 occurrences in OF with table=OFTABLE_GET_FDB. Signed-off-by: Ales Musil --- tests/ovn-macros.at | 1 + tests/ovn.at | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 392f220cc..ecb46a80b 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -1001,3 +1001,4 @@ m4_define([OFTABLE_MAC_LOOKUP], [67]) 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]) diff --git a/tests/ovn.at b/tests/ovn.at index f648fef2d..82e2b0532 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -31625,8 +31625,8 @@ check_column $sw0p1_dpkey fdb port_key # Make sure that OVS tables 71 and 72 are populated on both hv1 and hv2. AS_BOX([Check that ovn-controller programs the flows for FDB]) -as hv1 ovs-ofctl dump-flows br-int table=71 > hv1_offlows_table71.txt -as hv2 ovs-ofctl dump-flows br-int table=71 > hv2_offlows_table71.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv1_offlows_table71.txt +as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv2_offlows_table71.txt AT_CAPTURE_FILE([hv1_offlows_table71.txt]) AT_CAPTURE_FILE([hv2_offlows_table71.txt]) @@ -31660,7 +31660,7 @@ wait_for_ports_up sw0-p4 #as hv3 ovn-appctl -t ovn-controller recompute check ovn-nbctl --wait=hv sync -as hv3 ovs-ofctl dump-flows br-int table=71 > hv3_offlows_table71.txt +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 @@ -31692,9 +31692,9 @@ check_column "$sw0_dpkey $sw0_dpkey" fdb dp_key check_column "$sw0p1_dpkey $sw0p1_dpkey" fdb port_key # Make sure that OVS tables 71 and 72 are populated on hv1, hv2 and hv3. -as hv1 ovs-ofctl dump-flows br-int table=71 > hv1_offlows_table71.txt -as hv2 ovs-ofctl dump-flows br-int table=71 > hv2_offlows_table71.txt -as hv3 ovs-ofctl dump-flows br-int table=71 > hv3_offlows_table71.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv1_offlows_table71.txt +as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv2_offlows_table71.txt +as hv3 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv3_offlows_table71.txt AT_CAPTURE_FILE([hv1_offlows_table71.txt]) AT_CAPTURE_FILE([hv2_offlows_table71.txt]) @@ -31896,8 +31896,8 @@ OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [expected]) OVN_CHECK_PACKETS([hv1/vif3-tx.pcap], [expected]) # Make sure that OVS tables 71 and 72 are empty. -as hv1 ovs-ofctl dump-flows br-int table=71 > hv1_offlows_table71.txt -as hv2 ovs-ofctl dump-flows br-int table=71 > hv2_offlows_table71.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv1_offlows_table71.txt +as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_GET_FDB > hv2_offlows_table71.txt AT_CAPTURE_FILE([hv1_offlows_table71.txt]) AT_CAPTURE_FILE([hv2_offlows_table71.txt])