From patchwork Tue Feb 6 09:40:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1895593 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=ZY+HZB/t; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::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 4TTdZ55NZYz23g2 for ; Tue, 6 Feb 2024 20:42:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5796242134; Tue, 6 Feb 2024 09:42:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5796242134 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=ZY+HZB/t 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 2XpbM2ImwAAR; Tue, 6 Feb 2024 09:42:01 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id D42A941E44; Tue, 6 Feb 2024 09:41:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D42A941E44 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A16C1C0DCE; Tue, 6 Feb 2024 09:41:07 +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 38A89C0E04 for ; Tue, 6 Feb 2024 09:41:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 320B6820B6 for ; Tue, 6 Feb 2024 09:41:00 +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 Ke72tHvRL9GT for ; Tue, 6 Feb 2024 09:40:58 +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 7C6B28210C 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 7C6B28210C Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZY+HZB/t 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 7C6B28210C for ; Tue, 6 Feb 2024 09:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707212456; 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=B7hHg4yWa8vPXv5nhh03ZGe+rkrpMYp5Abu5l+2i3Lc=; b=ZY+HZB/tgOWZuWqimhAXO+ON+V8ysxNtDMRFp1/purMGnJAqCdodr/GnqNzvl1iYGwOeEm IzMUvSFmTGmcO+RvFKjd24sYzoT3NRTd0TpMN1Gp7xA9l+hcmfiEtKwq6kPLGBodeIIcNf ep+1B7vkcuU20acSvvJMqbVQasie3qM= 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-376-h2GRrAWFOJGk71lk7Zy_jA-1; Tue, 06 Feb 2024 04:40:54 -0500 X-MC-Unique: h2GRrAWFOJGk71lk7Zy_jA-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 0FF71879844 for ; Tue, 6 Feb 2024 09:40:54 +0000 (UTC) Received: from amusil.brq.redhat.com (unknown [10.43.17.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90368492BF0; Tue, 6 Feb 2024 09:40:53 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Tue, 6 Feb 2024 10:40:27 +0100 Message-ID: <20240206094043.530335-14-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 13/29] tests: Add macro for OFTABLE_MAC_BINDING 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_MAC_BINDING and replace all table=66 occurrences in OF with table=OFTABLE_MAC_BINDING. Signed-off-by: Ales Musil --- tests/ovn-macros.at | 1 + tests/ovn.at | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 8d00c7729..6550f0cf4 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -996,3 +996,4 @@ m4_define([OFTABLE_OUTPUT_LARGE_PKT_PROCESS], [38]) m4_define([OFTABLE_REMOTE_OUTPUT], [39]) m4_define([OFTABLE_LOCAL_OUTPUT], [40]) m4_define([OFTABLE_LOG_TO_PHY], [65]) +m4_define([OFTABLE_MAC_BINDING], [66]) diff --git a/tests/ovn.at b/tests/ovn.at index 80ad679f3..10fed0281 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -11579,7 +11579,7 @@ test_ip_packet() AT_CAPTURE_FILE([offlows]) OVS_WAIT_UNTIL([ as $active_gw ovs-ofctl dump-flows br-int > offlows - test `grep table=66 offlows | grep actions=mod_dl_dst:f0:00:00:01:02:04 | wc -l` -eq 1 + test `grep table=OFTABLE_MAC_BINDING offlows | grep actions=mod_dl_dst:f0:00:00:01:02:04 | wc -l` -eq 1 ]) # Packet to Expect at ext1 chassis, outside1 port @@ -11842,7 +11842,7 @@ test_ip_packet() check as ext1 ovs-appctl netdev-dummy/receive ext1-vif1 $arp_reply OVS_WAIT_UNTIL([ - test `as $active_gw ovs-ofctl dump-flows br-int | grep table=66 | \ + test `as $active_gw ovs-ofctl dump-flows br-int | grep table=OFTABLE_MAC_BINDING | \ grep actions=mod_dl_dst:f0:00:00:01:02:04 | wc -l` -eq 1 ]) @@ -12554,7 +12554,7 @@ packet=${foo_mac}${foo1_mac}080045000028000000004006a916${foo1_ip}${dst_ip}00351 AS_BOX([Wait for GARPs announcing gw IP to arrive]) OVS_WAIT_UNTIL([ - test `as hv2 ovs-ofctl dump-flows br-int | grep table=66 | \ + test `as hv2 ovs-ofctl dump-flows br-int | grep table=OFTABLE_MAC_BINDING | \ grep actions=mod_dl_dst:f0:00:00:01:02:04 | wc -l` -eq 1 ]) @@ -31834,7 +31834,7 @@ ovn-sbctl create mac_binding ip=10.0.0.14 logical_port=lr0-sw0 \ mac="50\:54\:00\:00\:00\:14" datapath=$lr0_dp_uuid # Wait till the mac_binding flows appear in hv1 -OVS_WAIT_UNTIL([test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=66 \ +OVS_WAIT_UNTIL([test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_MAC_BINDING \ | grep -c reg0=0xa00000e)]) src_mac=405400000004 @@ -34118,7 +34118,7 @@ ovn-nbctl --wait=hv lr-route-add lr0 0.0.0.0/0 172.16.1.1 test_mac_binding_flows() { local priority=$1 mac=$2 count=$3 - OVS_WAIT_UNTIL([test $(ovs-ofctl dump-flows br-int | grep table=66 | grep priority=${priority} | grep actions=mod_dl_dst:${mac} | wc -l) -eq ${count}]) + OVS_WAIT_UNTIL([test $(ovs-ofctl dump-flows br-int | grep table=OFTABLE_MAC_BINDING | grep priority=${priority} | grep actions=mod_dl_dst:${mac} | wc -l) -eq ${count}]) } # Create SB MAC_Binding entry on external gateway port lr0_dp_uuid=$(fetch_column datapath_binding _uuid external_ids:name=lr0) @@ -34216,7 +34216,7 @@ check ovn-nbctl --wait=sb sync test_mac_binding_flows() { local hv=$1 mac=$2 count=$3 - OVS_WAIT_UNTIL([test $(as $hv ovs-ofctl dump-flows br-int | grep table=66 | grep priority=100 | grep -c actions=mod_dl_dst:${mac}) -eq ${count}]) + OVS_WAIT_UNTIL([test $(as $hv ovs-ofctl dump-flows br-int | grep table=OFTABLE_MAC_BINDING | grep priority=100 | grep -c actions=mod_dl_dst:${mac}) -eq ${count}]) } # Create SB MAC_Binding entry on external gateway port