From patchwork Thu Oct 1 22:09:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 525324 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 3943D140D69 for ; Fri, 2 Oct 2015 08:19:40 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id B11F610D41; Thu, 1 Oct 2015 15:19:38 -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 45CFF10D40 for ; Thu, 1 Oct 2015 15:19:37 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 6666E1E04D3 for ; Thu, 1 Oct 2015 16:19:36 -0600 (MDT) X-ASG-Debug-ID: 1443737976-09eadd1416c0840001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id LUAcYn40NP44pXtb (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 01 Oct 2015 16:19:36 -0600 (MDT) X-Barracuda-Envelope-From: shettyg@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-wi0-f178.google.com) (209.85.212.178) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 1 Oct 2015 22:19:35 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.212.178 X-Barracuda-RBL-IP: 209.85.212.178 Received: by wicfx3 with SMTP id fx3so10197918wic.1 for ; Thu, 01 Oct 2015 15:19:34 -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; bh=WqMLgNAOOn/Zw0IKmSsw9QeApGvSP30KPNR9Ep5WQdE=; b=BpnpASXYaR8WaA5UY0tGh2F9SsEjZDpKI8q0G6MVGe4sw9+SJECwXVxhE8pEekFyaT JeZOSwYn95d+2rm6Ii+YGPX1UginyhpNDHJOwdDhWvH0ulIJszpiSTN+wwjo+Q8jeMHU vtug+9kSdp/8YSFBdDhcJYQMqg1M4WA2CFR9y+tlKsRTYDbD4oXACmrOs66piIChzW5l XgYgHl4/WDgnbYE0i9rTvqAncAcBqJYzAAmJE4YPGMaIzQ5Vucr6ADrxRhNR4NJGaGkT cgxmzwerObsfUGWt4V+JYhesSfqNplGnBDMApxtBaAp9rKX6KIdLl+MN0Q8dNTDVFGJC XghA== X-Gm-Message-State: ALoCoQkr5V9uOHSVFyODxyHTAJrZuFAaoqnO8qfRDfwZavseg3ra+Ou1smD0FBzlYn+X/omkEG+R X-Received: by 10.180.85.226 with SMTP id k2mr1015011wiz.67.1443737973993; Thu, 01 Oct 2015 15:19:33 -0700 (PDT) Received: from htb-1n-eng-dhcp378.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id pb4sm8254491wjb.8.2015.10.01.15.19.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 15:19:33 -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-E2-930098520 X-CudaMail-DTE: 100115 X-CudaMail-Originating-IP: 209.85.212.178 Date: Thu, 1 Oct 2015 15:09:17 -0700 X-ASG-Orig-Subj: [##CM-E2-930098520##][PATCH] ovn: Change the valid tag values. Message-Id: <1443737357-2518-1-git-send-email-gshetty@nicira.com> X-Mailer: git-send-email 1.9.1 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1443737976 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] ovn: Change the valid tag values. 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" A tag value of 0 is not used by containers running inside VMs. Signed-off-by: Gurucharan Shetty Acked-by: Ben Pfaff --- ovn/controller/physical.c | 2 +- ovn/ovn-nb.ovsschema | 2 +- ovn/ovn-sb.ovsschema | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c index fc70748..a5f18b7 100644 --- a/ovn/controller/physical.c +++ b/ovn/controller/physical.c @@ -253,7 +253,7 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve, } ofport = u16_to_ofp(simap_get(&localnet_to_ofport, network)); } else if (binding->parent_port) { - if (!binding->tag || !*binding->tag) { + if (!binding->tag) { continue; } ofport = u16_to_ofp(simap_get(&localvif_to_ofport, diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema index 20fdc79..566617b 100644 --- a/ovn/ovn-nb.ovsschema +++ b/ovn/ovn-nb.ovsschema @@ -34,7 +34,7 @@ "parent_name": {"type": {"key": "string", "min": 0, "max": 1}}, "tag": { "type": {"key": {"type": "integer", - "minInteger": 0, + "minInteger": 1, "maxInteger": 4095}, "min": 0, "max": 1}}, "macs": {"type": {"key": "string", diff --git a/ovn/ovn-sb.ovsschema b/ovn/ovn-sb.ovsschema index 1ffd1b4..7f857ed 100644 --- a/ovn/ovn-sb.ovsschema +++ b/ovn/ovn-sb.ovsschema @@ -86,7 +86,7 @@ "parent_port": {"type": {"key": "string", "min": 0, "max": 1}}, "tag": { "type": {"key": {"type": "integer", - "minInteger": 0, + "minInteger": 1, "maxInteger": 4095}, "min": 0, "max": 1}}, "chassis": {"type": {"key": {"type": "uuid",