From patchwork Mon Jun 4 21:27:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925234 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=none (p=none dis=none) header.from=ovn.org 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 4107MR027jz9rvt for ; Tue, 5 Jun 2018 07:28:02 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0205A110D; Mon, 4 Jun 2018 21:28:00 +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 E066E10FB for ; Mon, 4 Jun 2018 21:27:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 662C8711 for ; Mon, 4 Jun 2018 21:27:57 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 10BBD240007; Mon, 4 Jun 2018 23:27:57 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:38 -0700 Message-Id: <20180604212750.14643-1-blp@ovn.org> X-Mailer: git-send-email 2.16.1 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 01/13] bfd: Remove leading tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- lib/bfd.c | 54 +++++++++++++++++++++++++-------------------------- tests/bfd.at | 32 +++++++++++++++--------------- tests/ofproto-dpif.at | 16 +++++++-------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/lib/bfd.c b/lib/bfd.c index 55b7453d15e8..530826240c71 100644 --- a/lib/bfd.c +++ b/lib/bfd.c @@ -1085,13 +1085,13 @@ log_msg(enum vlog_level level, const struct msg *p, const char *message, ds_put_format(&ds, "%s: %s." - "\n\tvers:%d diag:\"%s\" state:%s mult:%"PRIu8 + "\n vers:%d diag:\"%s\" state:%s mult:%"PRIu8 " length:%"PRIu8 - "\n\tflags: %s" - "\n\tmy_disc:0x%"PRIx32" your_disc:0x%"PRIx32 - "\n\tmin_tx:%"PRIu32"us (%"PRIu32"ms)" - "\n\tmin_rx:%"PRIu32"us (%"PRIu32"ms)" - "\n\tmin_rx_echo:%"PRIu32"us (%"PRIu32"ms)", + "\n flags: %s" + "\n my_disc:0x%"PRIx32" your_disc:0x%"PRIx32 + "\n min_tx:%"PRIu32"us (%"PRIu32"ms)" + "\n min_rx:%"PRIu32"us (%"PRIu32"ms)" + "\n min_rx_echo:%"PRIu32"us (%"PRIu32"ms)", bfd->name, message, p->vers_diag >> VERS_SHIFT, bfd_diag_str(p->vers_diag & DIAG_MASK), bfd_state_str(p->flags & STATE_MASK), @@ -1254,45 +1254,45 @@ bfd_find_by_name(const char *name) OVS_REQUIRES(mutex) static void bfd_put_details(struct ds *ds, const struct bfd *bfd) OVS_REQUIRES(mutex) { - ds_put_format(ds, "\tForwarding: %s\n", + ds_put_format(ds, " Forwarding: %s\n", bfd_forwarding__(CONST_CAST(struct bfd *, bfd)) ? "true" : "false"); - ds_put_format(ds, "\tDetect Multiplier: %d\n", bfd->mult); - ds_put_format(ds, "\tConcatenated Path Down: %s\n", + ds_put_format(ds, " Detect Multiplier: %d\n", bfd->mult); + ds_put_format(ds, " Concatenated Path Down: %s\n", bfd->cpath_down ? "true" : "false"); - ds_put_format(ds, "\tTX Interval: Approx %lldms\n", bfd_tx_interval(bfd)); - ds_put_format(ds, "\tRX Interval: Approx %lldms\n", bfd_rx_interval(bfd)); - ds_put_format(ds, "\tDetect Time: now %+lldms\n", + ds_put_format(ds, " TX Interval: Approx %lldms\n", bfd_tx_interval(bfd)); + ds_put_format(ds, " RX Interval: Approx %lldms\n", bfd_rx_interval(bfd)); + ds_put_format(ds, " Detect Time: now %+lldms\n", bfd->detect_time - time_msec()); - ds_put_format(ds, "\tNext TX Time: now %+lldms\n", + ds_put_format(ds, " Next TX Time: now %+lldms\n", bfd->next_tx -time_msec()); - ds_put_format(ds, "\tLast TX Time: now %+lldms\n", + ds_put_format(ds, " Last TX Time: now %+lldms\n", bfd->last_tx - time_msec()); ds_put_cstr(ds, "\n"); - ds_put_format(ds, "\tLocal Flags: %s\n", bfd_flag_str(bfd->flags)); - ds_put_format(ds, "\tLocal Session State: %s\n", + ds_put_format(ds, " Local Flags: %s\n", bfd_flag_str(bfd->flags)); + ds_put_format(ds, " Local Session State: %s\n", bfd_state_str(bfd->state)); - ds_put_format(ds, "\tLocal Diagnostic: %s\n", bfd_diag_str(bfd->diag)); - ds_put_format(ds, "\tLocal Discriminator: 0x%"PRIx32"\n", bfd->disc); - ds_put_format(ds, "\tLocal Minimum TX Interval: %lldms\n", + ds_put_format(ds, " Local Diagnostic: %s\n", bfd_diag_str(bfd->diag)); + ds_put_format(ds, " Local Discriminator: 0x%"PRIx32"\n", bfd->disc); + ds_put_format(ds, " Local Minimum TX Interval: %lldms\n", bfd_min_tx(bfd)); - ds_put_format(ds, "\tLocal Minimum RX Interval: %lldms\n", bfd->min_rx); + ds_put_format(ds, " Local Minimum RX Interval: %lldms\n", bfd->min_rx); ds_put_cstr(ds, "\n"); - ds_put_format(ds, "\tRemote Flags: %s\n", bfd_flag_str(bfd->rmt_flags)); - ds_put_format(ds, "\tRemote Session State: %s\n", + ds_put_format(ds, " Remote Flags: %s\n", bfd_flag_str(bfd->rmt_flags)); + ds_put_format(ds, " Remote Session State: %s\n", bfd_state_str(bfd->rmt_state)); - ds_put_format(ds, "\tRemote Diagnostic: %s\n", + ds_put_format(ds, " Remote Diagnostic: %s\n", bfd_diag_str(bfd->rmt_diag)); - ds_put_format(ds, "\tRemote Discriminator: 0x%"PRIx32"\n", bfd->rmt_disc); - ds_put_format(ds, "\tRemote Minimum TX Interval: %lldms\n", + ds_put_format(ds, " Remote Discriminator: 0x%"PRIx32"\n", bfd->rmt_disc); + ds_put_format(ds, " Remote Minimum TX Interval: %lldms\n", bfd->rmt_min_tx); - ds_put_format(ds, "\tRemote Minimum RX Interval: %lldms\n", + ds_put_format(ds, " Remote Minimum RX Interval: %lldms\n", bfd->rmt_min_rx); - ds_put_format(ds, "\tRemote Detect Multiplier: %d\n", bfd->rmt_mult); + ds_put_format(ds, " Remote Detect Multiplier: %d\n", bfd->rmt_mult); } static void diff --git a/tests/bfd.at b/tests/bfd.at index ba912b5683b8..b0b7a2f9fe27 100644 --- a/tests/bfd.at +++ b/tests/bfd.at @@ -3,34 +3,34 @@ AT_BANNER([bfd]) m4_define([BFD_CHECK], [ AT_CHECK([ovs-appctl bfd/show $1 | sed -e '/Time:/d' | sed -e '/Discriminator/d' | sed -e '/Interval:/d'| sed -e '/Multiplier/d'],[0], [dnl - Forwarding: $2 - Concatenated Path Down: $3 + Forwarding: $2 + Concatenated Path Down: $3 - Local Flags: $4 - Local Session State: $5 - Local Diagnostic: $6 + Local Flags: $4 + Local Session State: $5 + Local Diagnostic: $6 - Remote Flags: $7 - Remote Session State: $8 - Remote Diagnostic: $9 + Remote Flags: $7 + Remote Session State: $8 + Remote Diagnostic: $9 ]) ]) m4_define([BFD_CHECK_TX], [ AT_CHECK([ovs-appctl bfd/show $1 | sed -n '/TX Interval/p'],[0], [dnl - TX Interval: Approx $2 - Local Minimum TX Interval: $3 - Remote Minimum TX Interval: $4 + TX Interval: Approx $2 + Local Minimum TX Interval: $3 + Remote Minimum TX Interval: $4 ]) ]) m4_define([BFD_CHECK_RX], [ AT_CHECK([ovs-appctl bfd/show $1 | sed -n '/RX Interval/p'],[0], [dnl - RX Interval: Approx $2 - Local Minimum RX Interval: $3 - Remote Minimum RX Interval: $4 + RX Interval: Approx $2 + Local Minimum RX Interval: $3 + Remote Minimum RX Interval: $4 ]) ]) @@ -44,8 +44,8 @@ $3 m4_define([BFD_CHECK_MULT], [ AT_CHECK([ovs-appctl bfd/show $1 | sed -n '/Detect Multiplier/p'],[0], [dnl - Detect Multiplier: $2 - Remote Detect Multiplier: $3 + Detect Multiplier: $2 + Remote Detect Multiplier: $3 ]) ]) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 00ab97bf63ac..656cdd8446ab 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -8594,10 +8594,10 @@ AT_CHECK([ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'], [0], [dnl ]) # bfd/show should show 'up'. AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl - Local Session State: up - Remote Session State: up - Local Session State: up - Remote Session State: up + Local Session State: up + Remote Session State: up + Local Session State: up + Remote Session State: up ]) # bond/show should show 'may-enable: true' for all slaves. AT_CHECK([ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'], [0], [dnl @@ -8617,8 +8617,8 @@ AT_CHECK([ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'], [0], [dnl ]) # bfd/show should show 'down'. AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl - Local Session State: down - Remote Session State: down + Local Session State: down + Remote Session State: down ]) # bond/show should show 'may-enable: false' for p0. AT_CHECK([ovs-appctl bond/show br0bond | sed -n '/^.*may_enable:.*/p'], [0], [dnl @@ -8637,8 +8637,8 @@ AT_CHECK([ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'], [0], [dnl ]) # bfd/show should show 'down'. AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl - Local Session State: down - Remote Session State: down + Local Session State: down + Remote Session State: down ]) # bond/show should show 'may-enable: false' for p0 and p1. AT_CHECK([ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'], [0], [dnl From patchwork Mon Jun 4 21:27:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925235 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=none (p=none dis=none) header.from=ovn.org 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 4107Mw39Krz9s15 for ; Tue, 5 Jun 2018 07:28:28 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C0DB2112F; Mon, 4 Jun 2018 21:28:00 +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 B9D5A110D for ; Mon, 4 Jun 2018 21:27:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id ABB65714 for ; Mon, 4 Jun 2018 21:27:58 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 9F0E9240006; Mon, 4 Jun 2018 23:27:59 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:39 -0700 Message-Id: <20180604212750.14643-2-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 02/13] cfm: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- lib/cfm.c | 20 ++++++++++---------- tests/cfm.at | 20 ++++++++++---------- tests/ofproto-dpif.at | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/cfm.c b/lib/cfm.c index 19957a968d3a..71d2c02067e0 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -1032,30 +1032,30 @@ cfm_print_details(struct ds *ds, struct cfm *cfm) OVS_REQUIRES(mutex) fault = cfm_get_fault__(cfm); if (fault) { - ds_put_cstr(ds, "\tfault: "); + ds_put_cstr(ds, " fault: "); ds_put_cfm_fault(ds, fault); ds_put_cstr(ds, "\n"); } if (cfm->health == -1) { - ds_put_format(ds, "\taverage health: undefined\n"); + ds_put_format(ds, " average health: undefined\n"); } else { - ds_put_format(ds, "\taverage health: %d\n", cfm->health); + ds_put_format(ds, " average health: %d\n", cfm->health); } - ds_put_format(ds, "\topstate: %s\n", cfm->opup ? "up" : "down"); - ds_put_format(ds, "\tremote_opstate: %s\n", + ds_put_format(ds, " opstate: %s\n", cfm->opup ? "up" : "down"); + ds_put_format(ds, " remote_opstate: %s\n", cfm->remote_opup ? "up" : "down"); - ds_put_format(ds, "\tinterval: %dms\n", cfm->ccm_interval_ms); - ds_put_format(ds, "\tnext CCM tx: %lldms\n", + ds_put_format(ds, " interval: %dms\n", cfm->ccm_interval_ms); + ds_put_format(ds, " next CCM tx: %lldms\n", timer_msecs_until_expired(&cfm->tx_timer)); - ds_put_format(ds, "\tnext fault check: %lldms\n", + ds_put_format(ds, " next fault check: %lldms\n", timer_msecs_until_expired(&cfm->fault_timer)); HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) { ds_put_format(ds, "Remote MPID %"PRIu64"\n", rmp->mpid); - ds_put_format(ds, "\trecv since check: %s\n", + ds_put_format(ds, " recv since check: %s\n", rmp->recv ? "true" : "false"); - ds_put_format(ds, "\topstate: %s\n", rmp->opup? "up" : "down"); + ds_put_format(ds, " opstate: %s\n", rmp->opup? "up" : "down"); } } diff --git a/tests/cfm.at b/tests/cfm.at index fa7604c228f7..8c8bd20adec1 100644 --- a/tests/cfm.at +++ b/tests/cfm.at @@ -5,12 +5,12 @@ AT_CHECK([ovs-appctl cfm/show $1 | sed -e '/next CCM tx:/d' | sed -e '/next faul [dnl ---- $1 ---- MPID $2: extended - average health: $3 - opstate: $4 - remote_opstate: $5 - interval: $6 + average health: $3 + opstate: $4 + remote_opstate: $5 + interval: $6 Remote MPID $7 - opstate: $8 + opstate: $8 ]) ]) @@ -19,11 +19,11 @@ AT_CHECK([ovs-appctl cfm/show $1 | sed -e '/next CCM tx:/d' | sed -e '/next faul [dnl ---- $1 ---- MPID $2: extended - fault: $3 - average health: $4 - opstate: $5 - remote_opstate: $6 - interval: $7 + fault: $3 + average health: $4 + opstate: $5 + remote_opstate: $6 + interval: $7 ]) ]) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 656cdd8446ab..d827d5333116 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -8590,7 +8590,7 @@ ovs-appctl time/stop ovs-appctl time/warp 5000 100 # cfm/show should show 'recv' fault. AT_CHECK([ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'], [0], [dnl - fault: recv + fault: recv ]) # bfd/show should show 'up'. AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl @@ -8613,7 +8613,7 @@ AT_CHECK([ovs-vsctl set Interface p1 bfd:enable=false]) ovs-appctl time/warp 5000 100 # cfm/show should show 'recv' fault. AT_CHECK([ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'], [0], [dnl - fault: recv + fault: recv ]) # bfd/show should show 'down'. AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl @@ -8633,7 +8633,7 @@ AT_CHECK([ovs-vsctl set Interface p0 bfd:enable=false]) ovs-appctl time/warp 5000 100 # cfm/show should show 'recv' fault. AT_CHECK([ovs-appctl cfm/show | sed -n '/^.*fault:.*/p'], [0], [dnl - fault: recv + fault: recv ]) # bfd/show should show 'down'. AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl From patchwork Mon Jun 4 21:27:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925236 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=none (p=none dis=none) header.from=ovn.org 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 4107NZ5zLXz9s08 for ; Tue, 5 Jun 2018 07:29:02 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B7CB11134; Mon, 4 Jun 2018 21:28:03 +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 38522111A for ; Mon, 4 Jun 2018 21:28:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1DE1E711 for ; Mon, 4 Jun 2018 21:27:59 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 399AD240003; Mon, 4 Jun 2018 23:28:00 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:40 -0700 Message-Id: <20180604212750.14643-3-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 03/13] dpctl: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- lib/dpctl.c | 34 +++++++++++++++++----------------- tests/dpctl.at | 26 +++++++++++++------------- tests/ofproto-dpif.at | 4 ++-- tests/pmd.at | 10 +++++----- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/lib/dpctl.c b/lib/dpctl.c index 47f4182c7be8..ec8c51e4b0a7 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -535,14 +535,14 @@ show_dpif(struct dpif *dpif, struct dpctl_params *dpctl_p) dpctl_print(dpctl_p, "%s:\n", dpif_name(dpif)); if (!dpif_get_dp_stats(dpif, &stats)) { - dpctl_print(dpctl_p, "\tlookups: hit:%"PRIu64" missed:%"PRIu64 - " lost:%"PRIu64"\n\tflows: %"PRIu64"\n", + dpctl_print(dpctl_p, " lookups: hit:%"PRIu64" missed:%"PRIu64 + " lost:%"PRIu64"\n flows: %"PRIu64"\n", stats.n_hit, stats.n_missed, stats.n_lost, stats.n_flows); if (stats.n_masks != UINT32_MAX) { uint64_t n_pkts = stats.n_hit + stats.n_missed; double avg = n_pkts ? (double) stats.n_mask_hit / n_pkts : 0.0; - dpctl_print(dpctl_p, "\tmasks: hit:%"PRIu64" total:%"PRIu32 + dpctl_print(dpctl_p, " masks: hit:%"PRIu64" total:%"PRIu32 " hit/pkt:%.2f\n", stats.n_mask_hit, stats.n_masks, avg); } @@ -569,7 +569,7 @@ show_dpif(struct dpif *dpif, struct dpctl_params *dpctl_p) continue; } - dpctl_print(dpctl_p, "\tport %u: %s", + dpctl_print(dpctl_p, " port %u: %s", dpif_port.port_no, dpif_port.name); if (strcmp(dpif_port.type, "system")) { @@ -620,24 +620,24 @@ show_dpif(struct dpif *dpif, struct dpctl_params *dpctl_p) error = netdev_get_stats(netdev, &s); if (!error) { netdev_close(netdev); - print_stat(dpctl_p, "\t\tRX packets:", s.rx_packets); + print_stat(dpctl_p, " RX packets:", s.rx_packets); print_stat(dpctl_p, " errors:", s.rx_errors); print_stat(dpctl_p, " dropped:", s.rx_dropped); print_stat(dpctl_p, " overruns:", s.rx_over_errors); print_stat(dpctl_p, " frame:", s.rx_frame_errors); dpctl_print(dpctl_p, "\n"); - print_stat(dpctl_p, "\t\tTX packets:", s.tx_packets); + print_stat(dpctl_p, " TX packets:", s.tx_packets); print_stat(dpctl_p, " errors:", s.tx_errors); print_stat(dpctl_p, " dropped:", s.tx_dropped); print_stat(dpctl_p, " aborted:", s.tx_aborted_errors); print_stat(dpctl_p, " carrier:", s.tx_carrier_errors); dpctl_print(dpctl_p, "\n"); - print_stat(dpctl_p, "\t\tcollisions:", s.collisions); + print_stat(dpctl_p, " collisions:", s.collisions); dpctl_print(dpctl_p, "\n"); - print_stat(dpctl_p, "\t\tRX bytes:", s.rx_bytes); + print_stat(dpctl_p, " RX bytes:", s.rx_bytes); print_human_size(dpctl_p, s.rx_bytes); print_stat(dpctl_p, " TX bytes:", s.tx_bytes); print_human_size(dpctl_p, s.tx_bytes); @@ -1510,9 +1510,9 @@ dpctl_ct_stats_show(int argc, const char *argv[], dpctl_print(dpctl_p, "Connections Stats:\n Total: %d\n", tot_conn); if (proto_stats[CT_STATS_TCP]) { - dpctl_print(dpctl_p, "\tTCP: %d\n", proto_stats[CT_STATS_TCP]); + dpctl_print(dpctl_p, " TCP: %d\n", proto_stats[CT_STATS_TCP]); if (verbose) { - dpctl_print(dpctl_p, "\t Conn per TCP states:\n"); + dpctl_print(dpctl_p, " Conn per TCP states:\n"); for (int i = 0; i < CT_DPIF_TCPS_MAX_NUM; i++) { if (tcp_conn_per_states[i]) { struct ds s = DS_EMPTY_INITIALIZER; @@ -1524,25 +1524,25 @@ dpctl_ct_stats_show(int argc, const char *argv[], } } if (proto_stats[CT_STATS_UDP]) { - dpctl_print(dpctl_p, "\tUDP: %d\n", proto_stats[CT_STATS_UDP]); + dpctl_print(dpctl_p, " UDP: %d\n", proto_stats[CT_STATS_UDP]); } if (proto_stats[CT_STATS_UDPLITE]) { - dpctl_print(dpctl_p, "\tUDPLITE: %d\n", proto_stats[CT_STATS_UDPLITE]); + dpctl_print(dpctl_p, " UDPLITE: %d\n", proto_stats[CT_STATS_UDPLITE]); } if (proto_stats[CT_STATS_SCTP]) { - dpctl_print(dpctl_p, "\tSCTP: %d\n", proto_stats[CT_STATS_SCTP]); + dpctl_print(dpctl_p, " SCTP: %d\n", proto_stats[CT_STATS_SCTP]); } if (proto_stats[CT_STATS_ICMP]) { - dpctl_print(dpctl_p, "\tICMP: %d\n", proto_stats[CT_STATS_ICMP]); + dpctl_print(dpctl_p, " ICMP: %d\n", proto_stats[CT_STATS_ICMP]); } if (proto_stats[CT_STATS_DCCP]) { - dpctl_print(dpctl_p, "\tDCCP: %d\n", proto_stats[CT_STATS_DCCP]); + dpctl_print(dpctl_p, " DCCP: %d\n", proto_stats[CT_STATS_DCCP]); } if (proto_stats[CT_STATS_IGMP]) { - dpctl_print(dpctl_p, "\tIGMP: %d\n", proto_stats[CT_STATS_IGMP]); + dpctl_print(dpctl_p, " IGMP: %d\n", proto_stats[CT_STATS_IGMP]); } if (proto_stats[CT_STATS_OTHER]) { - dpctl_print(dpctl_p, "\tOther: %d\n", proto_stats[CT_STATS_OTHER]); + dpctl_print(dpctl_p, " Other: %d\n", proto_stats[CT_STATS_OTHER]); } ct_dpif_dump_done(dump); diff --git a/tests/dpctl.at b/tests/dpctl.at index 8c761c8329d4..deec54959fce 100644 --- a/tests/dpctl.at +++ b/tests/dpctl.at @@ -21,17 +21,17 @@ OVS_VSWITCHD_START([], [], [=override]) AT_CHECK([ovs-appctl dpctl/add-dp dummy@br0]) AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl dummy@br0: - lookups: hit:0 missed:0 lost:0 - flows: 0 - port 0: br0 (dummy-internal) + lookups: hit:0 missed:0 lost:0 + flows: 0 + port 0: br0 (dummy-internal) ]) AT_CHECK([ovs-appctl dpctl/add-if dummy@br0 vif1.0,type=dummy,port_no=5]) AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl dummy@br0: - lookups: hit:0 missed:0 lost:0 - flows: 0 - port 0: br0 (dummy-internal) - port 5: vif1.0 (dummy) + lookups: hit:0 missed:0 lost:0 + flows: 0 + port 0: br0 (dummy-internal) + port 5: vif1.0 (dummy) ]) AT_CHECK([ovs-appctl dpctl/add-if dummy@br0 vif1.0,type=dummy], [2], [], [stderr]) @@ -52,9 +52,9 @@ ovs-appctl: ovs-vswitchd: server returned an error AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 vif1.0]) AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl dummy@br0: - lookups: hit:0 missed:0 lost:0 - flows: 0 - port 0: br0 (dummy-internal) + lookups: hit:0 missed:0 lost:0 + flows: 0 + port 0: br0 (dummy-internal) ]) AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 vif1.0], [2], [], [ovs-vswitchd: no port named vif1.0 @@ -62,9 +62,9 @@ ovs-appctl: ovs-vswitchd: server returned an error ]) AT_CHECK([ovs-appctl dpctl/show dummy@br0], [0], [dnl dummy@br0: - lookups: hit:0 missed:0 lost:0 - flows: 0 - port 0: br0 (dummy-internal) + lookups: hit:0 missed:0 lost:0 + flows: 0 + port 0: br0 (dummy-internal) ]) AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 nonexistent], [2], [], [ovs-vswitchd: no port named nonexistent diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index d827d5333116..2bfbfa2f3445 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -6627,8 +6627,8 @@ AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) AT_CHECK([ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy], [0]) AT_CHECK([ovs-vsctl -- add-port int-br t1 -- set Interface t1 type=gre \ options:remote_ip=1.1.2.92 options:key=456 ofport_request=4\ - -- add-port int-br vm1 -- set Interface vm1 type=dummy \ - options:ifindex=2011 ofport_request=5 + -- add-port int-br vm1 -- set Interface vm1 type=dummy \ + options:ifindex=2011 ofport_request=5 ], [0]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl diff --git a/tests/pmd.at b/tests/pmd.at index 532a182ba8c2..2957daf4d64e 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -681,11 +681,11 @@ p1 0 0 0 AT_CHECK([ovs-appctl dpctl/show dummy@dp0], [0], [dnl dummy@dp0: - lookups: hit:0 missed:0 lost:0 - flows: 0 - port 0: dp0 (dummy-internal) - port 1: p1 (dummy-pmd: configured_rx_queues=1, configured_tx_queues=1, requested_rx_queues=1, requested_tx_queues=1) - port 2: p2 (dummy) + lookups: hit:0 missed:0 lost:0 + flows: 0 + port 0: dp0 (dummy-internal) + port 1: p1 (dummy-pmd: configured_rx_queues=1, configured_tx_queues=1, requested_rx_queues=1, requested_tx_queues=1) + port 2: p2 (dummy) ]) AT_CHECK([ovs-appctl dpctl/add-flow dummy@dp0 'in_port(1),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x1234)' 2], [0], [dnl From patchwork Mon Jun 4 21:27:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925238 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=none (p=none dis=none) header.from=ovn.org 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 4107Pg0Gn9z9s08 for ; Tue, 5 Jun 2018 07:29:59 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9EA60117D; Mon, 4 Jun 2018 21:28:06 +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 23AFC1167 for ; Mon, 4 Jun 2018 21:28:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E28FF711 for ; Mon, 4 Jun 2018 21:28:01 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 99F3F240002; Mon, 4 Jun 2018 23:28:02 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:41 -0700 Message-Id: <20180604212750.14643-4-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 04/13] lacp: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- lib/lacp.c | 110 ++++----- tests/lacp.at | 746 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 428 insertions(+), 428 deletions(-) diff --git a/lib/lacp.c b/lib/lacp.c index 8353746be169..d6b36aa3d587 100644 --- a/lib/lacp.c +++ b/lib/lacp.c @@ -912,15 +912,15 @@ lacp_print_details(struct ds *ds, struct lacp *lacp) OVS_REQUIRES(mutex) int i; ds_put_format(ds, "---- %s ----\n", lacp->name); - ds_put_format(ds, "\tstatus: %s", lacp->active ? "active" : "passive"); + ds_put_format(ds, " status: %s", lacp->active ? "active" : "passive"); if (lacp->negotiated) { ds_put_cstr(ds, " negotiated"); } ds_put_cstr(ds, "\n"); - ds_put_format(ds, "\tsys_id: " ETH_ADDR_FMT "\n", ETH_ADDR_ARGS(lacp->sys_id)); - ds_put_format(ds, "\tsys_priority: %u\n", lacp->sys_priority); - ds_put_cstr(ds, "\taggregation key: "); + ds_put_format(ds, " sys_id: " ETH_ADDR_FMT "\n", ETH_ADDR_ARGS(lacp->sys_id)); + ds_put_format(ds, " sys_priority: %u\n", lacp->sys_priority); + ds_put_cstr(ds, " aggregation key: "); if (lacp->key_slave) { ds_put_format(ds, "%u", lacp->key_slave->key ? lacp->key_slave->key @@ -930,7 +930,7 @@ lacp_print_details(struct ds *ds, struct lacp *lacp) OVS_REQUIRES(mutex) } ds_put_cstr(ds, "\n"); - ds_put_cstr(ds, "\tlacp_time: "); + ds_put_cstr(ds, " lacp_time: "); if (lacp->fast) { ds_put_cstr(ds, "fast\n"); } else { @@ -964,36 +964,36 @@ lacp_print_details(struct ds *ds, struct lacp *lacp) OVS_REQUIRES(mutex) ds_put_format(ds, "\nslave: %s: %s %s\n", slave->name, status, slave->attached ? "attached" : "detached"); - ds_put_format(ds, "\tport_id: %u\n", slave->port_id); - ds_put_format(ds, "\tport_priority: %u\n", slave->port_priority); - ds_put_format(ds, "\tmay_enable: %s\n", (slave_may_enable__(slave) + ds_put_format(ds, " port_id: %u\n", slave->port_id); + ds_put_format(ds, " port_priority: %u\n", slave->port_priority); + ds_put_format(ds, " may_enable: %s\n", (slave_may_enable__(slave) ? "true" : "false")); - ds_put_format(ds, "\n\tactor sys_id: " ETH_ADDR_FMT "\n", + ds_put_format(ds, "\n actor sys_id: " ETH_ADDR_FMT "\n", ETH_ADDR_ARGS(actor.sys_id)); - ds_put_format(ds, "\tactor sys_priority: %u\n", + ds_put_format(ds, " actor sys_priority: %u\n", ntohs(actor.sys_priority)); - ds_put_format(ds, "\tactor port_id: %u\n", + ds_put_format(ds, " actor port_id: %u\n", ntohs(actor.port_id)); - ds_put_format(ds, "\tactor port_priority: %u\n", + ds_put_format(ds, " actor port_priority: %u\n", ntohs(actor.port_priority)); - ds_put_format(ds, "\tactor key: %u\n", + ds_put_format(ds, " actor key: %u\n", ntohs(actor.key)); - ds_put_cstr(ds, "\tactor state:"); + ds_put_cstr(ds, " actor state:"); ds_put_lacp_state(ds, actor.state); ds_put_cstr(ds, "\n\n"); - ds_put_format(ds, "\tpartner sys_id: " ETH_ADDR_FMT "\n", + ds_put_format(ds, " partner sys_id: " ETH_ADDR_FMT "\n", ETH_ADDR_ARGS(slave->partner.sys_id)); - ds_put_format(ds, "\tpartner sys_priority: %u\n", + ds_put_format(ds, " partner sys_priority: %u\n", ntohs(slave->partner.sys_priority)); - ds_put_format(ds, "\tpartner port_id: %u\n", + ds_put_format(ds, " partner port_id: %u\n", ntohs(slave->partner.port_id)); - ds_put_format(ds, "\tpartner port_priority: %u\n", + ds_put_format(ds, " partner port_priority: %u\n", ntohs(slave->partner.port_priority)); - ds_put_format(ds, "\tpartner key: %u\n", + ds_put_format(ds, " partner key: %u\n", ntohs(slave->partner.key)); - ds_put_cstr(ds, "\tpartner state:"); + ds_put_cstr(ds, " partner state:"); ds_put_lacp_state(ds, slave->partner.state); ds_put_cstr(ds, "\n"); } @@ -1021,14 +1021,14 @@ lacp_print_stats(struct ds *ds, struct lacp *lacp) OVS_REQUIRES(mutex) for (i = 0; i < shash_count(&slave_shash); i++) { slave = sorted_slaves[i]->data; ds_put_format(ds, "\nslave: %s:\n", slave->name); - ds_put_format(ds, "\tRX PDUs: %u\n", slave->count_rx_pdus); - ds_put_format(ds, "\tRX Bad PDUs: %u\n", slave->count_rx_pdus_bad); - ds_put_format(ds, "\tTX PDUs: %u\n", slave->count_tx_pdus); - ds_put_format(ds, "\tLink Expired: %u\n", + ds_put_format(ds, " RX PDUs: %u\n", slave->count_rx_pdus); + ds_put_format(ds, " RX Bad PDUs: %u\n", slave->count_rx_pdus_bad); + ds_put_format(ds, " TX PDUs: %u\n", slave->count_tx_pdus); + ds_put_format(ds, " Link Expired: %u\n", slave->count_link_expired); - ds_put_format(ds, "\tLink Defaulted: %u\n", + ds_put_format(ds, " Link Defaulted: %u\n", slave->count_link_defaulted); - ds_put_format(ds, "\tCarrier Status Changed: %u\n", + ds_put_format(ds, " Carrier Status Changed: %u\n", slave->count_carrier_changed); } @@ -1108,35 +1108,35 @@ lacp_get_slave_stats(const struct lacp *lacp, const void *slave_, struct lacp_sl slave = slave_lookup(lacp, slave_); if (slave) { - ret = true; - slave_get_actor(slave, &actor); - stats->dot3adAggPortActorSystemID = actor.sys_id; - stats->dot3adAggPortPartnerOperSystemID = slave->partner.sys_id; - stats->dot3adAggPortAttachedAggID = (lacp->key_slave->key ? - lacp->key_slave->key : - lacp->key_slave->port_id); - - /* Construct my admin-state. Assume aggregation is configured on. */ - stats->dot3adAggPortActorAdminState = LACP_STATE_AGG; - if (lacp->active) { - stats->dot3adAggPortActorAdminState |= LACP_STATE_ACT; - } - if (lacp->fast) { - stats->dot3adAggPortActorAdminState |= LACP_STATE_TIME; - } - /* XXX Not sure how to know the partner admin state. It - * might have to be captured and remembered during the - * negotiation phase. - */ - stats->dot3adAggPortPartnerAdminState = 0; - - stats->dot3adAggPortActorOperState = actor.state; - stats->dot3adAggPortPartnerOperState = slave->partner.state; - - /* Read out the latest counters */ - stats->dot3adAggPortStatsLACPDUsRx = slave->count_rx_pdus; - stats->dot3adAggPortStatsIllegalRx = slave->count_rx_pdus_bad; - stats->dot3adAggPortStatsLACPDUsTx = slave->count_tx_pdus; + ret = true; + slave_get_actor(slave, &actor); + stats->dot3adAggPortActorSystemID = actor.sys_id; + stats->dot3adAggPortPartnerOperSystemID = slave->partner.sys_id; + stats->dot3adAggPortAttachedAggID = (lacp->key_slave->key ? + lacp->key_slave->key : + lacp->key_slave->port_id); + + /* Construct my admin-state. Assume aggregation is configured on. */ + stats->dot3adAggPortActorAdminState = LACP_STATE_AGG; + if (lacp->active) { + stats->dot3adAggPortActorAdminState |= LACP_STATE_ACT; + } + if (lacp->fast) { + stats->dot3adAggPortActorAdminState |= LACP_STATE_TIME; + } + /* XXX Not sure how to know the partner admin state. It + * might have to be captured and remembered during the + * negotiation phase. + */ + stats->dot3adAggPortPartnerAdminState = 0; + + stats->dot3adAggPortActorOperState = actor.state; + stats->dot3adAggPortPartnerOperState = slave->partner.state; + + /* Read out the latest counters */ + stats->dot3adAggPortStatsLACPDUsRx = slave->count_rx_pdus; + stats->dot3adAggPortStatsIllegalRx = slave->count_rx_pdus_bad; + stats->dot3adAggPortStatsLACPDUsTx = slave->count_tx_pdus; } else { ret = false; } diff --git a/tests/lacp.at b/tests/lacp.at index 7ca73db04fe8..6dd949010bdf 100644 --- a/tests/lacp.at +++ b/tests/lacp.at @@ -21,30 +21,30 @@ ovs-appctl time/warp 300 100 AT_CHECK([ovs-appctl lacp/show], [0], [dnl ---- p1 ---- - status: active negotiated - sys_id: aa:55:aa:55:00:00 - sys_priority: 65535 - aggregation key: 1 - lacp_time: slow + status: active negotiated + sys_id: aa:55:aa:55:00:00 + sys_priority: 65535 + aggregation key: 1 + lacp_time: slow slave: p1: expired attached - port_id: 1 - port_priority: 65535 - may_enable: false - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65535 - actor port_id: 1 - actor port_priority: 65535 - actor key: 1 - actor state: activity synchronized collecting distributing expired - - partner sys_id: 00:00:00:00:00:00 - partner sys_priority: 0 - partner port_id: 0 - partner port_priority: 0 - partner key: 0 - partner state: timeout + port_id: 1 + port_priority: 65535 + may_enable: false + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65535 + actor port_id: 1 + actor port_priority: 65535 + actor key: 1 + actor state: activity synchronized collecting distributing expired + + partner sys_id: 00:00:00:00:00:00 + partner sys_priority: 0 + partner port_id: 0 + partner port_priority: 0 + partner key: 0 + partner state: timeout ]) AT_CHECK([ovs-appctl bond/show]) OVS_VSWITCHD_STOP @@ -72,49 +72,49 @@ ovs-appctl time/warp 300 100 AT_CHECK([ovs-appctl lacp/show], [0], [stdout]) AT_CHECK([sed -e 's/aggregation key:.*/aggregation key: /' < stdout], [0], [dnl ---- bond ---- - status: active negotiated - sys_id: 11:22:33:44:55:66 - sys_priority: 54321 - aggregation key: - lacp_time: fast + status: active negotiated + sys_id: 11:22:33:44:55:66 + sys_priority: 54321 + aggregation key: + lacp_time: fast slave: p1: expired attached - port_id: 11 - port_priority: 111 - may_enable: false - - actor sys_id: 11:22:33:44:55:66 - actor sys_priority: 54321 - actor port_id: 11 - actor port_priority: 111 - actor key: 3333 - actor state: activity timeout aggregation synchronized collecting distributing expired - - partner sys_id: 00:00:00:00:00:00 - partner sys_priority: 0 - partner port_id: 0 - partner port_priority: 0 - partner key: 0 - partner state: timeout + port_id: 11 + port_priority: 111 + may_enable: false + + actor sys_id: 11:22:33:44:55:66 + actor sys_priority: 54321 + actor port_id: 11 + actor port_priority: 111 + actor key: 3333 + actor state: activity timeout aggregation synchronized collecting distributing expired + + partner sys_id: 00:00:00:00:00:00 + partner sys_priority: 0 + partner port_id: 0 + partner port_priority: 0 + partner key: 0 + partner state: timeout slave: p2: expired attached - port_id: 22 - port_priority: 222 - may_enable: false - - actor sys_id: 11:22:33:44:55:66 - actor sys_priority: 54321 - actor port_id: 22 - actor port_priority: 222 - actor key: 3333 - actor state: activity timeout aggregation synchronized collecting distributing expired - - partner sys_id: 00:00:00:00:00:00 - partner sys_priority: 0 - partner port_id: 0 - partner port_priority: 0 - partner key: 0 - partner state: timeout + port_id: 22 + port_priority: 222 + may_enable: false + + actor sys_id: 11:22:33:44:55:66 + actor sys_priority: 54321 + actor port_id: 22 + actor port_priority: 222 + actor key: 3333 + actor state: activity timeout aggregation synchronized collecting distributing expired + + partner sys_id: 00:00:00:00:00:00 + partner sys_priority: 0 + partner port_id: 0 + partner port_priority: 0 + partner key: 0 + partner state: timeout ]) AT_CHECK([ovs-appctl bond/show], [0], [dnl ---- bond ---- @@ -195,93 +195,93 @@ ovs-appctl bond/show bond0 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ovs-appctl bond/show bond1 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ], [0], [stdout]) AT_CHECK([sed '/active slave/d' stdout], [0], [dnl ---- bond0 ---- - status: active negotiated - sys_id: aa:55:aa:55:00:00 - sys_priority: 65534 - aggregation key: 2 - lacp_time: fast + status: active negotiated + sys_id: aa:55:aa:55:00:00 + sys_priority: 65534 + aggregation key: 2 + lacp_time: fast slave: p0: current attached - port_id: 1 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 1 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:66:aa:66:00:00 - partner sys_priority: 65534 - partner port_id: 3 - partner port_priority: 65535 - partner key: 4 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 1 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 1 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:66:aa:66:00:00 + partner sys_priority: 65534 + partner port_id: 3 + partner port_priority: 65535 + partner key: 4 + partner state: activity timeout aggregation synchronized collecting distributing slave: p1: current attached - port_id: 2 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 2 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:66:aa:66:00:00 - partner sys_priority: 65534 - partner port_id: 4 - partner port_priority: 65535 - partner key: 4 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 2 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 2 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:66:aa:66:00:00 + partner sys_priority: 65534 + partner port_id: 4 + partner port_priority: 65535 + partner key: 4 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond1 ---- - status: active negotiated - sys_id: aa:66:aa:66:00:00 - sys_priority: 65534 - aggregation key: 4 - lacp_time: fast + status: active negotiated + sys_id: aa:66:aa:66:00:00 + sys_priority: 65534 + aggregation key: 4 + lacp_time: fast slave: p2: current attached - port_id: 3 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 3 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:55:aa:55:00:00 - partner sys_priority: 65534 - partner port_id: 1 - partner port_priority: 65535 - partner key: 2 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 3 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 3 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:55:aa:55:00:00 + partner sys_priority: 65534 + partner port_id: 1 + partner port_priority: 65535 + partner key: 2 + partner state: activity timeout aggregation synchronized collecting distributing slave: p3: current attached - port_id: 4 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 4 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:55:aa:55:00:00 - partner sys_priority: 65534 - partner port_id: 2 - partner port_priority: 65535 - partner key: 2 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 4 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 4 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:55:aa:55:00:00 + partner sys_priority: 65534 + partner port_id: 2 + partner port_priority: 65535 + partner key: 2 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond0 ---- bond_mode: balance-tcp bond may use recirculation: yes, @@ -332,93 +332,93 @@ ovs-appctl lacp/show bond1 ovs-appctl bond/show bond0 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ovs-appctl bond/show bond1 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ], [0], [dnl ---- bond0 ---- - status: active negotiated - sys_id: aa:55:aa:55:00:00 - sys_priority: 65534 - aggregation key: 2 - lacp_time: fast + status: active negotiated + sys_id: aa:55:aa:55:00:00 + sys_priority: 65534 + aggregation key: 2 + lacp_time: fast slave: p0: expired attached - port_id: 1 - port_priority: 65535 - may_enable: false - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 1 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation synchronized collecting distributing expired - - partner sys_id: aa:66:aa:66:00:00 - partner sys_priority: 65534 - partner port_id: 3 - partner port_priority: 65535 - partner key: 4 - partner state: activity timeout aggregation collecting distributing + port_id: 1 + port_priority: 65535 + may_enable: false + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 1 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation synchronized collecting distributing expired + + partner sys_id: aa:66:aa:66:00:00 + partner sys_priority: 65534 + partner port_id: 3 + partner port_priority: 65535 + partner key: 4 + partner state: activity timeout aggregation collecting distributing slave: p1: current attached - port_id: 2 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 2 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:66:aa:66:00:00 - partner sys_priority: 65534 - partner port_id: 4 - partner port_priority: 65535 - partner key: 4 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 2 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 2 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:66:aa:66:00:00 + partner sys_priority: 65534 + partner port_id: 4 + partner port_priority: 65535 + partner key: 4 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond1 ---- - status: active negotiated - sys_id: aa:66:aa:66:00:00 - sys_priority: 65534 - aggregation key: 4 - lacp_time: fast + status: active negotiated + sys_id: aa:66:aa:66:00:00 + sys_priority: 65534 + aggregation key: 4 + lacp_time: fast slave: p2: expired attached - port_id: 3 - port_priority: 65535 - may_enable: false - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 3 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation synchronized collecting distributing expired - - partner sys_id: aa:55:aa:55:00:00 - partner sys_priority: 65534 - partner port_id: 1 - partner port_priority: 65535 - partner key: 2 - partner state: activity timeout aggregation collecting distributing + port_id: 3 + port_priority: 65535 + may_enable: false + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 3 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation synchronized collecting distributing expired + + partner sys_id: aa:55:aa:55:00:00 + partner sys_priority: 65534 + partner port_id: 1 + partner port_priority: 65535 + partner key: 2 + partner state: activity timeout aggregation collecting distributing slave: p3: current attached - port_id: 4 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 4 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:55:aa:55:00:00 - partner sys_priority: 65534 - partner port_id: 2 - partner port_priority: 65535 - partner key: 2 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 4 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 4 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:55:aa:55:00:00 + partner sys_priority: 65534 + partner port_id: 2 + partner port_priority: 65535 + partner key: 2 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond0 ---- bond_mode: balance-tcp bond may use recirculation: yes, @@ -464,93 +464,93 @@ ovs-appctl lacp/show bond1 ovs-appctl bond/show bond0 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ovs-appctl bond/show bond1 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ], [0], [dnl ---- bond0 ---- - status: active negotiated - sys_id: aa:55:aa:55:00:00 - sys_priority: 65534 - aggregation key: 2 - lacp_time: fast + status: active negotiated + sys_id: aa:55:aa:55:00:00 + sys_priority: 65534 + aggregation key: 2 + lacp_time: fast slave: p0: defaulted detached - port_id: 1 - port_priority: 65535 - may_enable: false - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 1 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation defaulted - - partner sys_id: 00:00:00:00:00:00 - partner sys_priority: 0 - partner port_id: 0 - partner port_priority: 0 - partner key: 0 - partner state: + port_id: 1 + port_priority: 65535 + may_enable: false + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 1 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation defaulted + + partner sys_id: 00:00:00:00:00:00 + partner sys_priority: 0 + partner port_id: 0 + partner port_priority: 0 + partner key: 0 + partner state: slave: p1: current attached - port_id: 2 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 2 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:66:aa:66:00:00 - partner sys_priority: 65534 - partner port_id: 4 - partner port_priority: 65535 - partner key: 4 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 2 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 2 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:66:aa:66:00:00 + partner sys_priority: 65534 + partner port_id: 4 + partner port_priority: 65535 + partner key: 4 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond1 ---- - status: active negotiated - sys_id: aa:66:aa:66:00:00 - sys_priority: 65534 - aggregation key: 4 - lacp_time: fast + status: active negotiated + sys_id: aa:66:aa:66:00:00 + sys_priority: 65534 + aggregation key: 4 + lacp_time: fast slave: p2: defaulted detached - port_id: 3 - port_priority: 65535 - may_enable: false - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 3 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation defaulted - - partner sys_id: 00:00:00:00:00:00 - partner sys_priority: 0 - partner port_id: 0 - partner port_priority: 0 - partner key: 0 - partner state: + port_id: 3 + port_priority: 65535 + may_enable: false + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 3 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation defaulted + + partner sys_id: 00:00:00:00:00:00 + partner sys_priority: 0 + partner port_id: 0 + partner port_priority: 0 + partner key: 0 + partner state: slave: p3: current attached - port_id: 4 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 4 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:55:aa:55:00:00 - partner sys_priority: 65534 - partner port_id: 2 - partner port_priority: 65535 - partner key: 2 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 4 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 4 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:55:aa:55:00:00 + partner sys_priority: 65534 + partner port_id: 2 + partner port_priority: 65535 + partner key: 2 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond0 ---- bond_mode: balance-tcp bond may use recirculation: yes, @@ -601,93 +601,93 @@ ovs-appctl lacp/show bond1 ovs-appctl bond/show bond0 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ovs-appctl bond/show bond1 | STRIP_RECIRC_ID | STRIP_ACTIVE_SLAVE_MAC ], [0], [dnl ---- bond0 ---- - status: active negotiated - sys_id: aa:55:aa:55:00:00 - sys_priority: 65534 - aggregation key: 2 - lacp_time: fast + status: active negotiated + sys_id: aa:55:aa:55:00:00 + sys_priority: 65534 + aggregation key: 2 + lacp_time: fast slave: p0: current attached - port_id: 1 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 1 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:66:aa:66:00:00 - partner sys_priority: 65534 - partner port_id: 3 - partner port_priority: 65535 - partner key: 4 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 1 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 1 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:66:aa:66:00:00 + partner sys_priority: 65534 + partner port_id: 3 + partner port_priority: 65535 + partner key: 4 + partner state: activity timeout aggregation synchronized collecting distributing slave: p1: current attached - port_id: 2 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:55:aa:55:00:00 - actor sys_priority: 65534 - actor port_id: 2 - actor port_priority: 65535 - actor key: 2 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:66:aa:66:00:00 - partner sys_priority: 65534 - partner port_id: 4 - partner port_priority: 65535 - partner key: 4 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 2 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:55:aa:55:00:00 + actor sys_priority: 65534 + actor port_id: 2 + actor port_priority: 65535 + actor key: 2 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:66:aa:66:00:00 + partner sys_priority: 65534 + partner port_id: 4 + partner port_priority: 65535 + partner key: 4 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond1 ---- - status: active negotiated - sys_id: aa:66:aa:66:00:00 - sys_priority: 65534 - aggregation key: 4 - lacp_time: fast + status: active negotiated + sys_id: aa:66:aa:66:00:00 + sys_priority: 65534 + aggregation key: 4 + lacp_time: fast slave: p2: current attached - port_id: 3 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 3 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:55:aa:55:00:00 - partner sys_priority: 65534 - partner port_id: 1 - partner port_priority: 65535 - partner key: 2 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 3 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 3 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:55:aa:55:00:00 + partner sys_priority: 65534 + partner port_id: 1 + partner port_priority: 65535 + partner key: 2 + partner state: activity timeout aggregation synchronized collecting distributing slave: p3: current attached - port_id: 4 - port_priority: 65535 - may_enable: true - - actor sys_id: aa:66:aa:66:00:00 - actor sys_priority: 65534 - actor port_id: 4 - actor port_priority: 65535 - actor key: 4 - actor state: activity timeout aggregation synchronized collecting distributing - - partner sys_id: aa:55:aa:55:00:00 - partner sys_priority: 65534 - partner port_id: 2 - partner port_priority: 65535 - partner key: 2 - partner state: activity timeout aggregation synchronized collecting distributing + port_id: 4 + port_priority: 65535 + may_enable: true + + actor sys_id: aa:66:aa:66:00:00 + actor sys_priority: 65534 + actor port_id: 4 + actor port_priority: 65535 + actor key: 4 + actor state: activity timeout aggregation synchronized collecting distributing + + partner sys_id: aa:55:aa:55:00:00 + partner sys_priority: 65534 + partner port_id: 2 + partner port_priority: 65535 + partner key: 2 + partner state: activity timeout aggregation synchronized collecting distributing ---- bond0 ---- bond_mode: balance-tcp bond may use recirculation: yes, From patchwork Mon Jun 4 21:27:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925237 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=none (p=none dis=none) header.from=ovn.org 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 4107P70HGbz9s08 for ; Tue, 5 Jun 2018 07:29:31 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id AEAD3116F; Mon, 4 Jun 2018 21:28:05 +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 120CC1151 for ; Mon, 4 Jun 2018 21:28:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3ABDE713 for ; Mon, 4 Jun 2018 21:28:03 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 76B45240005; Mon, 4 Jun 2018 23:28:04 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:42 -0700 Message-Id: <20180604212750.14643-5-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 05/13] ovs-lldp: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- lib/ovs-lldp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/ovs-lldp.c b/lib/ovs-lldp.c index d7062f3252cb..05c1dd4344be 100644 --- a/lib/ovs-lldp.c +++ b/lib/ovs-lldp.c @@ -180,16 +180,16 @@ aa_print_lldp_and_aa_stats(struct ds *ds, struct lldp *lldp) } LIST_FOR_EACH (hw, h_entries, &lldp->lldpd->g_hardware) { - ds_put_format(ds, "\ttx cnt: %"PRIu64"\n", hw->h_tx_cnt); - ds_put_format(ds, "\trx cnt: %"PRIu64"\n", hw->h_rx_cnt); - ds_put_format(ds, "\trx discarded cnt: %"PRIu64"\n", + ds_put_format(ds, " tx cnt: %"PRIu64"\n", hw->h_tx_cnt); + ds_put_format(ds, " rx cnt: %"PRIu64"\n", hw->h_rx_cnt); + ds_put_format(ds, " rx discarded cnt: %"PRIu64"\n", hw->h_rx_discarded_cnt); - ds_put_format(ds, "\trx unrecognized cnt: %"PRIu64"\n", + ds_put_format(ds, " rx unrecognized cnt: %"PRIu64"\n", hw->h_rx_unrecognized_cnt); - ds_put_format(ds, "\tageout cnt: %"PRIu64"\n", hw->h_ageout_cnt); - ds_put_format(ds, "\tinsert cnt: %"PRIu64"\n", hw->h_insert_cnt); - ds_put_format(ds, "\tdelete cnt: %"PRIu64"\n", hw->h_delete_cnt); - ds_put_format(ds, "\tdrop cnt: %"PRIu64"\n", hw->h_drop_cnt); + ds_put_format(ds, " ageout cnt: %"PRIu64"\n", hw->h_ageout_cnt); + ds_put_format(ds, " insert cnt: %"PRIu64"\n", hw->h_insert_cnt); + ds_put_format(ds, " delete cnt: %"PRIu64"\n", hw->h_delete_cnt); + ds_put_format(ds, " drop cnt: %"PRIu64"\n", hw->h_drop_cnt); } } @@ -219,11 +219,11 @@ aa_print_element_status_port(struct ds *ds, struct lldpd_hardware *hw) chassisid_to_string((uint8_t *) &port->p_element.system_id, sizeof port->p_element.system_id, &system); - ds_put_format(ds, "\tAuto Attach Primary Server Id: %s\n", + ds_put_format(ds, " Auto Attach Primary Server Id: %s\n", id ? id : none_str); - ds_put_format(ds, "\tAuto Attach Primary Server Descr: %s\n", + ds_put_format(ds, " Auto Attach Primary Server Descr: %s\n", descr ? descr : none_str); - ds_put_format(ds, "\tAuto Attach Primary Server System Id: %s\n", + ds_put_format(ds, " Auto Attach Primary Server System Id: %s\n", system); free(id); @@ -391,7 +391,7 @@ update_mapping_on_lldp(struct lldp *lldp, struct lldpd_hardware *hardware, { struct lldpd_aa_isid_vlan_maps_tlv *lm = xzalloc(sizeof *lm); - VLOG_INFO("\t\t hardware->h_ifname=%s", hardware->h_ifname); + VLOG_INFO(" hardware->h_ifname=%s", hardware->h_ifname); lm->isid_vlan_data.isid = m->isid; lm->isid_vlan_data.vlan = m->vlan; @@ -526,7 +526,7 @@ aa_mapping_register(void *aux, const struct aa_mapping_settings *s) struct lldpd_hardware *hw; struct aa_mapping_internal *m; - VLOG_INFO("\t lldp->name=%s", lldp->name); + VLOG_INFO(" lldp->name=%s", lldp->name); if (mapping_find_by_isid(lldp, s->isid)) { continue; @@ -566,7 +566,7 @@ aa_mapping_unregister_mapping(struct lldp *lldp, uint32_t isid = lm->isid_vlan_data.isid; if (isid == m->isid) { - VLOG_INFO("\t\t Removing lport, isid=%u, vlan=%u", + VLOG_INFO(" Removing lport, isid=%u, vlan=%u", isid, lm->isid_vlan_data.vlan); @@ -609,7 +609,7 @@ aa_mapping_unregister(void *aux) uint16_t vlan = m->vlan; struct aa_mapping_internal *p = mapping_find_by_isid(lldp, isid); - VLOG_INFO("\t Removing mapping ISID=%"PRIu32", VLAN=%"PRIu16 + VLOG_INFO(" Removing mapping ISID=%"PRIu32", VLAN=%"PRIu16 " (lldp->name=%s)", isid, vlan, lldp->name); if (p) { @@ -620,7 +620,7 @@ aa_mapping_unregister(void *aux) /* Remove from all the lldp instances */ LIST_FOR_EACH (hw, h_entries, &lldp->lldpd->g_hardware) { - VLOG_INFO("\t\t hardware->h_ifname=%s", hw->h_ifname); + VLOG_INFO(" hardware->h_ifname=%s", hw->h_ifname); aa_mapping_unregister_mapping(lldp, hw, m); } free(m); From patchwork Mon Jun 4 21:27:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925239 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=none (p=none dis=none) header.from=ovn.org 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 4107QD5z5Tz9s08 for ; Tue, 5 Jun 2018 07:30:28 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 65F461181; Mon, 4 Jun 2018 21:28:07 +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 A9145115B for ; Mon, 4 Jun 2018 21:28:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9A048713 for ; Mon, 4 Jun 2018 21:28:04 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id DBDDD240009; Mon, 4 Jun 2018 23:28:05 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:43 -0700 Message-Id: <20180604212750.14643-6-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 06/13] rstp, stp: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- lib/rstp.c | 22 +++++++++++----------- lib/stp.c | 23 ++++++++++++----------- tests/stp.at | 14 +++++++------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/lib/rstp.c b/lib/rstp.c index 7a61b24d7b36..7e351bf32ff8 100644 --- a/lib/rstp.c +++ b/lib/rstp.c @@ -1583,15 +1583,15 @@ rstp_bridge_id_details(struct ds *ds, const rstp_identifier bridge_id, OVS_REQUIRES(rstp_mutex) { uint16_t priority = bridge_id >> 48; - ds_put_format(ds, "\tstp-priority\t%"PRIu16"\n", priority); + ds_put_format(ds, " stp-priority %"PRIu16"\n", priority); struct eth_addr mac; const uint64_t mac_bits = (UINT64_C(1) << 48) - 1; eth_addr_from_uint64(bridge_id & mac_bits, &mac); - ds_put_format(ds, "\tstp-system-id\t"ETH_ADDR_FMT"\n", ETH_ADDR_ARGS(mac)); - ds_put_format(ds, "\tstp-hello-time\t%"PRIu16"s\n", hello_time); - ds_put_format(ds, "\tstp-max-age\t%"PRIu16"s\n", max_age); - ds_put_format(ds, "\tstp-fwd-delay\t%"PRIu16"s\n", forward_delay); + ds_put_format(ds, " stp-system-id "ETH_ADDR_FMT"\n", ETH_ADDR_ARGS(mac)); + ds_put_format(ds, " stp-hello-time %"PRIu16"s\n", hello_time); + ds_put_format(ds, " stp-max-age %"PRIu16"s\n", max_age); + ds_put_format(ds, " stp-fwd-delay %"PRIu16"s\n", forward_delay); } static void @@ -1606,7 +1606,7 @@ rstp_print_details(struct ds *ds, const struct rstp *rstp) rstp->bridge_hello_time, rstp->bridge_max_age, rstp->bridge_forward_delay); - ds_put_cstr(ds, "\tThis bridge is the root\n"); + ds_put_cstr(ds, " This bridge is the root\n"); } else { struct rstp_port *root_port = rstp_get_root_port__(rstp); if (!root_port) { @@ -1618,8 +1618,8 @@ rstp_print_details(struct ds *ds, const struct rstp *rstp) root_port->designated_times.hello_time, root_port->designated_times.max_age, root_port->designated_times.forward_delay); - ds_put_format(ds, "\troot-port\t%s\n", root_port->port_name); - ds_put_format(ds, "\troot-path-cost\t%u\n", + ds_put_format(ds, " root-port %s\n", root_port->port_name); + ds_put_format(ds, " root-path-cost %u\n", rstp_get_root_path_cost__(rstp)); } ds_put_cstr(ds, "\n"); @@ -1631,14 +1631,14 @@ rstp_print_details(struct ds *ds, const struct rstp *rstp) rstp->bridge_forward_delay); ds_put_cstr(ds, "\n"); - ds_put_format(ds, "\t%-11.10s%-11.10s%-11.10s%-9.8s%-8.7s\n", + ds_put_format(ds, " %-11.10s%-11.10s%-11.10s%-9.8s%-8.7s\n", "Interface", "Role", "State", "Cost", "Pri.Nbr"); - ds_put_cstr(ds, "\t---------- ---------- ---------- -------- -------\n"); + ds_put_cstr(ds, " ---------- ---------- ---------- -------- -------\n"); struct rstp_port *p; HMAP_FOR_EACH (p, node, &rstp->ports) { if (p->rstp_state != RSTP_DISABLED) { - ds_put_format(ds, "\t%-11.10s", + ds_put_format(ds, " %-11.10s", p->port_name ? p->port_name : "null"); ds_put_format(ds, "%-11.10s", rstp_port_role_name(p->role)); ds_put_format(ds, "%-11.10s", rstp_state_name(p->rstp_state)); diff --git a/lib/stp.c b/lib/stp.c index 9910d593771b..809b405a5298 100644 --- a/lib/stp.c +++ b/lib/stp.c @@ -1644,16 +1644,17 @@ stp_bridge_id_details(struct ds *ds, const stp_identifier bridge_id, OVS_REQUIRES(mutex) { uint16_t priority = bridge_id >> 48; - ds_put_format(ds, "\tstp-priority\t%"PRIu16"\n", priority); + ds_put_format(ds, " stp-priority %"PRIu16"\n", priority); struct eth_addr mac; const uint64_t mac_bits = (UINT64_C(1) << 48) - 1; eth_addr_from_uint64(bridge_id & mac_bits, &mac); - ds_put_format(ds, "\tstp-system-id\t"ETH_ADDR_FMT"\n", ETH_ADDR_ARGS(mac)); - ds_put_format(ds, "\tstp-hello-time\t%ds\n", + ds_put_format(ds, " stp-system-id "ETH_ADDR_FMT"\n", + ETH_ADDR_ARGS(mac)); + ds_put_format(ds, " stp-hello-time %ds\n", timer_to_ms(hello_time) / 1000); - ds_put_format(ds, "\tstp-max-age\t%ds\n", timer_to_ms(max_age) / 1000); - ds_put_format(ds, "\tstp-fwd-delay\t%ds\n", + ds_put_format(ds, " stp-max-age %ds\n", timer_to_ms(max_age) / 1000); + ds_put_format(ds, " stp-fwd-delay %ds\n", timer_to_ms(forward_delay) / 1000); } @@ -1670,10 +1671,10 @@ stp_print_details(struct ds *ds, const struct stp *stp) stp->bridge_max_age, stp->bridge_forward_delay); if (stp_is_root_bridge(stp)) { - ds_put_cstr(ds, "\tThis bridge is the root\n"); + ds_put_cstr(ds, " This bridge is the root\n"); } else { - ds_put_format(ds, "\troot-port\t%s\n", stp->root_port->port_name); - ds_put_format(ds, "\troot-path-cost\t%u\n", stp->root_path_cost); + ds_put_format(ds, " root-port %s\n", stp->root_port->port_name); + ds_put_format(ds, " root-path-cost %u\n", stp->root_path_cost); } ds_put_cstr(ds, "\n"); @@ -1685,11 +1686,11 @@ stp_print_details(struct ds *ds, const struct stp *stp) ds_put_cstr(ds, "\n"); const struct stp_port *p; - ds_put_format(ds, "\t%-11.10s%-11.10s%-11.10s%-6.5s%-8.7s\n", + ds_put_format(ds, " %-11.10s%-11.10s%-11.10s%-6.5s%-8.7s\n", "Interface", "Role", "State", "Cost", "Pri.Nbr"); - ds_put_cstr(ds, "\t---------- ---------- ---------- ----- -------\n"); + ds_put_cstr(ds, " ---------- ---------- ---------- ----- -------\n"); FOR_EACH_ENABLED_PORT (p, stp) { - ds_put_format(ds, "\t%-11.10s", p->port_name); + ds_put_format(ds, " %-11.10s", p->port_name); ds_put_format(ds, "%-11.10s", stp_role_name(stp_port_get_role(p))); ds_put_format(ds, "%-11.10s", stp_state_name(p->state)); ds_put_format(ds, "%-6d", p->path_cost); diff --git a/tests/stp.at b/tests/stp.at index 9550f72b56a8..3d85acdb9f3f 100644 --- a/tests/stp.at +++ b/tests/stp.at @@ -617,10 +617,10 @@ ovs-appctl time/stop ovs-appctl time/warp 31000 1000 AT_CHECK([ovs-appctl stp/show br0 | grep p1], [0], [dnl - p1 designated forwarding 19 128.1 + p1 designated forwarding 19 128.1 ]) AT_CHECK([ovs-appctl stp/show br0 | grep p2], [0], [dnl - p2 designated forwarding 19 128.2 + p2 designated forwarding 19 128.2 ]) # add a stp port @@ -634,10 +634,10 @@ ovs-appctl netdev-dummy/set-admin-state p3 down # We should not show the p3 because its link-state is down AT_CHECK([ovs-appctl stp/show br0 | grep p1], [0], [dnl - p1 designated forwarding 19 128.1 + p1 designated forwarding 19 128.1 ]) AT_CHECK([ovs-appctl stp/show br0 | grep p2], [0], [dnl - p2 designated forwarding 19 128.2 + p2 designated forwarding 19 128.2 ]) AT_CHECK([ovs-appctl stp/show br0 | grep p3], [1], [dnl ]) @@ -645,13 +645,13 @@ AT_CHECK([ovs-appctl stp/show br0 | grep p3], [1], [dnl ovs-appctl netdev-dummy/set-admin-state p3 up AT_CHECK([ovs-appctl stp/show br0 | grep p1], [0], [dnl - p1 designated forwarding 19 128.1 + p1 designated forwarding 19 128.1 ]) AT_CHECK([ovs-appctl stp/show br0 | grep p2], [0], [dnl - p2 designated forwarding 19 128.2 + p2 designated forwarding 19 128.2 ]) AT_CHECK([ovs-appctl stp/show br0 | grep p3], [0], [dnl - p3 designated listening 19 128.3 + p3 designated listening 19 128.3 ]) From patchwork Mon Jun 4 21:27:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925241 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=none (p=none dis=none) header.from=ovn.org 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 4107Qx4xRHz9s08 for ; Tue, 5 Jun 2018 07:31:05 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 5FBEE115F; Mon, 4 Jun 2018 21:28:08 +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 96293115D for ; Mon, 4 Jun 2018 21:28:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0A6CE716 for ; Mon, 4 Jun 2018 21:28:05 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 3B58F240003; Mon, 4 Jun 2018 23:28:06 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:44 -0700 Message-Id: <20180604212750.14643-7-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 07/13] stopwatch: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- lib/stopwatch.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/stopwatch.c b/lib/stopwatch.c index 20e2eefc0445..2e69d8189aa5 100644 --- a/lib/stopwatch.c +++ b/lib/stopwatch.c @@ -280,14 +280,14 @@ stopwatch_print(struct stopwatch *sw, const char *name, ds_put_format(s, "Statistics for '%s'\n", name); const char *units = unit_name[sw->units]; - ds_put_format(s, "\t Total samples: %llu\n", sw->n_samples); - ds_put_format(s, "\t Maximum: %llu %s\n", sw->max, units); - ds_put_format(s, "\t Minimum: %llu %s\n", sw->min, units); - ds_put_format(s, "\t 95th percentile: %f %s\n", + ds_put_format(s, " Total samples: %llu\n", sw->n_samples); + ds_put_format(s, " Maximum: %llu %s\n", sw->max, units); + ds_put_format(s, " Minimum: %llu %s\n", sw->min, units); + ds_put_format(s, " 95th percentile: %f %s\n", sw->pctl.percentile, units); - ds_put_format(s, "\t Short term average: %f %s\n", + ds_put_format(s, " Short term average: %f %s\n", sw->short_term.average, units); - ds_put_format(s, "\t Long term average: %f %s\n", + ds_put_format(s, " Long term average: %f %s\n", sw->long_term.average, units); } From patchwork Mon Jun 4 21:27:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925242 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=none (p=none dis=none) header.from=ovn.org 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 4107RS6zVYz9s08 for ; Tue, 5 Jun 2018 07:31:32 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 266DE11AB; Mon, 4 Jun 2018 21:28:10 +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 45BA51187 for ; Mon, 4 Jun 2018 21:28:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 566B4713 for ; Mon, 4 Jun 2018 21:28:07 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id A5EA824000C; Mon, 4 Jun 2018 23:28:08 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:45 -0700 Message-Id: <20180604212750.14643-8-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 08/13] bond: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- ofproto/bond.c | 8 ++++---- tests/lacp.at | 52 +++++++++++++++++++++++++-------------------------- tests/ofproto-dpif.at | 20 ++++++++++---------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/ofproto/bond.c b/ofproto/bond.c index 11d28e1379b9..f87cdba7908f 100644 --- a/ofproto/bond.c +++ b/ofproto/bond.c @@ -1374,15 +1374,15 @@ bond_print_details(struct ds *ds, const struct bond *bond) ds_put_format(ds, "\nslave %s: %s\n", slave->name, slave->enabled ? "enabled" : "disabled"); if (slave == bond->active_slave) { - ds_put_cstr(ds, "\tactive slave\n"); + ds_put_cstr(ds, " active slave\n"); } if (slave->delay_expires != LLONG_MAX) { - ds_put_format(ds, "\t%s expires in %lld ms\n", + ds_put_format(ds, " %s expires in %lld ms\n", slave->enabled ? "downdelay" : "updelay", slave->delay_expires - time_msec()); } - ds_put_format(ds, "\tmay_enable: %s\n", + ds_put_format(ds, " may_enable: %s\n", slave->may_enable ? "true" : "false"); if (!bond_is_balanced(bond)) { @@ -1400,7 +1400,7 @@ bond_print_details(struct ds *ds, const struct bond *bond) be_tx_k = be->tx_bytes / 1024; if (be_tx_k) { - ds_put_format(ds, "\thash %d: %"PRIu64" kB load\n", + ds_put_format(ds, " hash %d: %"PRIu64" kB load\n", hash, be_tx_k); } diff --git a/tests/lacp.at b/tests/lacp.at index 6dd949010bdf..ee8100858541 100644 --- a/tests/lacp.at +++ b/tests/lacp.at @@ -128,10 +128,10 @@ lacp_fallback_ab: false active slave mac: 00:00:00:00:00:00(none) slave p1: disabled - may_enable: false + may_enable: false slave p2: disabled - may_enable: false + may_enable: false ]) OVS_VSWITCHD_STOP @@ -292,10 +292,10 @@ lacp_status: negotiated lacp_fallback_ab: false slave p0: enabled - may_enable: true + may_enable: true slave p1: enabled - may_enable: true + may_enable: true ---- bond1 ---- bond_mode: balance-tcp @@ -307,15 +307,15 @@ lacp_status: negotiated lacp_fallback_ab: false slave p2: enabled - may_enable: true + may_enable: true slave p3: enabled - may_enable: true + may_enable: true ]) AT_CHECK([grep 'active slave$' stdout], [0], [dnl - active slave - active slave + active slave + active slave ]) # Redirect the patch link between p0 and p2 so that no packets get @@ -430,11 +430,11 @@ lacp_fallback_ab: false slave p0: disabled - may_enable: false + may_enable: false slave p1: enabled - active slave - may_enable: true + active slave + may_enable: true ---- bond1 ---- bond_mode: balance-tcp @@ -447,11 +447,11 @@ lacp_fallback_ab: false slave p2: disabled - may_enable: false + may_enable: false slave p3: enabled - active slave - may_enable: true + active slave + may_enable: true ]) @@ -562,11 +562,11 @@ lacp_fallback_ab: false slave p0: disabled - may_enable: false + may_enable: false slave p1: enabled - active slave - may_enable: true + active slave + may_enable: true ---- bond1 ---- bond_mode: balance-tcp @@ -579,11 +579,11 @@ lacp_fallback_ab: false slave p2: disabled - may_enable: false + may_enable: false slave p3: enabled - active slave - may_enable: true + active slave + may_enable: true ]) @@ -699,11 +699,11 @@ lacp_fallback_ab: false slave p0: enabled - may_enable: true + may_enable: true slave p1: enabled - active slave - may_enable: true + active slave + may_enable: true ---- bond1 ---- bond_mode: balance-tcp @@ -716,11 +716,11 @@ lacp_fallback_ab: false slave p2: enabled - may_enable: true + may_enable: true slave p3: enabled - active slave - may_enable: true + active slave + may_enable: true ]) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 2bfbfa2f3445..f9ae8b28213c 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -8601,10 +8601,10 @@ AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl ]) # bond/show should show 'may-enable: true' for all slaves. AT_CHECK([ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'], [0], [dnl - may_enable: true - may_enable: true - may_enable: true - may_enable: true + may_enable: true + may_enable: true + may_enable: true + may_enable: true ]) # now disable the bfd on p1. @@ -8622,8 +8622,8 @@ AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl ]) # bond/show should show 'may-enable: false' for p0. AT_CHECK([ovs-appctl bond/show br0bond | sed -n '/^.*may_enable:.*/p'], [0], [dnl - may_enable: false - may_enable: true + may_enable: false + may_enable: true ]) # now enable the bfd on p1 and disable bfd on p0. @@ -8642,10 +8642,10 @@ AT_CHECK([ovs-appctl bfd/show | sed -n '/^.*Session State:.*/p'], [0], [dnl ]) # bond/show should show 'may-enable: false' for p0 and p1. AT_CHECK([ovs-appctl bond/show | sed -n '/^.*may_enable:.*/p'], [0], [dnl - may_enable: false - may_enable: true - may_enable: false - may_enable: true + may_enable: false + may_enable: true + may_enable: false + may_enable: true ]) OVS_VSWITCHD_STOP From patchwork Mon Jun 4 21:27:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925243 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=none (p=none dis=none) header.from=ovn.org 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 4107S22pVpz9s08 for ; Tue, 5 Jun 2018 07:32:02 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 22F9911B7; Mon, 4 Jun 2018 21:28:11 +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 83A91117F for ; Mon, 4 Jun 2018 21:28:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A8703711 for ; Mon, 4 Jun 2018 21:28:08 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id F28BC240002; Mon, 4 Jun 2018 23:28:09 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:46 -0700 Message-Id: <20180604212750.14643-9-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 09/13] ofproto-dpif-trace: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- ofproto/ofproto-dpif-trace.c | 2 +- tests/bfd.at | 4 ++-- tests/ofproto-dpif.at | 4 ++-- tests/system-traffic.at | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ofproto/ofproto-dpif-trace.c b/ofproto/ofproto-dpif-trace.c index 396a06ba0a6c..5f38cae16e22 100644 --- a/ofproto/ofproto-dpif-trace.c +++ b/ofproto/ofproto-dpif-trace.c @@ -637,7 +637,7 @@ ofproto_trace__(struct ofproto_dpif *ofproto, const struct flow *flow, while (slow) { enum slow_path_reason bit = rightmost_1bit(slow); - ds_put_format(output, "\n\t- %s.", + ds_put_format(output, "\n - %s.", slow_path_reason_to_explanation(bit)); slow &= ~bit; diff --git a/tests/bfd.at b/tests/bfd.at index b0b7a2f9fe27..97da74217256 100644 --- a/tests/bfd.at +++ b/tests/bfd.at @@ -241,7 +241,7 @@ AT_CHECK([ovs-appctl ofproto/trace --l7-len 0 ovs-dummy 'tunnel(tun_id=0x1,src=2 # check that the packet should be handled as BFD packet. AT_CHECK([tail -2 stdout], [0], [dnl This flow is handled by the userspace slow path because it: - - Consists of BFD packets. + - Consists of BFD packets. ], []) # turn on the check_tnl_key. @@ -258,7 +258,7 @@ AT_CHECK([ovs-appctl ofproto/trace --l7-len 0 ovs-dummy 'tunnel(tun_id=0x0,src=2 # check that the packet should be handled as BFD packet. AT_CHECK([tail -2 stdout], [0], [dnl This flow is handled by the userspace slow path because it: - - Consists of BFD packets. + - Consists of BFD packets. ], []) OVS_VSWITCHD_STOP diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index f9ae8b28213c..41b7a496617e 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -271,7 +271,7 @@ AT_CHECK([tail -4 stdout], [0], [Megaflow: recirc_id=0,eth,icmp6,in_port=1,nw_frag=no,icmp_type=0x87/0xff,icmp_code=0x0/0xff,nd_target=fe80::2020,nd_sll=66:55:44:33:22:11 Datapath actions: 10,set(nd(target=fe80::4,sll=cc:cc:cc:cc:cc:cc)),11,set(nd(target=fe80::3,sll=aa:aa:aa:aa:aa:aa)),13 This flow is handled by the userspace slow path because it: - - Uses action(s) not supported by datapath. + - Uses action(s) not supported by datapath. ]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -5173,7 +5173,7 @@ flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x080 AT_CHECK([ovs-appctl ofproto/trace ovs-dummy "$flow" -generate], [0], [stdout]) AT_CHECK_UNQUOTED([tail -3 stdout], [0], [Datapath actions: 2 This flow is handled by the userspace slow path because it: - - Uses action(s) not supported by datapath. + - Uses action(s) not supported by datapath. ]) OVS_VSWITCHD_STOP diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 2c741619eb93..7080efeb29b0 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -725,7 +725,7 @@ AT_CHECK([ovs-appctl ofproto/trace br0 "in_port=1,dl_type=0x800,dl_src=e6:66:c1: AT_CHECK([tail -3 stdout], [0], [Datapath actions: trunc(100),3,5,trunc(100),3,trunc(100),5,3,trunc(200),5,trunc(65535),3 This flow is handled by the userspace slow path because it: - - Uses action(s) not supported by datapath. + - Uses action(s) not supported by datapath. ]) dnl SLOW_ACTION test2: check actual packet truncate From patchwork Mon Jun 4 21:27:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925244 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=none (p=none dis=none) header.from=ovn.org 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 4107Sc2X0vz9s08 for ; Tue, 5 Jun 2018 07:32:32 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 2236D11CC; Mon, 4 Jun 2018 21:28:12 +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 B5CC71175 for ; Mon, 4 Jun 2018 21:28:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 2FF2B716 for ; Mon, 4 Jun 2018 21:28:09 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 4846E240005; Mon, 4 Jun 2018 23:28:11 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:47 -0700 Message-Id: <20180604212750.14643-10-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 10/13] ofproto-dpif-upcall: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- ofproto/ofproto-dpif-upcall.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c index d80a10d31b7d..85f5792519b3 100644 --- a/ofproto/ofproto-dpif-upcall.c +++ b/ofproto/ofproto-dpif-upcall.c @@ -2725,11 +2725,11 @@ upcall_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED, ufid_enabled = udpif_use_ufid(udpif); ds_put_format(&ds, "%s:\n", dpif_name(udpif->dpif)); - ds_put_format(&ds, "\tflows : (current %lu)" + ds_put_format(&ds, " flows : (current %lu)" " (avg %u) (max %u) (limit %u)\n", udpif_get_n_flows(udpif), udpif->avg_n_flows, udpif->max_n_flows, flow_limit); - ds_put_format(&ds, "\tdump duration : %lldms\n", udpif->dump_duration); - ds_put_format(&ds, "\tufid enabled : "); + ds_put_format(&ds, " dump duration : %lldms\n", udpif->dump_duration); + ds_put_format(&ds, " ufid enabled : "); if (ufid_enabled) { ds_put_format(&ds, "true\n"); } else { @@ -2744,7 +2744,7 @@ upcall_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED, for (j = i; j < N_UMAPS; j += n_revalidators) { elements += cmap_count(&udpif->ukeys[j].cmap); } - ds_put_format(&ds, "\t%u: (keys %d)\n", revalidator->id, elements); + ds_put_format(&ds, " %u: (keys %d)\n", revalidator->id, elements); } } From patchwork Mon Jun 4 21:27:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925245 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=none (p=none dis=none) header.from=ovn.org 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 4107TG0JnSz9s15 for ; Tue, 5 Jun 2018 07:33:06 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 52DCB117C; Mon, 4 Jun 2018 21:28:17 +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 27AF71136 for ; Mon, 4 Jun 2018 21:28:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 16ECE71C for ; Mon, 4 Jun 2018 21:28:11 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id B98CF240009; Mon, 4 Jun 2018 23:28:12 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:48 -0700 Message-Id: <20180604212750.14643-11-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 11/13] ofproto-dpif: Remove tabs from output. 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 OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff --- ofproto/ofproto-dpif.c | 4 +- tests/bridge.at | 20 +++---- tests/mcast-snooping.at | 8 +-- tests/mpls-xlate.at | 30 +++++----- tests/netdev-type.at | 6 +- tests/nsh.at | 62 ++++++++++---------- tests/ofproto-dpif.at | 66 ++++++++++----------- tests/ovs-ofctl.at | 4 +- tests/ovs-vswitchd.at | 6 +- tests/packet-type-aware.at | 130 +++++++++++++++++++++--------------------- tests/pmd.at | 26 ++++----- tests/tunnel-push-pop-ipv6.at | 34 +++++------ tests/tunnel-push-pop.at | 54 +++++++++--------- tests/tunnel.at | 108 +++++++++++++++++------------------ 14 files changed, 278 insertions(+), 280 deletions(-) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index a45d6ea38f70..ca4582cd5064 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -5526,7 +5526,7 @@ dpif_show_backer(const struct dpif_backer *backer, struct ds *ds) continue; } - ds_put_format(ds, "\t%s:\n", ofproto->up.name); + ds_put_format(ds, " %s:\n", ofproto->up.name); ports = shash_sort(&ofproto->up.port_by_name); for (j = 0; j < shash_count(&ofproto->up.port_by_name); j++) { @@ -5535,7 +5535,7 @@ dpif_show_backer(const struct dpif_backer *backer, struct ds *ds) struct smap config; odp_port_t odp_port; - ds_put_format(ds, "\t\t%s %u/", netdev_get_name(ofport->netdev), + ds_put_format(ds, " %s %u/", netdev_get_name(ofport->netdev), ofport->ofp_port); odp_port = ofp_port_to_odp_port(ofproto, ofport->ofp_port); diff --git a/tests/bridge.at b/tests/bridge.at index 8b4e4d71d181..1c3618563294 100644 --- a/tests/bridge.at +++ b/tests/bridge.at @@ -11,10 +11,10 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p1 1/1: (dummy) - p2 2/2: (dummy) + br0: + br0 65534/100: (dummy-internal) + p1 1/1: (dummy) + p2 2/2: (dummy) ]) # Delete p1 from the datapath with "ovs-dpctl del-if" @@ -22,18 +22,18 @@ dummy@ovs-dummy: hit:0 missed:0 AT_CHECK([ovs-appctl dpctl/del-if dummy@ovs-dummy p1]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p2 2/2: (dummy) + br0: + br0 65534/100: (dummy-internal) + p2 2/2: (dummy) ]) # Force reconfiguration and make sure that p1 got added back. AT_CHECK([ovs-vsctl del-port p2]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p1 1/1: (dummy) + br0: + br0 65534/100: (dummy-internal) + p1 1/1: (dummy) ]) OVS_APP_EXIT_AND_WAIT([ovs-vswitchd]) OVS_APP_EXIT_AND_WAIT([ovsdb-server]) diff --git a/tests/mcast-snooping.at b/tests/mcast-snooping.at index f9f65cc468c2..757cf7186e73 100644 --- a/tests/mcast-snooping.at +++ b/tests/mcast-snooping.at @@ -23,10 +23,10 @@ AT_CHECK([ AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p1 1/1: (dummy) - p2 2/2: (dummy) + br0: + br0 65534/100: (dummy-internal) + p1 1/1: (dummy) + p2 2/2: (dummy) ]) ovs-appctl time/stop diff --git a/tests/mpls-xlate.at b/tests/mpls-xlate.at index 34d82a3e100e..ad3141c6412c 100644 --- a/tests/mpls-xlate.at +++ b/tests/mpls-xlate.at @@ -15,13 +15,13 @@ OVS_VSWITCHD_START( AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy) - p1 2/none: (patch: peer=p2) - br1: - br1 65534/101: (dummy-internal) - p2 1/none: (patch: peer=p1) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + p1 2/none: (patch: peer=p2) + br1: + br1 65534/101: (dummy-internal) + p2 1/none: (patch: peer=p1) ]) dnl Setup single MPLS tags. @@ -159,14 +159,14 @@ AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg ofproto_dpif_upcall:dbg]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy) - p1 2/none: (patch: peer=p2) - br1: - br1 65534/101: (dummy-internal) - p2 1/none: (patch: peer=p1) - p3 3/3: (dummy) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + p1 2/none: (patch: peer=p2) + br1: + br1 65534/101: (dummy-internal) + p2 1/none: (patch: peer=p1) + p3 3/3: (dummy) ]) dnl MPLS PUSH + POP. diff --git a/tests/netdev-type.at b/tests/netdev-type.at index 5450f33b7c32..c62a81f9cda5 100644 --- a/tests/netdev-type.at +++ b/tests/netdev-type.at @@ -8,9 +8,9 @@ OVS_VSWITCHD_START add_of_ports br0 1 AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p1 1/1: (dummy) + br0: + br0 65534/100: (dummy-internal) + p1 1/1: (dummy) ]) # # Set MAC address of dummy device and check that it has been set diff --git a/tests/nsh.at b/tests/nsh.at index 70d8b483620d..7729d1bf21d1 100644 --- a/tests/nsh.at +++ b/tests/nsh.at @@ -629,38 +629,36 @@ AT_CHECK([ #N3_DPPORT=$(ovs-appctl dpif/show | grep "n3 30" | sed 's|.*/\([[0-9]]*\):.*|\1|') ### Verify datapath configuration -AT_CHECK([ - ovs-appctl dpif/show | grep -v hit | sed 's/\t/ /g' -], [0], [dnl - br-in1: - br-in1 65534/101: (dummy-internal) - n1 10/4: (dummy) - vxlangpe12 1020/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.2) - vxlangpe13 1030/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.3) - br-in2: - br-in2 65534/102: (dummy-internal) - n2 20/5: (dummy) - vxlangpe21 2010/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.1) - vxlangpe23 2030/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.3) - br-in3: - br-in3 65534/103: (dummy-internal) - n3 30/6: (dummy) - vxlangpe31 3010/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.1) - vxlangpe32 3020/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.2) - br-p1: - br-p1 65534/1: (dummy-internal) - p1-0 2/none: (patch: peer=p0-1) - br-p2: - br-p2 65534/2: (dummy-internal) - p2-0 2/none: (patch: peer=p0-2) - br-p3: - br-p3 65534/3: (dummy-internal) - p3-0 2/none: (patch: peer=p0-3) - br0: - br0 65534/100: (dummy-internal) - p0-1 10/none: (patch: peer=p1-0) - p0-2 20/none: (patch: peer=p2-0) - p0-3 30/none: (patch: peer=p3-0) +AT_CHECK([ovs-appctl dpif/show | grep -v hit], [0], [dnl + br-in1: + br-in1 65534/101: (dummy-internal) + n1 10/4: (dummy) + vxlangpe12 1020/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.2) + vxlangpe13 1030/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.3) + br-in2: + br-in2 65534/102: (dummy-internal) + n2 20/5: (dummy) + vxlangpe21 2010/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.1) + vxlangpe23 2030/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.3) + br-in3: + br-in3 65534/103: (dummy-internal) + n3 30/6: (dummy) + vxlangpe31 3010/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.1) + vxlangpe32 3020/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.2) + br-p1: + br-p1 65534/1: (dummy-internal) + p1-0 2/none: (patch: peer=p0-1) + br-p2: + br-p2 65534/2: (dummy-internal) + p2-0 2/none: (patch: peer=p0-2) + br-p3: + br-p3 65534/3: (dummy-internal) + p3-0 2/none: (patch: peer=p0-3) + br0: + br0 65534/100: (dummy-internal) + p0-1 10/none: (patch: peer=p1-0) + p0-2 20/none: (patch: peer=p2-0) + p0-3 30/none: (patch: peer=p3-0) ]) ### Setup SFC flow configuration diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 41b7a496617e..50e827e8e36c 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -6462,9 +6462,9 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1) - p2 2/2: (dummy) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1) + p2 2/2: (dummy) ]) dnl Basic @@ -6633,13 +6633,13 @@ AT_CHECK([ovs-vsctl -- add-port int-br t1 -- set Interface t1 type=gre \ AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy: ifindex=1010) - int-br: - int-br 65534/2: (dummy-internal) - t1 4/4: (gre: key=456, remote_ip=1.1.2.92) - vm1 5/3: (dummy: ifindex=2011) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy: ifindex=1010) + int-br: + int-br 65534/2: (dummy-internal) + t1 4/4: (gre: key=456, remote_ip=1.1.2.92) + vm1 5/3: (dummy: ifindex=2011) ]) dnl set up route to 1.1.2.92 via br0 and action=normal @@ -7728,13 +7728,13 @@ add_of_ports br1 3 AT_CHECK([ovs-appctl dpif/show | sed 's/\(dummy-pmd: \).*)/\1)/'], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p1 1/1: (dummy-pmd: ) - p2 2/2: (dummy-pmd: ) - br1: - br1 65534/101: (dummy-internal) - p3 3/3: (dummy) + br0: + br0 65534/100: (dummy-internal) + p1 1/1: (dummy-pmd: ) + p2 2/2: (dummy-pmd: ) + br1: + br1 65534/101: (dummy-internal) + p3 3/3: (dummy) ]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -7912,14 +7912,14 @@ sleep 1 # wait for log writer AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:13 missed:2 - br0: - br0 65534/100: (dummy-internal) - p2 2/2: (dummy) - pbr0 1/none: (patch: peer=pbr1) - br1: - br1 65534/101: (dummy-internal) - p3 3/3: (dummy) - pbr1 1/none: (patch: peer=pbr0) + br0: + br0 65534/100: (dummy-internal) + p2 2/2: (dummy) + pbr0 1/none: (patch: peer=pbr1) + br1: + br1 65534/101: (dummy-internal) + p3 3/3: (dummy) + pbr1 1/none: (patch: peer=pbr0) ]) AT_CHECK([strip_ufid < ovs-vswitchd.log | filter_flow_install | strip_used], [0], [dnl @@ -7977,14 +7977,14 @@ OVS_WAIT_UNTIL([test `grep flow_add ovs-vswitchd.log | wc -l` -ge 1]) AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:1 - br0: - br0 65534/100: (dummy-internal) - p2 2/2: (dummy) - pbr0 1/none: (patch: peer=pbr1) - br1: - br1 65534/101: (dummy-internal) - p3 3/3: (dummy) - pbr1 1/none: (patch: peer=pbr0) + br0: + br0 65534/100: (dummy-internal) + p2 2/2: (dummy) + pbr0 1/none: (patch: peer=pbr1) + br1: + br1 65534/101: (dummy-internal) + p3 3/3: (dummy) + pbr1 1/none: (patch: peer=pbr0) ]) AT_CHECK([strip_ufid < ovs-vswitchd.log | filter_flow_install | strip_used], [0], [dnl diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index b090f5c29ca2..72e845237783 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -2950,8 +2950,8 @@ AT_CHECK([ovs-ofctl add-flow br0 "tcp,tcp_flags=+ack-ack,action="], [1], [], ]) AT_CHECK([ovs-appctl dpif/show | tail -n +4], [0], [dnl - p1 1/1: (dummy) - p2 2/2: (dummy) + p1 1/1: (dummy) + p2 2/2: (dummy) ]) dnl Outbound web traffic with bare-SYN diff --git a/tests/ovs-vswitchd.at b/tests/ovs-vswitchd.at index 2adb81e1d31a..a30792b7dde8 100644 --- a/tests/ovs-vswitchd.at +++ b/tests/ovs-vswitchd.at @@ -186,9 +186,9 @@ AT_CHECK([ovs-vsctl add-port br0 p1 -- set interface p1 type=internal]) dnl ovs-vswitchd should still 'see' ovsdb change with the 'monitor' method AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p0 1/1: (dummy-internal) - p1 2/2: (dummy-internal) + br0 65534/100: (dummy-internal) + p0 1/1: (dummy-internal) + p1 2/2: (dummy-internal) ]) OVS_VSWITCHD_STOP AT_CLEANUP diff --git a/tests/packet-type-aware.at b/tests/packet-type-aware.at index 23f9037abc5c..bfb47b421dbb 100644 --- a/tests/packet-type-aware.at +++ b/tests/packet-type-aware.at @@ -233,39 +233,39 @@ ovs-vsctl \ ### Verify datapath configuration AT_CHECK([ - ovs-appctl dpif/show | grep -v hit | sed "s/$(printf \\t)/ /g" | sed 's./[[0-9]]\{1,\}..' + ovs-appctl dpif/show | grep -v hit | sed 's./[[0-9]]\{1,\}..' ], [0], [dnl - br-in1: - br-in1 65534: (dummy-internal) - gre12 1020: (gre: remote_ip=10.0.0.2) - gre12_l3 1021: (gre: packet_type=legacy_l3, remote_ip=10.0.0.2) - gre13 1030: (gre: remote_ip=10.0.0.3) - n1 10: (dummy) - br-in2: - br-in2 65534: (dummy-internal) - gre21 2010: (gre: packet_type=ptap, remote_ip=20.0.0.1) - gre23 2030: (gre: packet_type=ptap, remote_ip=20.0.0.3) - n2 20: (dummy) - br-in3: - br-in3 65534: (dummy-internal) - gre31 3010: (gre: remote_ip=30.0.0.1) - gre32 3020: (gre: remote_ip=30.0.0.2) - gre32_l3 3021: (gre: packet_type=legacy_l3, remote_ip=30.0.0.2) - n3 30: (dummy) - br-p1: - br-p1 65534: (dummy-internal) - p1-0 2/none: (patch: peer=p0-1) - br-p2: - br-p2 65534: (dummy-internal) - p2-0 2/none: (patch: peer=p0-2) - br-p3: - br-p3 65534: (dummy-internal) - p3-0 2/none: (patch: peer=p0-3) - br0: - br0 65534: (dummy-internal) - p0-1 10/none: (patch: peer=p1-0) - p0-2 20/none: (patch: peer=p2-0) - p0-3 30/none: (patch: peer=p3-0) + br-in1: + br-in1 65534: (dummy-internal) + gre12 1020: (gre: remote_ip=10.0.0.2) + gre12_l3 1021: (gre: packet_type=legacy_l3, remote_ip=10.0.0.2) + gre13 1030: (gre: remote_ip=10.0.0.3) + n1 10: (dummy) + br-in2: + br-in2 65534: (dummy-internal) + gre21 2010: (gre: packet_type=ptap, remote_ip=20.0.0.1) + gre23 2030: (gre: packet_type=ptap, remote_ip=20.0.0.3) + n2 20: (dummy) + br-in3: + br-in3 65534: (dummy-internal) + gre31 3010: (gre: remote_ip=30.0.0.1) + gre32 3020: (gre: remote_ip=30.0.0.2) + gre32_l3 3021: (gre: packet_type=legacy_l3, remote_ip=30.0.0.2) + n3 30: (dummy) + br-p1: + br-p1 65534: (dummy-internal) + p1-0 2/none: (patch: peer=p0-1) + br-p2: + br-p2 65534: (dummy-internal) + p2-0 2/none: (patch: peer=p0-2) + br-p3: + br-p3 65534: (dummy-internal) + p3-0 2/none: (patch: peer=p0-3) + br0: + br0 65534: (dummy-internal) + p0-1 10/none: (patch: peer=p1-0) + p0-2 20/none: (patch: peer=p2-0) + p0-3 30/none: (patch: peer=p3-0) ]) ### Test L3 forwarding flows @@ -663,20 +663,20 @@ OVS_VSWITCHD_START([dnl ### Verify datapath configuration AT_CHECK([ - ovs-appctl dpif/show | grep -v hit | sed 's/\t/ /g' | sed 's./[[0-9]]\{1,\}..' + ovs-appctl dpif/show | grep -v hit | sed 's./[[0-9]]\{1,\}..' ], [0], [dnl - br0: - br0 65534: (dummy-internal) - n0 30: (dummy) - p0 10/none: (patch: peer=p1) - br1: - br1 65534: (dummy-internal) - gre1 100: (gre: packet_type=ptap, remote_ip=10.0.0.2) - n1 40: (dummy) - p1 20/none: (patch: peer=p0) - br2: - br2 65534: (dummy-internal) - n2 50: (dummy) + br0: + br0 65534: (dummy-internal) + n0 30: (dummy) + p0 10/none: (patch: peer=p1) + br1: + br1 65534: (dummy-internal) + gre1 100: (gre: packet_type=ptap, remote_ip=10.0.0.2) + n1 40: (dummy) + p1 20/none: (patch: peer=p0) + br2: + br2 65534: (dummy-internal) + n2 50: (dummy) ]) AT_CHECK([ @@ -842,20 +842,20 @@ AT_CHECK([ ### Verify datapath configuration AT_CHECK([ - ovs-appctl dpif/show | grep -v hit | sed 's/\t/ /g' | sed 's./[[0-9]]\{1,\}..' + ovs-appctl dpif/show | grep -v hit | sed 's./[[0-9]]\{1,\}..' ], [0], [dnl - br0: - br0 65534: (dummy-internal) - n0 30: (dummy) - p0 10/none: (patch: peer=p1) - br1: - br1 65534: (dummy-internal) - gre1 100: (gre: packet_type=legacy_l3, remote_ip=10.0.0.2) - n1 40: (dummy) - p1 20/none: (patch: peer=p0) - br2: - br2 65534: (dummy-internal) - n2 50: (dummy) + br0: + br0 65534: (dummy-internal) + n0 30: (dummy) + p0 10/none: (patch: peer=p1) + br1: + br1 65534: (dummy-internal) + gre1 100: (gre: packet_type=legacy_l3, remote_ip=10.0.0.2) + n1 40: (dummy) + p1 20/none: (patch: peer=p0) + br2: + br2 65534: (dummy-internal) + n2 50: (dummy) ]) AT_CHECK([ @@ -943,14 +943,14 @@ OVS_VSWITCHD_START([dnl ### Verify datapath configuration AT_CHECK([ - ovs-appctl dpif/show | grep -v hit | sed 's/\t/ /g' | sed 's./[[0-9]]\{1,\}..' + ovs-appctl dpif/show | grep -v hit | sed 's./[[0-9]]\{1,\}..' ], [0], [dnl - br0: - br0 65534: (dummy-internal) - p0 1: (dummy) - int-br: - int-br 65534: (dummy-internal) - tunnel 2: (gre: packet_type=legacy_l3, remote_ip=20.0.0.2) + br0: + br0 65534: (dummy-internal) + p0 1: (dummy) + int-br: + int-br 65534: (dummy-internal) + tunnel 2: (gre: packet_type=legacy_l3, remote_ip=20.0.0.2) ]) AT_CHECK([ diff --git a/tests/pmd.at b/tests/pmd.at index 2957daf4d64e..0c8829f49fa9 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -78,9 +78,9 @@ pmd thread numa_id core_id : AT_CHECK([ovs-appctl dpif/show | sed 's/\(tx_queues=\)[[0-9]]*/\1/g'], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy-pmd: configured_rx_queues=1, configured_tx_queues=, requested_rx_queues=1, requested_tx_queues=) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy-pmd: configured_rx_queues=1, configured_tx_queues=, requested_rx_queues=1, requested_tx_queues=) ]) OVS_VSWITCHD_STOP @@ -96,9 +96,9 @@ AT_CHECK([ovs-vsctl set interface p0 options:n_rxq=8]) AT_CHECK([ovs-appctl dpif/show | sed 's/\(tx_queues=\)[[0-9]]*/\1/g'], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy-pmd: configured_rx_queues=8, configured_tx_queues=, requested_rx_queues=8, requested_tx_queues=) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy-pmd: configured_rx_queues=8, configured_tx_queues=, requested_rx_queues=8, requested_tx_queues=) ]) AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed SED_NUMA_CORE_PATTERN], [0], [dnl @@ -127,9 +127,9 @@ CHECK_PMD_THREADS_CREATED() AT_CHECK([ovs-appctl dpif/show | sed 's/\(tx_queues=\)[[0-9]]*/\1/g'], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy-pmd: configured_rx_queues=8, configured_tx_queues=, requested_rx_queues=8, requested_tx_queues=) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy-pmd: configured_rx_queues=8, configured_tx_queues=, requested_rx_queues=8, requested_tx_queues=) ]) AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed SED_NUMA_CORE_PATTERN], [0], [dnl @@ -190,9 +190,9 @@ sleep 1 AT_CHECK([ovs-appctl dpif/show | sed 's/\(tx_queues=\)[[0-9]]*/\1/g'], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 7/1: (dummy-pmd: configured_rx_queues=4, configured_tx_queues=, requested_rx_queues=4, requested_tx_queues=) + br0: + br0 65534/100: (dummy-internal) + p0 7/1: (dummy-pmd: configured_rx_queues=4, configured_tx_queues=, requested_rx_queues=4, requested_tx_queues=) ]) AT_CHECK([ovs-appctl dpif-netdev/pmd-stats-show | sed SED_NUMA_CORE_PATTERN | sed '/cycles/d' | grep pmd -A 8], [0], [dnl @@ -296,7 +296,7 @@ dnl Check resetting to default number of rx queues after removal from the db. AT_CHECK([ovs-vsctl remove interface p1 options n_rxq]) AT_CHECK([ovs-appctl dpif/show | grep p1 | sed 's/\(tx_queues=\)[[0-9]]*/\1/g'], [0], [dnl - p1 1/1: (dummy-pmd: configured_rx_queues=1, configured_tx_queues=, requested_rx_queues=1, requested_tx_queues=) + p1 1/1: (dummy-pmd: configured_rx_queues=1, configured_tx_queues=, requested_rx_queues=1, requested_tx_queues=) ]) OVS_VSWITCHD_STOP diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at index aff5fa74c372..cbdd5a32f719 100644 --- a/tests/tunnel-push-pop-ipv6.at +++ b/tests/tunnel-push-pop-ipv6.at @@ -15,13 +15,13 @@ AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2 type=ip6erspan \ AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy) - int-br: - int-br 65534/2: (dummy-internal) - t2 2/6: (ip6erspan: erspan_idx=0x3, erspan_ver=1, key=123, remote_ip=2001:cafe::92) - t3 3/6: (ip6erspan: erspan_dir=1, erspan_hwid=0x7, erspan_ver=2, key=567, remote_ip=2001:cafe::93) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + int-br: + int-br 65534/2: (dummy-internal) + t2 2/6: (ip6erspan: erspan_idx=0x3, erspan_ver=1, key=123, remote_ip=2001:cafe::92) + t3 3/6: (ip6erspan: erspan_dir=1, erspan_hwid=0x7, erspan_ver=2, key=567, remote_ip=2001:cafe::93) ]) dnl First setup dummy interface IP address, then add the route @@ -137,16 +137,16 @@ AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2 type=vxlan \ AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy) - int-br: - int-br 65534/2: (dummy-internal) - t1 3/3: (gre: key=456, remote_ip=2001:cafe::92) - t2 2/4789: (vxlan: key=123, remote_ip=2001:cafe::92) - t3 4/4789: (vxlan: csum=true, out_key=flow, remote_ip=2001:cafe::93) - t4 5/6081: (geneve: key=123, remote_ip=flow) - t5 6/3: (gre: key=455, packet_type=legacy_l3, remote_ip=2001:cafe::92) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + int-br: + int-br 65534/2: (dummy-internal) + t1 3/3: (gre: key=456, remote_ip=2001:cafe::92) + t2 2/4789: (vxlan: key=123, remote_ip=2001:cafe::92) + t3 4/4789: (vxlan: csum=true, out_key=flow, remote_ip=2001:cafe::93) + t4 5/6081: (geneve: key=123, remote_ip=flow) + t5 6/3: (gre: key=455, packet_type=legacy_l3, remote_ip=2001:cafe::92) ]) AT_CHECK([ovs-appctl tnl/ports/show |sort], [0], [dnl diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at index b2269dff0e1f..f7172433ee63 100644 --- a/tests/tunnel-push-pop.at +++ b/tests/tunnel-push-pop.at @@ -19,15 +19,15 @@ AT_CHECK([ovs-vsctl add-port int-br t1 -- set Interface t1 type=erspan \ AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy) - int-br: - int-br 65534/2: (dummy-internal) - t1 2/3: (erspan: erspan_idx=0x3, erspan_ver=1, key=123, remote_ip=1.1.2.92) - t2 3/3: (erspan: erspan_dir=1, erspan_hwid=0x7, erspan_ver=2, key=567, remote_ip=1.1.2.92) - t3 4/3: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_ver=2, key=456, remote_ip=flow) - t4 5/3: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_idx=flow, erspan_ver=flow, key=56, remote_ip=flow) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + int-br: + int-br 65534/2: (dummy-internal) + t1 2/3: (erspan: erspan_idx=0x3, erspan_ver=1, key=123, remote_ip=1.1.2.92) + t2 3/3: (erspan: erspan_dir=1, erspan_hwid=0x7, erspan_ver=2, key=567, remote_ip=1.1.2.92) + t3 4/3: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_ver=2, key=456, remote_ip=flow) + t4 5/3: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_idx=flow, erspan_ver=flow, key=56, remote_ip=flow) ]) dnl First setup dummy interface IP address, then add the route @@ -220,18 +220,18 @@ AT_CHECK([ovs-vsctl add-port int-br t2 -- set Interface t2 type=vxlan \ AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy) - int-br: - int-br 65534/2: (dummy-internal) - t1 3/3: (gre: key=456, remote_ip=1.1.2.92) - t2 2/4789: (vxlan: key=123, remote_ip=1.1.2.92) - t3 4/4789: (vxlan: csum=true, out_key=flow, remote_ip=1.1.2.93) - t4 5/6081: (geneve: key=123, remote_ip=flow) - t5 6/6081: (geneve: egress_pkt_mark=1234, out_key=flow, remote_ip=1.1.2.93) - t6 7/3: (gre: key=456, packet_type=legacy_l3, remote_ip=1.1.2.92) - t7 8/4789: (vxlan: key=345, remote_ip=1.1.2.92) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + int-br: + int-br 65534/2: (dummy-internal) + t1 3/3: (gre: key=456, remote_ip=1.1.2.92) + t2 2/4789: (vxlan: key=123, remote_ip=1.1.2.92) + t3 4/4789: (vxlan: csum=true, out_key=flow, remote_ip=1.1.2.93) + t4 5/6081: (geneve: key=123, remote_ip=flow) + t5 6/6081: (geneve: egress_pkt_mark=1234, out_key=flow, remote_ip=1.1.2.93) + t6 7/3: (gre: key=456, packet_type=legacy_l3, remote_ip=1.1.2.92) + t7 8/4789: (vxlan: key=345, remote_ip=1.1.2.92) ]) dnl First setup dummy interface IP address, then add the route @@ -560,12 +560,12 @@ AT_CHECK([ovs-vsctl add-port int-br t1 -- set Interface t1 type=gre \ AT_CHECK([ovs-appctl dpif/show], [0], [dnl dummy@ovs-dummy: hit:0 missed:0 - br0: - br0 65534/100: (dummy-internal) - p0 1/1: (dummy) - int-br: - int-br 65534/2: (dummy-internal) - t1 3/3: (gre: key=456, remote_ip=1.1.2.92, seq=true) + br0: + br0 65534/100: (dummy-internal) + p0 1/1: (dummy) + int-br: + int-br 65534/2: (dummy-internal) + t1 3/3: (gre: key=456, remote_ip=1.1.2.92, seq=true) ]) AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 1.1.2.88/24], [0], [OK diff --git a/tests/tunnel.at b/tests/tunnel.at index 2bc004cd85f2..c8fc2f7ac327 100644 --- a/tests/tunnel.at +++ b/tests/tunnel.at @@ -16,10 +16,10 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: remote_ip=1.1.1.1) - p2 2/1: (gre: local_ip=2.2.2.2, remote_ip=1.1.1.1) - p3 3/1: (gre: remote_ip=2.2.2.2) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: remote_ip=1.1.1.1) + p2 2/1: (gre: local_ip=2.2.2.2, remote_ip=1.1.1.1) + p3 3/1: (gre: remote_ip=2.2.2.2) ]) dnl remote_ip @@ -39,10 +39,10 @@ AT_CHECK([ovs-vsctl set Interface p2 type=gre options:local_ip=2.2.2.3 \ options:df_default=false options:ttl=1 options:csum=true \ -- set Interface p3 type=vxlan]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: remote_ip=1.1.1.1) - p2 2/1: (gre: csum=true, df_default=false, local_ip=2.2.2.3, remote_ip=1.1.1.1, ttl=1) - p3 3/4789: (vxlan: remote_ip=2.2.2.2) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: remote_ip=1.1.1.1) + p2 2/1: (gre: csum=true, df_default=false, local_ip=2.2.2.3, remote_ip=1.1.1.1, ttl=1) + p3 3/4789: (vxlan: remote_ip=2.2.2.2) ]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], @@ -74,9 +74,9 @@ actions=2 AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: remote_ip=1.1.1.1) - p2 2/2: (dummy) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: remote_ip=1.1.1.1) + p2 2/2: (dummy) ]) dnl Tunnel CE and encapsulated packet CE @@ -123,9 +123,9 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1) - p2 2/2: (dummy) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1) + p2 2/2: (dummy) ]) dnl Basic @@ -210,9 +210,9 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: remote_ip=1.1.1.1, tos=inherit, ttl=inherit) - p2 2/2: (dummy) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: remote_ip=1.1.1.1, tos=inherit, ttl=inherit) + p2 2/2: (dummy) ]) dnl Basic @@ -253,11 +253,11 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: key=flow, remote_ip=1.1.1.1) - p2 2/1: (gre: key=flow, remote_ip=2.2.2.2) - p3 3/1: (gre: key=flow, remote_ip=3.3.3.3) - p4 4/1: (gre: key=flow, remote_ip=4.4.4.4) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: key=flow, remote_ip=1.1.1.1) + p2 2/1: (gre: key=flow, remote_ip=2.2.2.2) + p3 3/1: (gre: key=flow, remote_ip=3.3.3.3) + p4 4/1: (gre: key=flow, remote_ip=4.4.4.4) ]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout]) @@ -286,10 +286,10 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: key=1, remote_ip=1.1.1.1) - p2 2/1: (gre: in_key=2, out_key=3, remote_ip=1.1.1.1) - p3 3/1: (gre: out_key=5, remote_ip=1.1.1.1) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: key=1, remote_ip=1.1.1.1) + p2 2/1: (gre: in_key=2, out_key=3, remote_ip=1.1.1.1) + p3 3/1: (gre: out_key=5, remote_ip=1.1.1.1) ]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout]) @@ -339,12 +339,12 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (gre: key=flow, remote_ip=1.1.1.1) - p2 2/1: (gre: key=3, remote_ip=3.3.3.3) - p3 3/3: (dummy) - p4 4/4: (dummy) - p5 5/5: (dummy) + br0 65534/100: (dummy-internal) + p1 1/1: (gre: key=flow, remote_ip=1.1.1.1) + p2 2/1: (gre: key=3, remote_ip=3.3.3.3) + p3 3/3: (dummy) + p4 4/4: (dummy) + p5 5/5: (dummy) ]) AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'], [0], [stdout]) @@ -375,8 +375,8 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=geneve \ options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=5000]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/5000: (geneve: dst_port=5000, remote_ip=1.1.1.1) + br0 65534/100: (dummy-internal) + p1 1/5000: (geneve: dst_port=5000, remote_ip=1.1.1.1) ]) OVS_VSWITCHD_STOP @@ -387,8 +387,8 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \ options:remote_ip=1.1.1.1 ofport_request=1]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/4789: (vxlan: remote_ip=1.1.1.1) + br0 65534/100: (dummy-internal) + p1 1/4789: (vxlan: remote_ip=1.1.1.1) ]) OVS_VSWITCHD_STOP @@ -399,8 +399,8 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=lisp \ options:remote_ip=1.1.1.1 ofport_request=1]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/4341: (lisp: remote_ip=1.1.1.1) + br0 65534/100: (dummy-internal) + p1 1/4341: (lisp: remote_ip=1.1.1.1) ]) OVS_VSWITCHD_STOP @@ -423,11 +423,11 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=erspan \ ]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/1: (erspan: erspan_idx=0x0, erspan_ver=1, key=1, remote_ip=1.1.1.1) - p2 2/1: (erspan: erspan_idx=flow, erspan_ver=1, key=flow, remote_ip=1.1.1.1) - p3 3/1: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_ver=2, key=10, remote_ip=1.1.1.1) - p4 4/1: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_idx=flow, erspan_ver=flow, key=flow, remote_ip=1.2.3.4) + br0 65534/100: (dummy-internal) + p1 1/1: (erspan: erspan_idx=0x0, erspan_ver=1, key=1, remote_ip=1.1.1.1) + p2 2/1: (erspan: erspan_idx=flow, erspan_ver=1, key=flow, remote_ip=1.1.1.1) + p3 3/1: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_ver=2, key=10, remote_ip=1.1.1.1) + p4 4/1: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_idx=flow, erspan_ver=flow, key=flow, remote_ip=1.2.3.4) ]) dnl Check ERSPAN v1 flow-based tunnel push @@ -454,8 +454,8 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=vxlan \ options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=4341]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/4341: (vxlan: dst_port=4341, remote_ip=1.1.1.1) + br0 65534/100: (dummy-internal) + p1 1/4341: (vxlan: dst_port=4341, remote_ip=1.1.1.1) ]) dnl change UDP port @@ -463,8 +463,8 @@ dnl change UDP port AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=5000]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/5000: (vxlan: dst_port=5000, remote_ip=1.1.1.1) + br0 65534/100: (dummy-internal) + p1 1/5000: (vxlan: dst_port=5000, remote_ip=1.1.1.1) ]) dnl change UDP port to default @@ -472,8 +472,8 @@ dnl change UDP port to default AT_CHECK([ovs-vsctl -- set Interface p1 options:dst_port=4789]) AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/4789: (vxlan: remote_ip=1.1.1.1) + br0 65534/100: (dummy-internal) + p1 1/4789: (vxlan: remote_ip=1.1.1.1) ]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -524,11 +524,11 @@ OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=dummy \ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl - br0 65534/100: (dummy-internal) - p1 1/3: (dummy) - p2 2/2: (dummy) - p3 3/1: (erspan: erspan_idx=0x7, erspan_ver=1, key=1, remote_ip=1.1.1.1) - p4 4/1: (erspan: erspan_dir=1, erspan_hwid=0x7, erspan_ver=2, key=2, remote_ip=1.1.1.2) + br0 65534/100: (dummy-internal) + p1 1/3: (dummy) + p2 2/2: (dummy) + p3 3/1: (erspan: erspan_idx=0x7, erspan_ver=1, key=1, remote_ip=1.1.1.1) + p4 4/1: (erspan: erspan_dir=1, erspan_hwid=0x7, erspan_ver=2, key=2, remote_ip=1.1.1.2) ]) AT_DATA([flows.txt], [dnl From patchwork Mon Jun 4 21:27:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 925247 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=none (p=none dis=none) header.from=ovn.org 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 4107VV1dXwz9s08 for ; Tue, 5 Jun 2018 07:34:10 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id BF6CA12F1; Mon, 4 Jun 2018 21:28:39 +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 D984B11C6 for ; Mon, 4 Jun 2018 21:28:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id AE05D719 for ; Mon, 4 Jun 2018 21:28:16 +0000 (UTC) X-Originating-IP: 208.91.3.26 Received: from sigabrt.benpfaff.org (unknown [208.91.3.26]) (Authenticated sender: blp@ovn.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id AC919240002; Mon, 4 Jun 2018 23:28:14 +0200 (CEST) From: Ben Pfaff To: dev@openvswitch.org Date: Mon, 4 Jun 2018 14:27:49 -0700 Message-Id: <20180604212750.14643-12-blp@ovn.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180604212750.14643-1-blp@ovn.org> References: <20180604212750.14643-1-blp@ovn.org> MIME-Version: 1.0 X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, URI_NOVOWEL autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 12/13] treewide: Convert leading tabs to spaces. 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 It's always been OVS coding style to use spaces rather than tabs for indentation, but some tabs have snuck in over time. This commit converts them to spaces. Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- Documentation/faq/issues.rst | 4 +- Documentation/faq/vlan.rst | 2 +- Documentation/group-selection-method-property.txt | 2 +- Documentation/ref/ovs-sim.1.rst | 54 +- Documentation/tutorials/faucet.rst | 70 +- Documentation/tutorials/ovs-advanced.rst | 98 +- NEWS | 2 +- Vagrantfile | 18 +- debian/copyright.in | 136 +- debian/openvswitch-switch.README.Debian | 48 +- debian/openvswitch-switch.init | 30 +- debian/openvswitch-switch.logrotate | 6 +- debian/ovn-central.postinst | 16 +- debian/ovn-host.postinst | 16 +- include/openvswitch/rconn.h | 4 +- lib/dpif-netdev.c | 32 +- lib/dpif.c | 4 +- lib/meta-flow.xml | 2146 ++++++++++----------- lib/ofp-print.c | 8 +- ofproto/ofproto-dpif-ipfix.c | 2 +- ofproto/ofproto-dpif-sflow.c | 426 ++-- ofproto/ofproto-dpif-xlate.c | 2 +- ovn/utilities/ovn-detrace.in | 4 +- ovsdb/ovsdb-tool.c | 6 +- rhel/etc_init.d_openvswitch | 8 +- rhel/etc_sysconfig_network-scripts_ifdown-ovs | 52 +- rhel/etc_sysconfig_network-scripts_ifup-ovs | 338 ++-- rhel/openvswitch-fedora.spec.in | 32 +- rhel/openvswitch-kmod-rhel6.spec.in | 6 +- tests/bfd.at | 12 +- tests/cfm.at | 12 +- tests/classifier.at | 2 +- tests/dpif-netdev.at | 4 +- tests/interface-reconfigure.at | 1112 +++++------ tests/lacp.at | 12 +- tests/ofproto-dpif.at | 992 +++++----- tests/ofproto-macros.at | 12 +- tests/ofproto.at | 40 +- tests/ovn.at | 12 +- tests/ovs-macros.at | 4 +- tests/ovs-ofctl.at | 14 +- tests/ovs-router.at | 4 +- tests/ovsdb-client.at | 12 +- tests/ovsdb-cluster.at | 126 +- tests/ovsdb-condition.at | 6 +- tests/ovsdb-idl.at | 2 +- tests/ovsdb-log.at | 32 +- tests/ovsdb-monitor.at | 12 +- tests/ovsdb-mutation.at | 6 +- tests/ovsdb-query.at | 6 +- tests/ovsdb-row.at | 6 +- tests/ovsdb-schema.at | 22 +- tests/ovsdb-server.at | 170 +- tests/ovsdb-tool.at | 20 +- tests/pmd.at | 92 +- tests/run-oftest | 10 +- tests/run-ryu | 6 +- tests/test-lib.c | 2 +- tests/test-sflow.c | 120 +- tests/tunnel.at | 26 +- tutorial/ovs-sandbox | 12 +- utilities/bugtool/ovs-bugtool-tc-class-show | 6 +- utilities/nlmon.c | 8 +- utilities/ovs-ctl.in | 2 +- utilities/ovs-sim.in | 202 +- vswitchd/bridge.c | 10 +- vswitchd/vswitch.ovsschema | 20 +- vswitchd/vswitch.xml | 2 +- xenserver/openvswitch-xen.spec.in | 2 +- 69 files changed, 3372 insertions(+), 3372 deletions(-) mode change 100755 => 100644 debian/openvswitch-switch.init mode change 100755 => 100644 debian/ovn-central.postinst mode change 100755 => 100644 debian/ovn-host.postinst mode change 100755 => 100644 rhel/etc_init.d_openvswitch mode change 100755 => 100644 rhel/etc_sysconfig_network-scripts_ifdown-ovs mode change 100755 => 100644 rhel/etc_sysconfig_network-scripts_ifup-ovs mode change 100755 => 100644 tests/run-oftest mode change 100755 => 100644 tests/run-ryu mode change 100755 => 100644 utilities/bugtool/ovs-bugtool-tc-class-show mode change 100755 => 100644 utilities/ovs-sim.in diff --git a/Documentation/faq/issues.rst b/Documentation/faq/issues.rst index f26eebd0d783..8a30dad37da0 100644 --- a/Documentation/faq/issues.rst +++ b/Documentation/faq/issues.rst @@ -301,14 +301,14 @@ network, but it doesn't work. Why not? $ ovs-vsctl add-br br0 $ ovs-vsctl add-port br0 int0 -- set Interface int0 type=internal - $ ip addr add 192.168.0.123/24 dev int0 + $ ip addr add 192.168.0.123/24 dev int0 $ ip link set int0 up Even more simply, you can take advantage of the internal port that every bridge has under the name of the bridge:: $ ovs-vsctl add-br br0 - $ ip addr add 192.168.0.123/24 dev br0 + $ ip addr add 192.168.0.123/24 dev br0 $ ip link set br0 up In more detail, a "tap" device is an interface between the Linux (or BSD) diff --git a/Documentation/faq/vlan.rst b/Documentation/faq/vlan.rst index 991bb3d4c7a4..13d3cde4502d 100644 --- a/Documentation/faq/vlan.rst +++ b/Documentation/faq/vlan.rst @@ -190,7 +190,7 @@ Q: Can I configure an IP address on a VLAN? $ ovs-vsctl add-port br0 eth0 $ ovs-vsctl add-port br0 vlan9 tag=9 \ -- set interface vlan9 type=internal - $ ip addr add 192.168.0.7/24 dev vlan9 + $ ip addr add 192.168.0.7/24 dev vlan9 $ ip link set vlan0 up See also the following question. diff --git a/Documentation/group-selection-method-property.txt b/Documentation/group-selection-method-property.txt index 5320f24b4146..29e8249af6ac 100644 --- a/Documentation/group-selection-method-property.txt +++ b/Documentation/group-selection-method-property.txt @@ -56,7 +56,7 @@ NTR_VENDOR_ID = 0x0000154d The following group property experimenter type defined by this extension. enum ntr_group_mod_subtype { - NTRT_SELECTION_METHOD = 1, + NTRT_SELECTION_METHOD = 1, }; diff --git a/Documentation/ref/ovs-sim.1.rst b/Documentation/ref/ovs-sim.1.rst index 51a415fba069..4382598e1220 100644 --- a/Documentation/ref/ovs-sim.1.rst +++ b/Documentation/ref/ovs-sim.1.rst @@ -95,9 +95,9 @@ instances. The new sandbox starts out without any bridges. Use ``ovs-vsctl`` in the context of the new sandbox to create a bridge, e.g.:: - sim_add hv0 # Create sandbox hv0. - as hv0 # Set hv0 as default sandbox. - ovs-vsctl add-br br0 # Add bridge br0 inside hv0. + sim_add hv0 # Create sandbox hv0. + as hv0 # Set hv0 as default sandbox. + ovs-vsctl add-br br0 # Add bridge br0 inside hv0. The Open vSwitch instances that ``sim_add`` creates enable ``dummy`` devices. This means that bridges and interfaces can be @@ -191,9 +191,9 @@ one, and then connects the two through an interconnection network net_add n1 for i in 0 1; do - sim_add hv$i - as hv$i ovs-vsctl add-br br0 -- add-port br0 vif$i - as hv$i net_attach n1 br0 + sim_add hv$i + as hv$i ovs-vsctl add-br br0 -- add-port br0 vif$i + as hv$i net_attach n1 br0 done Here’s an extended version that also starts OVN:: @@ -202,13 +202,13 @@ Here’s an extended version that also starts OVN:: ovn-nbctl ls-add lsw0 net_add n1 for i in 0 1; do - sim_add hv$i - as hv$i - ovs-vsctl add-br br-phys - ovn_attach n1 br-phys 192.168.0.`expr $i + 1` - ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lp$i - ovn-nbctl lsp-add lsw0 lp$i - ovn-nbctl lsp-set-addresses lp$i f0:00:00:00:00:0$i + sim_add hv$i + as hv$i + ovs-vsctl add-br br-phys + ovn_attach n1 br-phys 192.168.0.`expr $i + 1` + ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lp$i + ovn-nbctl lsp-add lsw0 lp$i + ovn-nbctl lsp-set-addresses lp$i f0:00:00:00:00:0$i done Here’s a primitive OVN "scale test" (adjust the scale by changing @@ -219,23 +219,23 @@ Here’s a primitive OVN "scale test" (adjust the scale by changing net_add n1 ovn-nbctl ls-add br0 for i in `seq $n`; do - (sim_add hv$i - as hv$i - ovs-vsctl add-br br-phys - y=$(expr $i / 256) - x=$(expr $i % 256) - ovn_attach n1 br-phys 192.168.$y.$x - ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lp$i) & - case $i in - *50|*00) echo $i; wait ;; - esac + (sim_add hv$i + as hv$i + ovs-vsctl add-br br-phys + y=$(expr $i / 256) + x=$(expr $i % 256) + ovn_attach n1 br-phys 192.168.$y.$x + ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lp$i) & + case $i in + *50|*00) echo $i; wait ;; + esac done wait for i in `seq $n`; do - yy=$(printf %02x $(expr $i / 256)) - xx=$(printf $02x $(expr $i % 256)) - ovn-nbctl lsp-add br0 lp$i - ovn-nbctl lsp-set-addresses lp$i f0:00:00:00:$yy:$xx + yy=$(printf %02x $(expr $i / 256)) + xx=$(printf $02x $(expr $i % 256)) + ovn-nbctl lsp-add br0 lp$i + ovn-nbctl lsp-set-addresses lp$i f0:00:00:00:$yy:$xx done When the scale test has finished initializing, you can watch the diff --git a/Documentation/tutorials/faucet.rst b/Documentation/tutorials/faucet.rst index aaaffe7692ad..9696dfd0230b 100644 --- a/Documentation/tutorials/faucet.rst +++ b/Documentation/tutorials/faucet.rst @@ -302,14 +302,14 @@ information, run ``man ovs-vswitchd.conf.db`` and search for ``connection_mode``):: $ ovs-vsctl add-br br0 \ - -- set bridge br0 other-config:datapath-id=0000000000000001 \ - -- add-port br0 p1 -- set interface p1 ofport_request=1 \ - -- add-port br0 p2 -- set interface p2 ofport_request=2 \ - -- add-port br0 p3 -- set interface p3 ofport_request=3 \ - -- add-port br0 p4 -- set interface p4 ofport_request=4 \ - -- add-port br0 p5 -- set interface p5 ofport_request=5 \ - -- set-controller br0 tcp:127.0.0.1:6653 \ - -- set controller br0 connection-mode=out-of-band + -- set bridge br0 other-config:datapath-id=0000000000000001 \ + -- add-port br0 p1 -- set interface p1 ofport_request=1 \ + -- add-port br0 p2 -- set interface p2 ofport_request=2 \ + -- add-port br0 p3 -- set interface p3 ofport_request=3 \ + -- add-port br0 p4 -- set interface p4 ofport_request=4 \ + -- add-port br0 p5 -- set interface p5 ofport_request=5 \ + -- set-controller br0 tcp:127.0.0.1:6653 \ + -- set controller br0 connection-mode=out-of-band .. note:: @@ -1290,40 +1290,40 @@ the ways that OVS tries to optimize megaflows. Update dps: switch-1: - dp_id: 0x1 - timeout: 3600 - arp_neighbor_timeout: 3600 - interfaces: - 1: - native_vlan: 100 - acl_in: 1 - 2: - native_vlan: 100 - 3: - native_vlan: 100 - 4: - native_vlan: 200 - 5: - native_vlan: 200 + dp_id: 0x1 + timeout: 3600 + arp_neighbor_timeout: 3600 + interfaces: + 1: + native_vlan: 100 + acl_in: 1 + 2: + native_vlan: 100 + 3: + native_vlan: 100 + 4: + native_vlan: 200 + 5: + native_vlan: 200 vlans: 100: - faucet_vips: ["10.100.0.254/24"] + faucet_vips: ["10.100.0.254/24"] 200: - faucet_vips: ["10.200.0.254/24"] + faucet_vips: ["10.200.0.254/24"] routers: router-1: - vlans: [100, 200] + vlans: [100, 200] acls: 1: - - rule: - dl_type: 0x800 - nw_proto: 6 - tcp_dst: 8080 - actions: - allow: 0 - - rule: - actions: - allow: 1 + - rule: + dl_type: 0x800 + nw_proto: 6 + tcp_dst: 8080 + actions: + allow: 0 + - rule: + actions: + allow: 1 Then restart Faucet:: diff --git a/Documentation/tutorials/ovs-advanced.rst b/Documentation/tutorials/ovs-advanced.rst index db8a53ebc141..fa9fdc7bf9bc 100644 --- a/Documentation/tutorials/ovs-advanced.rst +++ b/Documentation/tutorials/ovs-advanced.rst @@ -337,7 +337,7 @@ The output should look something like this:: bridge("br0") ------------- 0. dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0, priority 32768 - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -370,9 +370,9 @@ The output should be:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=01:80:c2:00:00:10/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -450,11 +450,11 @@ yet):: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -477,12 +477,12 @@ table 2:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=2,vlan_tci=0x0000, priority 99 - mod_vlan_vid:20 - resubmit(,2) + mod_vlan_vid:20 + resubmit(,2) 2. No match. - drop + drop Final flow: in_port=2,dl_vlan=20,dl_vlan_pcp=0,dl_src=00:00:00:00:00:00,dl_dst=00:00:00:00:00:00,dl_type=0x0000 Megaflow: recirc_id=0,in_port=2,vlan_tci=0x0000,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -503,9 +503,9 @@ The output shows the packet matching the default drop flow:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. priority 0 - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=2,vlan_tci=0x0005,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -584,15 +584,15 @@ particular flow that was added:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=50:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=50:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] + resubmit(,3) 3. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,vlan_tci=0x0014/0x1fff,dl_src=50:00:00:00:00:01,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -694,20 +694,20 @@ table 10) that the flow's destination was unknown:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] + resubmit(,3) 3. priority 50 - resubmit(,10) - 10. No match. - drop - resubmit(,4) + resubmit(,10) + 10. No match. + drop + resubmit(,4) 4. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_vlan=20,dl_src=f0:00:00:00:00:01,dl_dst=90:00:00:00:00:01,dl_type=0x0000 @@ -745,21 +745,21 @@ the learned port ``p1`` into register ``0``:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=2,vlan_tci=0x0000, priority 99 - mod_vlan_vid:20 - resubmit(,2) + mod_vlan_vid:20 + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01 priority=32768 actions=load:0x2->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01 priority=32768 actions=load:0x2->NXM_NX_REG0[0..15] + resubmit(,3) 3. priority 50 - resubmit(,10) - 10. vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01, priority 32768 - load:0x1->NXM_NX_REG0[0..15] - resubmit(,4) + resubmit(,10) + 10. vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01, priority 32768 + load:0x1->NXM_NX_REG0[0..15] + resubmit(,4) 4. No match. - drop + drop Final flow: reg0=0x1,in_port=2,dl_vlan=20,dl_vlan_pcp=0,dl_src=90:00:00:00:00:01,dl_dst=f0:00:00:00:00:01,dl_type=0x0000 Megaflow: recirc_id=0,in_port=2,vlan_tci=0x0000,dl_src=90:00:00:00:00:01,dl_dst=f0:00:00:00:00:01,dl_type=0x0000 @@ -781,20 +781,20 @@ executed in table 10, that the destination has now been learned:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] + resubmit(,3) 3. priority 50 - resubmit(,10) - 10. vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01, priority 32768 - load:0x2->NXM_NX_REG0[0..15] - resubmit(,4) + resubmit(,10) + 10. vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01, priority 32768 + load:0x2->NXM_NX_REG0[0..15] + resubmit(,4) 4. No match. - drop + drop Implementing Table 4: Output Processing diff --git a/NEWS b/NEWS index 484c6dc3dfa4..7f6589a46878 100644 --- a/NEWS +++ b/NEWS @@ -933,7 +933,7 @@ v1.8.0 - 26 Feb 2013 were allowed.) - Allow support for arbitrary Ethernet masks. (Previously, only the multicast bit in the destination address could be individually - masked.) + masked.) - New field OXM_OF_METADATA, to align with OpenFlow 1.1. - The OFPST_QUEUE request now reports an error if a specified port or queue does not exist, or for requests for a specific queue on all diff --git a/Vagrantfile b/Vagrantfile index 28e9219b8c72..0192f66ea0c8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -20,15 +20,15 @@ $bootstrap_debian = <