From patchwork Mon Sep 12 10:40:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 668971 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3sY0CF6Y39z9sdn for ; Tue, 13 Sep 2016 06:43:53 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id D780010616; Mon, 12 Sep 2016 13:43:48 -0700 (PDT) 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 91C121060B for ; Mon, 12 Sep 2016 13:43:47 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id D836616216F for ; Mon, 12 Sep 2016 14:43:46 -0600 (MDT) X-ASG-Debug-ID: 1473713026-0b32373e00fbeb0001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar6.cudamail.com with ESMTP id 9C1IBYEhEntFKPTG (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 12 Sep 2016 14:43:46 -0600 (MDT) X-Barracuda-Envelope-From: guru.ovn@gmail.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail-pa0-f67.google.com) (209.85.220.67) by mx3-pf2.cudamail.com with ESMTPS (AES128-SHA encrypted); 12 Sep 2016 20:43:46 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at _netblocks.google.com designates 209.85.220.67 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.85.220.67 X-Barracuda-RBL-IP: 209.85.220.67 Received: by mail-pa0-f67.google.com with SMTP id p2so2001299pap.3 for ; Mon, 12 Sep 2016 13:43:46 -0700 (PDT) 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=nPbc+sQ/AxTlsq5qAnfZEc0jh5JnlhN22y4OqoL9COc=; b=Ctm07EdSFnU6NngdirKR6V+uNl3GybdyaoAu/n8OZge34DmovwpYFo85sVWChcK5bn IONiXyWdXuWWv76dzxNXlCbS+FEYN1FQZHYKbDJ7MejPRuUZYJX19yRg+kczVOx5w9oj ZmperCC4BGT6IJePA5x8dhezE8xRgdpjnbPvHaeYqnhTWVVUNkoLwhjbt/x+555ch0mC tBPmvssKO7qBX306K/2osPd35usgpd+mCOLpvZKp7ubwlFo4rsh9DhhGgx5EmTlm0g0q c5zLg29mZSEXJpP+d1XvEjwPaH+f32hbe6XxjbM+HGkmEqJ6eyOq9DwiORkNkhQmkeiZ QjlQ== X-Gm-Message-State: AE9vXwPdvck3Qaa7KXLCWj62c9QyHzuYTyNURVndpXEN05DzBC06zbxOteLopHPtkT6BAw== X-Received: by 10.66.73.105 with SMTP id k9mr37301333pav.30.1473713025533; Mon, 12 Sep 2016 13:43:45 -0700 (PDT) Received: from ubuntu.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id n18sm26478547pfa.48.2016.09.12.13.43.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Sep 2016 13:43:44 -0700 (PDT) X-CudaMail-Envelope-Sender: guru.ovn@gmail.com From: Gurucharan Shetty To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-911045251 X-CudaMail-DTE: 091216 X-CudaMail-Originating-IP: 209.85.220.67 Date: Mon, 12 Sep 2016 03:40:27 -0700 X-ASG-Orig-Subj: [##CM-V2-911045251##][PATCH 2/2] ovn-northd: Format logical flows a little better. Message-Id: <1473676827-19692-2-git-send-email-guru@ovn.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473676827-19692-1-git-send-email-guru@ovn.org> References: <1473676827-19692-1-git-send-email-guru@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1473713026 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] [PATCH 2/2] ovn-northd: Format logical flows a little better. 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" This is a cosmetic fix. Signed-off-by: Gurucharan Shetty Acked-by: Ben Pfaff --- ovn/northd/ovn-northd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index 648bd88..8b6f6a3 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -2559,9 +2559,9 @@ build_stateful(struct ovn_datapath *od, struct hmap *lflows) ds_put_format(&match, "ct.new && ip && ip4.dst == %s", ip_address); if (port) { if (lb->protocol && !strcmp(lb->protocol, "udp")) { - ds_put_format(&match, "&& udp && udp.dst == %d", port); + ds_put_format(&match, " && udp && udp.dst == %d", port); } else { - ds_put_format(&match, "&& tcp && tcp.dst == %d", port); + ds_put_format(&match, " && tcp && tcp.dst == %d", port); } ovn_lflow_add(lflows, od, S_SWITCH_IN_STATEFUL, 120, ds_cstr(&match), action); @@ -3663,9 +3663,11 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, if (port) { if (lb->protocol && !strcmp(lb->protocol, "udp")) { - ds_put_format(&match, "&& udp && udp.dst == %d", port); + ds_put_format(&match, " && udp && udp.dst == %d", + port); } else { - ds_put_format(&match, "&& tcp && tcp.dst == %d", port); + ds_put_format(&match, " && tcp && tcp.dst == %d", + port); } ovn_lflow_add(lflows, od, S_ROUTER_IN_DNAT, 120, ds_cstr(&match), ds_cstr(&actions));