[ovs-dev] ovn: Change the valid tag values.
diff mbox

Message ID 1443737357-2518-1-git-send-email-gshetty@nicira.com
State Accepted
Headers show

Commit Message

Gurucharan Shetty Oct. 1, 2015, 10:09 p.m. UTC
A tag value of 0 is not used by containers running inside
VMs.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
---
 ovn/controller/physical.c | 2 +-
 ovn/ovn-nb.ovsschema      | 2 +-
 ovn/ovn-sb.ovsschema      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Ben Pfaff Oct. 2, 2015, 1:05 p.m. UTC | #1
On Thu, Oct 01, 2015 at 03:09:17PM -0700, Gurucharan Shetty wrote:
> A tag value of 0 is not used by containers running inside
> VMs.
> 
> Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>

Acked-by: Ben Pfaff <blp@nicira.com>

Patch
diff mbox

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",