ovn: Change the valid tag values.

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>

diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
index fc707484efb431acc604626cfb5747d12404e330..a5f18b7acf81e9f48b58352c7f51172ebf3f05d0 100644 (file)
--- 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 20fdc7986c9a2f4a2cb3714732db852ee3c32775..566617bb9c38a3b051397fef93417c46fe391470 100644 (file)
--- 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 1ffd1b4b3f829619a0d4a8488740f231c65b8f06..7f857ed4234e86d729948e623ad0d97185082c06 100644 (file)
--- 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",