From patchwork Fri Aug 20 18:38:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Numan Siddique X-Patchwork-Id: 1519151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Grr4W6ky8z9s1l for ; Sat, 21 Aug 2021 04:38:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A0429400EE; Fri, 20 Aug 2021 18:38:32 +0000 (UTC) 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 RtY5dfsfxm3z; Fri, 20 Aug 2021 18:38:28 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id A936740113; Fri, 20 Aug 2021 18:38:27 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 75B34C0010; Fri, 20 Aug 2021 18:38:27 +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 D1D43C000E for ; Fri, 20 Aug 2021 18:38:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BB38542500 for ; Fri, 20 Aug 2021 18:38:25 +0000 (UTC) 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 lVwPH0eM-Rmn for ; Fri, 20 Aug 2021 18:38:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp4.osuosl.org (Postfix) with ESMTPS id AEE0340820 for ; Fri, 20 Aug 2021 18:38:22 +0000 (UTC) Received: (Authenticated sender: numans@ovn.org) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 3E2231BF203; Fri, 20 Aug 2021 18:38:18 +0000 (UTC) From: numans@ovn.org To: dev@openvswitch.org Date: Fri, 20 Aug 2021 14:38:07 -0400 Message-Id: <20210820183807.975918-1-numans@ovn.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn] Fix the test case "ACL label usage" for northd-ddlog. 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" From: Numan Siddique Commit in the fixes tag added an extra space in the action causing the test case to fail. Fixes: b5b434b4d49("Intern all the matches and actions.") Signed-off-by: Numan Siddique Acked-by: Mark Michelson --- northd/ovn_northd.dl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/northd/ovn_northd.dl b/northd/ovn_northd.dl index 9cf4c373b..38a0f79d4 100644 --- a/northd/ovn_northd.dl +++ b/northd/ovn_northd.dl @@ -2819,7 +2819,7 @@ for (&SwitchACL(.sw = sw, .acl = acl, .has_fair_meter = fair_meter)) { */ var __action = if (acl.label != 0) { i"${rEGBIT_CONNTRACK_COMMIT()} = 1; ${rEGBIT_ACL_LABEL()} = 1; " - " ${rEG_LABEL()} = ${acl.label}; ${acl_log}next;" + "${rEG_LABEL()} = ${acl.label}; ${acl_log}next;" } else { i"${rEGBIT_CONNTRACK_COMMIT()} = 1; ${acl_log}next;" } in Flow(.logical_datapath = sw._uuid,