From patchwork Thu Feb 1 16:17:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1894057 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=bjATg0Os; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4TQkcV4FK8z23gD for ; Fri, 2 Feb 2024 03:19:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5FFCC437A1; Thu, 1 Feb 2024 16:19:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5FFCC437A1 Authentication-Results: smtp2.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=bjATg0Os X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t0bheM51KSf0; Thu, 1 Feb 2024 16:19:02 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9BE314373A; Thu, 1 Feb 2024 16:18:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9BE314373A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CA2FAC0E06; Thu, 1 Feb 2024 16:18:33 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1994EC0DE7 for ; Thu, 1 Feb 2024 16:18:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 51E6042232 for ; Thu, 1 Feb 2024 16:18:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 51E6042232 Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bjATg0Os 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 7PjjAveeUbC0 for ; Thu, 1 Feb 2024 16:18:25 +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 6FC5442211 for ; Thu, 1 Feb 2024 16:18:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6FC5442211 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706804304; 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=TiXXB0ri2KTaB7IttH3I8BsL3wtEhPn/Tlg6yNmAbBs=; b=bjATg0OszSX95A9Nmv296bsBzUKBIdNsj2864dT6QgQ6xEFMIzhJIzwaHWobjq9/STNm0t wqLFBs96DLIcEM8FQq9749YHz+asjBtCGgET6W2jf5RcEEKSqVgVZMge0H0Uq2mHTUT7Er 1DnqryFO8BRNxswqY0Zsnzfe9ml2wZo= 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-127-ptUFTQBXPQ6fO4UvReYKyA-1; Thu, 01 Feb 2024 11:18:22 -0500 X-MC-Unique: ptUFTQBXPQ6fO4UvReYKyA-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 AB914101376B for ; Thu, 1 Feb 2024 16:18:22 +0000 (UTC) Received: from amusil.redhat.com (unknown [10.45.224.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC590111F9; Thu, 1 Feb 2024 16:18:21 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Thu, 1 Feb 2024 17:17:50 +0100 Message-ID: <20240201161804.210604-13-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 12/26] 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 4f2b8196d..a9d8b310e 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -995,3 +995,4 @@ m4_define([OFTABLE_OUTPUT_LARGE_PKT_DETECT], [37]) 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 68c8e836a..655e8e602 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