From patchwork Fri Sep 8 18:56:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 811804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tIN5vIDl"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xpmkv49t6z9sRV for ; Sat, 9 Sep 2017 04:56:34 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 658DACB2; Fri, 8 Sep 2017 18:56:31 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 7F8A6C9F for ; Fri, 8 Sep 2017 18:56:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4394E424 for ; Fri, 8 Sep 2017 18:56:30 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id q76so1798308pfq.5 for ; Fri, 08 Sep 2017 11:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/017/ZFOUkpT1UtGByznIQH4FY+J9GpnVca6cbcmSvw=; b=tIN5vIDl24nKWigNzHsMXC5SpPhNAkElVjwsB93zecdTmsKK8FSdO3WiOGVk5x89cr w8Jjyu2TevxxennQYlOEDL76RH8pfFhO1TzHTbNA5g2z/eb4FL0du0qcHOora1FKluT8 ywbeVVHg+gnFgcEUsBfVI3SjzAKel0fB89dF2Kh2OVRyBm3POh8xtz72gqwNshCADL6s Lr4fVpXa5/J6wJ5S/1UBEdoMM5+4/0T0MOOa2547cfnR6QrT4/Y6O299LYCdI/WaciAd fFgbskVvY0BlKklXndDJmdCl6hftW+3o0HLuXAALCMvLqXMNgyHhKqi7+Ju/Yxve6IaG Slfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/017/ZFOUkpT1UtGByznIQH4FY+J9GpnVca6cbcmSvw=; b=fAFeKo0XBXIbWN486RLmpUeVvzAKel7X7LprDHSqIgLqpDqEB52vdVe1Ds/FTcMH6/ F9vEU7iJ00vdUEcWMk+vWC1NNLJAcwG2lcRtW0zCho115gAIfp40rGIqotFhNuZGde4o qz1OizfaWWApk7uO73XKHJxj2yufEq9ccG7K9ekRiqyzLiDZEorOumUdHjwOSJTN7CT8 7Fi99awcpW6FNt4NgMkNRmiLc+lQUoRCVYnkbQDu+6R6kovfQAwySrj2yYZgV4MGj+bK mpRoQAC2oYRP9r8/HF9SObpEPcLlpwKjQ4quPvsRhO1PGtuP+2fIHMqPXT+svx5cBOJP IUHQ== X-Gm-Message-State: AHPjjUgdYk0RlfC8Z/xosvx0ydOoVAgUC6EMAaU81yj9VD0w7NytkWyM fzNAj0hxP0xwai18 X-Google-Smtp-Source: ADKCNb6jWkAHrapKRun0YNVi9tE3AEp3ROfsNRjTBY5erbi4AgbbHYCjnfmqh1GG5XmTUaHerzecIw== X-Received: by 10.99.177.6 with SMTP id r6mr3928939pgf.194.1504896989512; Fri, 08 Sep 2017 11:56:29 -0700 (PDT) Received: from localhost.localdomain.localdomain ([216.113.160.70]) by smtp.gmail.com with ESMTPSA id d12sm4525085pgt.21.2017.09.08.11.56.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 11:56:29 -0700 (PDT) From: Han Zhou To: dev@openvswitch.org Date: Fri, 8 Sep 2017 11:56:20 -0700 Message-Id: <1504896980-37224-1-git-send-email-zhouhan@gmail.com> X-Mailer: git-send-email 2.1.0 X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] ovn-nbctl: fix validation logic for acl-del command X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The command error message is misleading, e.g.: $ ovn-nbctl acl-del ls1 100 'outport=="lsp1" && ip4' ovn-nbctl: cannot specify priority without match $ ovn-nbctl acl-del ls1 to-lport 'outport=="lsp1" && ip4' ovn-nbctl: cannot specify priority without match This patch fixes the problem. $ $ ovn-nbctl acl-del ls1 100 'outport=="lsp1" && ip4' Signed-off-by: Han Zhou Acked-by: Mark Michelson --- ovn/utilities/ovn-nbctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 46ede4e..8e5c1a4 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -1469,10 +1469,6 @@ nbctl_acl_del(struct ctl_context *ctx) const struct nbrec_logical_switch *ls; ls = ls_by_name_or_uuid(ctx, ctx->argv[1], true); - if (ctx->argc != 2 && ctx->argc != 3 && ctx->argc != 5) { - ctl_fatal("cannot specify priority without match"); - } - if (ctx->argc == 2) { /* If direction, priority, and match are not specified, delete * all ACLs. */ @@ -1503,6 +1499,10 @@ nbctl_acl_del(struct ctl_context *ctx) int64_t priority = parse_priority(ctx->argv[3]); + if (ctx->argc == 4) { + ctl_fatal("cannot specify priority without match"); + } + /* Remove the matching rule. */ for (size_t i = 0; i < ls->n_acls; i++) { struct nbrec_acl *acl = ls->acls[i];