vtep: Update vtep schema with tunnel table

Added a Tunnel table to the VTEP schema that allows per-tunnel BFD configuration and status to be specified. Removed the BFD configuration/status from the Physical_Locator table. Signed-off-by: Ashwin Swaminathan <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Bruce Davie <[email protected]>
vdeore · May 7, 2014 · c8f4eed · c8f4eed
1 parent 5383f2c
commit c8f4eed
Show file tree

Hide file tree

Showing 2 changed files with 219 additions and 162 deletions.
diff --git a/vtep/vtep.ovsschema b/vtep/vtep.ovsschema
@@ -1,6 +1,6 @@
 {
   "name": "hardware_vtep",
-  "cksum": "1687941026 6625",
+  "cksum": "58544667 7319",
   "tables": {
     "Global": {
       "columns": {
@@ -25,6 +25,9 @@
           "type": {"key": {"type": "string"}, "min": 0, "max": "unlimited"}},
         "tunnel_ips": {
           "type": {"key": {"type": "string"}, "min": 0, "max": "unlimited"}},
+        "tunnels": {
+          "type": {"key": {"type": "uuid", "refTable": "Tunnel"},
+                   "min": 0, "max": "unlimited"}},
         "switch_fault_status": {
           "type": {
             "key": "string", "min": 0, "max": "unlimited"},
@@ -49,6 +52,26 @@
           "type": {
             "key": "string", "min": 0, "max": "unlimited"},
           "ephemeral": true}}},
+    "Tunnel": {
+      "columns": {
+        "local": {
+          "type": {"key": {"type": "uuid",
+                           "refTable": "Physical_Locator"}}},
+        "remote": {
+          "type": {"key": {"type": "uuid",
+                           "refTable": "Physical_Locator"}}},
+        "bfd_config_local": {
+          "type": {"key": "string", "value": "string",
+              "min": 0, "max": "unlimited"}},
+        "bfd_config_remote": {
+          "type": {"key": "string", "value": "string",
+              "min": 0, "max": "unlimited"}},
+        "bfd_params": {
+          "type": {"key": "string", "value": "string",
+              "min": 0, "max": "unlimited"}},
+        "bfd_status": {
+          "type": {"key": "string", "value": "string",
+              "min": 0, "max": "unlimited"}}}},
     "Logical_Binding_Stats": {
       "columns": {
         "bytes_from_local": {"type": "integer"},
@@ -149,13 +172,7 @@
               "enum": ["set", ["vxlan_over_ipv4"]],
               "type": "string"}},
           "mutable": false},
-        "dst_ip": {"type": "string", "mutable": false},
-        "bfd": {
-          "type": {"key": "string", "value": "string",
-              "min": 0, "max": "unlimited"}},
-        "bfd_status": {
-          "type": {"key": "string", "value": "string",
-              "min": 0, "max": "unlimited"}}},
+        "dst_ip": {"type": "string", "mutable": false}},
       "indexes": [["encapsulation_type", "dst_ip"]]},
     "Manager": {
       "columns": {
@@ -176,4 +193,4 @@
           "ephemeral": true}},
       "indexes": [["target"]],
       "isRoot": false}},
-  "version": "1.2.0"}
+  "version": "1.3.0"}