{"id":811804,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811804/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504896980-37224-1-git-send-email-zhouhan@gmail.com/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/1.2/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504896980-37224-1-git-send-email-zhouhan@gmail.com>","list_archive_url":null,"date":"2017-09-08T18:56:20","name":"[ovs-dev] ovn-nbctl: fix validation logic for acl-del command","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1807ec75686aa00f450eda9446daad1db4690931","submitter":{"id":67381,"url":"http://patchwork.ozlabs.org/api/1.2/people/67381/?format=json","name":"Han Zhou","email":"zhouhan@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/1504896980-37224-1-git-send-email-zhouhan@gmail.com/mbox/","series":[{"id":2277,"url":"http://patchwork.ozlabs.org/api/1.2/series/2277/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=2277","date":"2017-09-08T18:56:20","name":"[ovs-dev] ovn-nbctl: fix validation logic for acl-del command","version":1,"mbox":"http://patchwork.ozlabs.org/series/2277/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811804/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811804/checks/","tags":{},"related":[],"headers":{"Return-Path":"<ovs-dev-bounces@openvswitch.org>","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"tIN5vIDl\"; dkim-atps=neutral"],"Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpmkv49t6z9sRV\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat,  9 Sep 2017 04:56:34 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 658DACB2;\n\tFri,  8 Sep 2017 18:56:31 +0000 (UTC)","from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 7F8A6C9F\n\tfor <dev@openvswitch.org>; Fri,  8 Sep 2017 18:56:30 +0000 (UTC)","from mail-pf0-f194.google.com (mail-pf0-f194.google.com\n\t[209.85.192.194])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4394E424\n\tfor <dev@openvswitch.org>; Fri,  8 Sep 2017 18:56:30 +0000 (UTC)","by mail-pf0-f194.google.com with SMTP id q76so1798308pfq.5\n\tfor <dev@openvswitch.org>; Fri, 08 Sep 2017 11:56:30 -0700 (PDT)","from localhost.localdomain.localdomain ([216.113.160.70])\n\tby smtp.gmail.com with ESMTPSA id\n\td12sm4525085pgt.21.2017.09.08.11.56.28\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 08 Sep 2017 11:56:29 -0700 (PDT)"],"X-Greylist":"whitelisted by SQLgrey-1.7.6","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id;\n\tbh=/017/ZFOUkpT1UtGByznIQH4FY+J9GpnVca6cbcmSvw=;\n\tb=tIN5vIDl24nKWigNzHsMXC5SpPhNAkElVjwsB93zecdTmsKK8FSdO3WiOGVk5x89cr\n\tw8Jjyu2TevxxennQYlOEDL76RH8pfFhO1TzHTbNA5g2z/eb4FL0du0qcHOora1FKluT8\n\tywbeVVHg+gnFgcEUsBfVI3SjzAKel0fB89dF2Kh2OVRyBm3POh8xtz72gqwNshCADL6s\n\tLr4fVpXa5/J6wJ5S/1UBEdoMM5+4/0T0MOOa2547cfnR6QrT4/Y6O299LYCdI/WaciAd\n\tfFgbskVvY0BlKklXndDJmdCl6hftW+3o0HLuXAALCMvLqXMNgyHhKqi7+Ju/Yxve6IaG\n\tSlfw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=/017/ZFOUkpT1UtGByznIQH4FY+J9GpnVca6cbcmSvw=;\n\tb=fAFeKo0XBXIbWN486RLmpUeVvzAKel7X7LprDHSqIgLqpDqEB52vdVe1Ds/FTcMH6/\n\tF9vEU7iJ00vdUEcWMk+vWC1NNLJAcwG2lcRtW0zCho115gAIfp40rGIqotFhNuZGde4o\n\tqz1OizfaWWApk7uO73XKHJxj2yufEq9ccG7K9ekRiqyzLiDZEorOumUdHjwOSJTN7CT8\n\t7Fi99awcpW6FNt4NgMkNRmiLc+lQUoRCVYnkbQDu+6R6kovfQAwySrj2yYZgV4MGj+bK\n\tmpRoQAC2oYRP9r8/HF9SObpEPcLlpwKjQ4quPvsRhO1PGtuP+2fIHMqPXT+svx5cBOJP\n\tIUHQ==","X-Gm-Message-State":"AHPjjUgdYk0RlfC8Z/xosvx0ydOoVAgUC6EMAaU81yj9VD0w7NytkWyM\n\tfzNAj0hxP0xwai18","X-Google-Smtp-Source":"ADKCNb6jWkAHrapKRun0YNVi9tE3AEp3ROfsNRjTBY5erbi4AgbbHYCjnfmqh1GG5XmTUaHerzecIw==","X-Received":"by 10.99.177.6 with SMTP id r6mr3928939pgf.194.1504896989512;\n\tFri, 08 Sep 2017 11:56:29 -0700 (PDT)","From":"Han Zhou <zhouhan@gmail.com>","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,\n\tDKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM\n\tautolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Subject":"[ovs-dev] [PATCH] ovn-nbctl: fix validation logic for acl-del\n\tcommand","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"<ovs-dev.openvswitch.org>","List-Unsubscribe":"<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n\t<mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>","List-Archive":"<http://mail.openvswitch.org/pipermail/ovs-dev/>","List-Post":"<mailto:ovs-dev@openvswitch.org>","List-Help":"<mailto:ovs-dev-request@openvswitch.org?subject=help>","List-Subscribe":"<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n\t<mailto:ovs-dev-request@openvswitch.org?subject=subscribe>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"The command error message is misleading, e.g.:\n\n$ ovn-nbctl acl-del ls1 100 'outport==\"lsp1\" && ip4'\novn-nbctl: cannot specify priority without match\n\n$ ovn-nbctl acl-del ls1 to-lport 'outport==\"lsp1\" && ip4'\novn-nbctl: cannot specify priority without match\n\nThis patch fixes the problem.\n$\n$ ovn-nbctl acl-del ls1 100 'outport==\"lsp1\" && ip4'\n\nSigned-off-by: Han Zhou <zhouhan@gmail.com>\n---\n ovn/utilities/ovn-nbctl.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c\nindex 46ede4e..8e5c1a4 100644\n--- a/ovn/utilities/ovn-nbctl.c\n+++ b/ovn/utilities/ovn-nbctl.c\n@@ -1469,10 +1469,6 @@ nbctl_acl_del(struct ctl_context *ctx)\n     const struct nbrec_logical_switch *ls;\n     ls = ls_by_name_or_uuid(ctx, ctx->argv[1], true);\n \n-    if (ctx->argc != 2 && ctx->argc != 3 && ctx->argc != 5) {\n-        ctl_fatal(\"cannot specify priority without match\");\n-    }\n-\n     if (ctx->argc == 2) {\n         /* If direction, priority, and match are not specified, delete\n          * all ACLs. */\n@@ -1503,6 +1499,10 @@ nbctl_acl_del(struct ctl_context *ctx)\n \n     int64_t priority = parse_priority(ctx->argv[3]);\n \n+    if (ctx->argc == 4) {\n+        ctl_fatal(\"cannot specify priority without match\");\n+    }\n+\n     /* Remove the matching rule. */\n     for (size_t i = 0; i < ls->n_acls; i++) {\n         struct nbrec_acl *acl = ls->acls[i];\n","prefixes":["ovs-dev"]}