From patchwork Tue Nov 3 23:48:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 539641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id C12DD141301 for ; Wed, 4 Nov 2015 10:49:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=he6XxaTu; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 7FDFF1060D; Tue, 3 Nov 2015 15:48:59 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 9E528105F4 for ; Tue, 3 Nov 2015 15:48:58 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 307DB162F14 for ; Tue, 3 Nov 2015 16:48:58 -0700 (MST) X-ASG-Debug-ID: 1446594537-03dc2118ca4cd00001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id BkUXZCpqwUaZHNiY (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 03 Nov 2015 16:48:57 -0700 (MST) X-Barracuda-Envelope-From: jpettit@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pa0-f54.google.com) (209.85.220.54) by mx3-pf3.cudamail.com with ESMTPS (RC4-SHA encrypted); 4 Nov 2015 00:03:25 -0000 Received-SPF: unknown (mx3-pf3.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.54 Received: by pasz6 with SMTP id z6so33002995pas.2 for ; Tue, 03 Nov 2015 15:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=oT7v4z6MnT5TA/ZthvYm/yZKyOhZmV+9Jn9l6YNEmO4=; b=he6XxaTur4SjW4d7Usab8fIqsvowBWuYRSA+ct8SDg0nouJIu53LikFuJE1BcTBI1u yW70EI4hwad/RpJPU6kbRO92UR1C8R6GOmINv7xozGbHb4ND1oY8m9zy2UWoZQqul8E9 M03lm7MlBS31NCZvywokEweZo8XKLa49dF5qxYM0fkXrEERZRxYmJIVvrn7cPiEfbGlb NvSaSvZjGsri/mx5Rx3ZCtVco2ya19HvQ7MtThiKZO3A8nFX9rfEx8gfWHMbXZgwNDsu RnW3MVX5BLF9fm9C5qcC9zMuCdEl/jXyMSMxvZOfyjk1ktwZA9sWU86ZF3Lxc7MfOqul qVBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=oT7v4z6MnT5TA/ZthvYm/yZKyOhZmV+9Jn9l6YNEmO4=; b=diowBaUUidbFdbyNP64BnCWtlgl5AnQGc/8qKAfYway7JQUwshfPGFU9EPN7Zg1KKK 7DCzjhM2eZ79g+F+PFsKNIZr13gsk4CLcxPHxpVoZrcZU48ulWTzMXDmC5vpqSCWXGln 20ODxRRpmDTkSWuyxfCuWAy9iJgBGuDa5/CJ6ixlnmWCq8MZ9k56bCUVlj1+DybqCuwB pA5KMYPCS0lX+0GTm9jIR75z+SZOtin2BpxgvsgmvEk2tuFnusneKSS/0844B5t/zo8X xjZM+0NeWD4QUMBsPkWyOcprY76fFWTbjkYH8yXs2LPrMgnSiRVFtfaT7EcMNmDpl0/e OMwQ== X-Gm-Message-State: ALoCoQkaf/3wmCDLvEHtN7hfVgD30ugxNwGHtIRHPbqS+4Gw70U3SJiTMaooPaiIJBCt4RcFCgCj X-Received: by 10.68.142.129 with SMTP id rw1mr36500357pbb.149.1446594537186; Tue, 03 Nov 2015 15:48:57 -0800 (PST) Received: from localhost.localdomain (c-67-161-8-206.hsd1.ca.comcast.net. [67.161.8.206]) by smtp.gmail.com with ESMTPSA id qf2sm28725441pbb.3.2015.11.03.15.48.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Nov 2015 15:48:56 -0800 (PST) X-CudaMail-Envelope-Sender: jpettit@nicira.com X-Barracuda-Apparent-Source-IP: 67.161.8.206 From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1102066125 X-CudaMail-DTE: 110315 X-CudaMail-Originating-IP: 209.85.220.54 Date: Tue, 3 Nov 2015 15:48:47 -0800 X-ASG-Orig-Subj: [##CM-V3-1102066125##][ICMP v2 4/7] ovn: Change printed stage names. Message-Id: <1446594530-22162-5-git-send-email-jpettit@nicira.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1446594530-22162-1-git-send-email-jpettit@nicira.com> References: <1446594530-22162-1-git-send-email-jpettit@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1446594537 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [ICMP v2 4/7] ovn: Change printed stage names. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" The stage names were getting long and throwing off the formatting when dumping the logical flows. Signed-off-by: Justin Pettit Acked-by: Russell Bryant --- ovn/northd/ovn-northd.c | 40 ++++++++++++++++++++-------------------- ovn/utilities/ovn-sbctl.c | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index c7d56fe..9996584 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -83,26 +83,26 @@ enum ovn_datapath_type { * form the stage's full name, e.g. S_SWITCH_IN_PORT_SEC, * S_ROUTER_OUT_DELIVERY. */ enum ovn_stage { -#define PIPELINE_STAGES \ - /* Logical switch ingress stages. */ \ - PIPELINE_STAGE(SWITCH, IN, PORT_SEC, 0, "switch_in_port_sec") \ - PIPELINE_STAGE(SWITCH, IN, PRE_ACL, 1, "switch_in_pre_acl") \ - PIPELINE_STAGE(SWITCH, IN, ACL, 2, "switch_in_acl") \ - PIPELINE_STAGE(SWITCH, IN, L2_LKUP, 3, "switch_in_l2_lkup") \ - \ - /* Logical switch egress stages. */ \ - PIPELINE_STAGE(SWITCH, OUT, PRE_ACL, 0, "switch_out_pre_acl") \ - PIPELINE_STAGE(SWITCH, OUT, ACL, 1, "switch_out_acl") \ - PIPELINE_STAGE(SWITCH, OUT, PORT_SEC, 2, "switch_out_port_sec") \ - \ - /* Logical router ingress stages. */ \ - PIPELINE_STAGE(ROUTER, IN, ADMISSION, 0, "router_in_admission") \ - PIPELINE_STAGE(ROUTER, IN, IP_INPUT, 1, "router_in_ip_input") \ - PIPELINE_STAGE(ROUTER, IN, IP_ROUTING, 2, "router_in_ip_routing") \ - PIPELINE_STAGE(ROUTER, IN, ARP, 3, "router_in_arp") \ - \ - /* Logical router egress stages. */ \ - PIPELINE_STAGE(ROUTER, OUT, DELIVERY, 0, "router_out_delivery") +#define PIPELINE_STAGES \ + /* Logical switch ingress stages. */ \ + PIPELINE_STAGE(SWITCH, IN, PORT_SEC, 0, "ls_in_port_sec") \ + PIPELINE_STAGE(SWITCH, IN, PRE_ACL, 1, "ls_in_pre_acl") \ + PIPELINE_STAGE(SWITCH, IN, ACL, 2, "ls_in_acl") \ + PIPELINE_STAGE(SWITCH, IN, L2_LKUP, 3, "ls_in_l2_lkup") \ + \ + /* Logical switch egress stages. */ \ + PIPELINE_STAGE(SWITCH, OUT, PRE_ACL, 0, "ls_out_pre_acl") \ + PIPELINE_STAGE(SWITCH, OUT, ACL, 1, "ls_out_acl") \ + PIPELINE_STAGE(SWITCH, OUT, PORT_SEC, 2, "ls_out_port_sec") \ + \ + /* Logical router ingress stages. */ \ + PIPELINE_STAGE(ROUTER, IN, ADMISSION, 0, "lr_in_admission") \ + PIPELINE_STAGE(ROUTER, IN, IP_INPUT, 1, "lr_in_ip_input") \ + PIPELINE_STAGE(ROUTER, IN, IP_ROUTING, 2, "lr_in_ip_routing") \ + PIPELINE_STAGE(ROUTER, IN, ARP, 3, "lr_in_arp") \ + \ + /* Logical router egress stages. */ \ + PIPELINE_STAGE(ROUTER, OUT, DELIVERY, 0, "lr_out_delivery") #define PIPELINE_STAGE(DP_TYPE, PIPELINE, STAGE, TABLE, NAME) \ S_##DP_TYPE##_##PIPELINE##_##STAGE \ diff --git a/ovn/utilities/ovn-sbctl.c b/ovn/utilities/ovn-sbctl.c index 7861fe7..cf3c559 100644 --- a/ovn/utilities/ovn-sbctl.c +++ b/ovn/utilities/ovn-sbctl.c @@ -736,7 +736,7 @@ cmd_lflow_list(struct ctl_context *ctx) } const char *table_name = smap_get(&lflow->external_ids, "stage-name"); - printf(" table=%" PRId64 "(%8s), priority=%5" PRId64 + printf(" table=%" PRId64 "(%16s), priority=%5" PRId64 ", match=(%s), action=(%s)\n", lflow->table_id, table_name ? table_name : "", lflow->priority, lflow->match, lflow->actions);