From patchwork Tue Sep 29 17:34:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 523966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id A1BE7140157 for ; Wed, 30 Sep 2015 03:44:22 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 410E3105A6; Tue, 29 Sep 2015 10:44:17 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 1969A1059C for ; Tue, 29 Sep 2015 10:44:16 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 76EE21E012D for ; Tue, 29 Sep 2015 11:44:15 -0600 (MDT) X-ASG-Debug-ID: 1443548654-03dc537fe1891110001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar2.cudamail.com with ESMTP id ClnHKjRliOdqvnes (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 29 Sep 2015 11:44:14 -0600 (MDT) X-Barracuda-Envelope-From: shettyg@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f50.google.com) (209.85.220.50) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 29 Sep 2015 17:44:14 -0000 Received-SPF: unknown (mx1-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.220.50 X-Barracuda-RBL-IP: 209.85.220.50 Received: by pacex6 with SMTP id ex6so12349595pac.0 for ; Tue, 29 Sep 2015 10:44:13 -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=HgEfrpTGDbttR//+S6aLjKkRQ+yVApJC70GOWb2+NJc=; b=koKZIkV85VSoyNmP5nfP+g0rDRNEZHr1CQorH0u1e+pvnJIVspFJ/vt3t5lRD4+9vV yySrhsde1t3RSinbjHl5hGcoKLZ9LTmLpswWgErvI5ujB/VEJ2seemj6YF9cEQcXA/fs CRdAxWFDGCfKVeyZwdgFMpn0Ciqy86LXnkuP6WEi9E35APLzWp87CVJShyfrPrApqkCC mdBarmHEmjMQ1Z6cKVNKT5MUYbMxdjOsocyCT9yoajqt7zSAZ0GXcFs4vACenIsyf967 i0OO79I7UfMcSjgPlTb/SO/KbsZYq/ZdrlJS1dewzipuc1pTjrBQaBugRf/PqGxDcH68 KOpg== X-Gm-Message-State: ALoCoQlnZ5H2KZuyStqVjzogC30uv8DEIJtJUXjRMDYdI5mn+LuIB6EJwEMhTNwrYI7ZQxVmfTuP X-Received: by 10.66.221.104 with SMTP id qd8mr34558615pac.155.1443548653584; Tue, 29 Sep 2015 10:44:13 -0700 (PDT) Received: from htb-1n-eng-dhcp378.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id zk9sm26863926pac.7.2015.09.29.10.44.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 10:44:12 -0700 (PDT) X-CudaMail-Envelope-Sender: shettyg@nicira.com From: Gurucharan Shetty X-Google-Original-From: Gurucharan Shetty To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-928070231 X-CudaMail-DTE: 092915 X-CudaMail-Originating-IP: 209.85.220.50 Date: Tue, 29 Sep 2015 10:34:07 -0700 X-ASG-Orig-Subj: [##CM-E1-928070231##][PATCH 3/3] ovn-controller: Fix container flows in table 33. Message-Id: <1443548047-13144-3-git-send-email-gshetty@nicira.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443548047-13144-1-git-send-email-gshetty@nicira.com> References: <1443548047-13144-1-git-send-email-gshetty@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1443548654 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 3/3] ovn-controller: Fix container flows in table 33. 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 broadcast flows added in table 33 was faulty for containers. Fix it. Suggested-by: Russell Bryant Signed-off-by: Gurucharan Shetty Acked-by: Russell Bryant --- ovn/controller/physical.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index 5280916..fc70748 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -474,7 +474,9 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve, continue; } - if (simap_contains(&localvif_to_ofport, port->logical_port)) { + if (simap_contains(&localvif_to_ofport, + port->parent_port + ? port->parent_port : port->logical_port)) { put_load(port->tunnel_key, MFF_LOG_OUTPORT, 0, 32, &ofpacts); put_resubmit(OFTABLE_DROP_LOOPBACK, &ofpacts); } else if (port->chassis) {