From patchwork Tue Aug 6 14:35:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1142825 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 462y0z25L4z9sDB for ; Wed, 7 Aug 2019 00:38:10 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0B339E28; Tue, 6 Aug 2019 14:36:02 +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 E7AAFE28 for ; Tue, 6 Aug 2019 14:35:59 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 20D7789D for ; Tue, 6 Aug 2019 14:35:59 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id v19so76727161wmj.5 for ; Tue, 06 Aug 2019 07:35:59 -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=TRqZW9p85pesgQQwUHclGISV+lt7tyHukRN4tN2pyLk=; b=MG5/BDkiis40jXTNVjmzCblAeeSLn2ZcS84VIR+DATf3x/cUZCl5CbTmiJVVYWz/My MYUdgdmCXeyqBU7ikP5OUZVv2FHBUDcgc9IAm8k8QMjEaJnxQxfUOmYdiz588e7aJmCw yrZOCklK5KeICbEcO+rz9FZ41VTCz1h+hCNsEtaKHZxSX3CGhnS+2FYY2V9HyxeHuEU1 hYSZz+80KJKSzQK3XW1g9vp8vCrt4pjkN+GfnXPRmAFinf2T9IYsysSiaaUY2Eqn7N7z NQo4hEomWpWWHgqDgjvAzBxb1OzuX/2vA0Wa973/y7R9UP9O4c3tHwF2oodjqK0uQ+XG 7dsQ== X-Gm-Message-State: APjAAAVSPg9SN+vSBxhBDBgmN5LuwPpuGHAXy6KQy2QhmNXoUXmPWGsd n2ETUwV8iPov7dWL4iZniyIMHDtVxUs= X-Google-Smtp-Source: APXvYqwP5RVyVOiEkKCDEHXDPYWH5luf0S3EY6UKaJQAOYaKz1fYmlxk5qEKCct+Ngk3ix0iaxQvXg== X-Received: by 2002:a7b:cbcb:: with SMTP id n11mr5031802wmi.146.1565102157410; Tue, 06 Aug 2019 07:35:57 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id b15sm106823233wrt.77.2019.08.06.07.35.56 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 07:35:56 -0700 (PDT) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Tue, 6 Aug 2019 16:35:47 +0200 Message-Id: <29513d3e2bd1cf3d16deab1c8f61d7c078c507ce.1565098260.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 branch 2.12] OVN: fix default L4 default 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 protcol is specified defining a load balancing rule TCP is selected as default but ovn-nbctl lb-list reports 'tcp/udp' in this case. Fix it reporting tcp in this case Fixes: e2bfcad6cbb0 ("ovn-nbctl: Add LB commands") Acked-by: Dumitru Ceara Signed-off-by: Lorenzo Bianconi --- ovn/utilities/ovn-nbctl.c | 2 +- tests/ovn-nbctl.at | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) 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), diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 18c5c1d42..e87242c03 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -657,8 +657,8 @@ AT_CHECK([ovn-nbctl lb-list | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb0 tcp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:80 <1> lb1 udp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:8080 -<2> lb2 tcp/udp 30.0.0.30 192.168.10.10 -<3> lb3 tcp/udp 30.0.0.30 192.168.10.10 +<2> lb2 tcp 30.0.0.30 192.168.10.10 +<3> lb3 tcp 30.0.0.30 192.168.10.10 ]) AT_CHECK([ovn-nbctl lb-del lb2 30.0.0.30]) AT_CHECK([ovn-nbctl lb-del lb3 30.0.0.30]) @@ -710,14 +710,14 @@ AT_CHECK([ovn-nbctl ls-lb-list ls0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb0 tcp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:80 <1> lb1 udp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:80 -<2> lb3 tcp/udp 30.0.0.10 192.168.10.10,192.168.10.20 +<2> lb3 tcp 30.0.0.10 192.168.10.10,192.168.10.20 ]) AT_CHECK([ovn-nbctl ls-lb-del ls0 lb0]) AT_CHECK([ovn-nbctl ls-lb-list ls0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb1 udp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:80 -<1> lb3 tcp/udp 30.0.0.10 192.168.10.10,192.168.10.20 +<1> lb3 tcp 30.0.0.10 192.168.10.10,192.168.10.20 ]) AT_CHECK([ovn-nbctl ls-lb-del ls0 lb1]) @@ -746,14 +746,14 @@ AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb0 tcp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:80 <1> lb1 udp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:80 -<2> lb3 tcp/udp 30.0.0.10 192.168.10.10,192.168.10.20 +<2> lb3 tcp 30.0.0.10 192.168.10.10,192.168.10.20 ]) AT_CHECK([ovn-nbctl lr-lb-del lr0 lb0]) AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb1 udp 30.0.0.10:80 192.168.10.10:80,192.168.10.20:80 -<1> lb3 tcp/udp 30.0.0.10 192.168.10.10,192.168.10.20 +<1> lb3 tcp 30.0.0.10 192.168.10.10,192.168.10.20 ]) AT_CHECK([ovn-nbctl lr-lb-del lr0 lb1]) @@ -924,8 +924,8 @@ AT_CHECK([ovn-nbctl lb-list | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb0 tcp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:80 <1> lb1 udp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:8080 -<2> lb2 tcp/udp ae0f::30 fd0f::10 -<3> lb3 tcp/udp ae0f::30 fd0f::10 +<2> lb2 tcp ae0f::30 fd0f::10 +<3> lb3 tcp ae0f::30 fd0f::10 ]) AT_CHECK([ovn-nbctl lb-del lb2 ae0f::30]) AT_CHECK([ovn-nbctl lb-del lb3 ae0f::30]) @@ -977,14 +977,14 @@ AT_CHECK([ovn-nbctl ls-lb-list ls0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb0 tcp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:80 <1> lb1 udp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:80 -<2> lb3 tcp/udp ae0f::10 fd0f::10,fd0f::20 +<2> lb3 tcp ae0f::10 fd0f::10,fd0f::20 ]) AT_CHECK([ovn-nbctl ls-lb-del ls0 lb0]) AT_CHECK([ovn-nbctl ls-lb-list ls0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb1 udp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:80 -<1> lb3 tcp/udp ae0f::10 fd0f::10,fd0f::20 +<1> lb3 tcp ae0f::10 fd0f::10,fd0f::20 ]) AT_CHECK([ovn-nbctl ls-lb-del ls0 lb1]) @@ -1013,14 +1013,14 @@ AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb0 tcp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:80 <1> lb1 udp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:80 -<2> lb3 tcp/udp ae0f::10 fd0f::10,fd0f::20 +<2> lb3 tcp ae0f::10 fd0f::10,fd0f::20 ]) AT_CHECK([ovn-nbctl lr-lb-del lr0 lb0]) AT_CHECK([ovn-nbctl lr-lb-list lr0 | uuidfilt], [0], [dnl UUID LB PROTO VIP IPs <0> lb1 udp [[ae0f::10]]:80 [[fd0f::10]]:80,[[fd0f::20]]:80 -<1> lb3 tcp/udp ae0f::10 fd0f::10,fd0f::20 +<1> lb3 tcp ae0f::10 fd0f::10,fd0f::20 ]) AT_CHECK([ovn-nbctl lr-lb-del lr0 lb1])