From patchwork Thu Aug 1 17:38:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1140657 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; dmarc=fail (p=none dis=none) header.from=redhat.com 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 45zyGp42Zlz9s7T for ; Fri, 2 Aug 2019 03:39:45 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7BDD12F99; Thu, 1 Aug 2019 17:39:40 +0000 (UTC) X-Original-To: ovs-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 7DB6F29C5 for ; Thu, 1 Aug 2019 17:38:57 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id EE98E821 for ; Thu, 1 Aug 2019 17:38:56 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id p13so74441558wru.10 for ; Thu, 01 Aug 2019 10:38:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pk/Xqh7pINB9kxdcB6UwdSeDi4ryIShpa20J3EO7GYw=; b=m4SZje72ZexAU0CM2Zede7JiscCPtvRGXPtJ4H7MQ0Fulcy/Gwy1glMASC0edyOoYF ToCP8N4U8wiYDMmUG8Wc/SdEgNeLvfmgovJSvWpPXJWvfM9llRYmGIFCvenhYC7J1UxV NP7p2fr5F2sg3m661sT5cl5Nuw49LS4LKgIutVjiBFjcUBk0FRMYoC2QWbPIzbmGAY9c OALkJiaTSkjmMu/0udeyUVYTsrPmo0+INhgMtlq5ajuh5Ng2jueEmXzmHWHYdGgeOkc1 m5htDvkP/ZguJHRnM5E6EtQjUSem/pREbXjtKRp/YlS1fO1iuhxjb1tyDX9lTPYMvptB 9weg== X-Gm-Message-State: APjAAAV7in0v80TqnfVNtoDRIL31AQnX3+WBpNQHpBDFAM4DFe8jjfpB IiV5fL70p08z7WWZcjXLikkiw8cgtUM= X-Google-Smtp-Source: APXvYqzei20AOK75xhvy8wQlRbBRSRb+YFjykvA1JakV9ss3jYYxSodpAnNakLIEEGHidixNMYjqNw== X-Received: by 2002:a5d:4a4e:: with SMTP id v14mr50632987wrs.200.1564681135216; Thu, 01 Aug 2019 10:38:55 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id s10sm56678810wrt.49.2019.08.01.10.38.54 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 10:38:54 -0700 (PDT) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Thu, 1 Aug 2019 19:38:49 +0200 Message-Id: <1d4a4a5077d0d2a852fc729020d209905974bbb8.1564680915.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham 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: fix L4 default lb proto reported by ovn-nbctl 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: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org If no protocol is specified defining a load balancing rule TCP is selected as default but ovn-nbctl lb-list reports 'tcp/udp'. Fix it reporting 'tcp' in this case Fixes: e2bfcad6cbb0 ("ovn-nbctl: Add LB commands") Signed-off-by: Lorenzo Bianconi Acked-by: Dumitru Ceara --- ovn/utilities/ovn-nbctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 98a8faa0b..7a38b2bf7 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -2864,7 +2864,7 @@ lb_info_add_smap(const struct nbrec_load_balancer *lb, continue; } - char *protocol = ss_get_port(&ss) ? lb->protocol : "tcp/udp"; + char *protocol = ss_get_port(&ss) ? lb->protocol : "tcp"; i == 0 ? ds_put_format(&val, UUID_FMT " %-20.16s%-11.7s%-*.*s%s", UUID_ARGS(&lb->header_.uuid),