datapath: Avoid freeing wild pointer in corner case.

[sliver-openvswitch.git] / vswitchd / vswitch.ovsschema

diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index 8553499..5afb606 100644 (file)
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -1,6 +1,6 @@
 {"name": "Open_vSwitch",
- "version": "1.2.0",
- "cksum": "2368100022 15573",
+ "version": "3.1.0",
+ "cksum": "2572059147 15155",
  "tables": {
    "Open_vSwitch": {
      "columns": {
@@ -8,8 +8,6 @@
          "type": {"key": {"type": "uuid",
                           "refTable": "Bridge"},
                   "min": 0, "max": "unlimited"}},
-       "managers": {
-         "type": {"key": "string", "min": 0, "max": "unlimited"}},
        "manager_options": {
          "type": {"key": {"type": "uuid",
                           "refTable": "Manager"},
@@ -45,6 +43,7 @@
        "system_version": {
          "type": {"key": {"type": "string"},
                   "min": 0, "max": 1}}},
+     "isRoot": true,
      "maxRows": 1},
    "Capability": {
      "columns": {
@@ -122,7 +121,11 @@
                   "min": 0, "max": 1}},
        "bond_mode": {
          "type": {"key": {"type": "string",
-           "enum": ["set", ["balance-slb", "active-backup"]]},
+           "enum": ["set", ["balance-tcp", "balance-slb", "active-backup"]]},
+         "min": 0, "max": 1}},
+       "lacp": {
+         "type": {"key": {"type": "string",
+           "enum": ["set", ["active", "passive", "off"]]},
          "min": 0, "max": 1}},
        "bond_updelay": {
          "type": "integer"},
@@ -217,20 +220,7 @@
          "type": {
            "key": { "type": "uuid", "refTable": "Maintenance_Point"},
            "min": 0,
-           "max": "unlimited"},
-         "ephemeral": true},
-       "unexpected_remote_mpids": {
-         "type": {
-           "key": { "type": "integer"},
-           "min": 0,
-           "max": "unlimited"},
-         "ephemeral": true},
-       "unexpected_remote_maids": {
-         "type": {
-           "key": "string",
-           "min": 0,
-           "max": "unlimited"},
-         "ephemeral": true},
+           "max": "unlimited"}},
        "fault": {
          "type": {
            "key": { "type": "boolean"},
@@ -265,7 +255,8 @@
                   "min": 0, "max": "unlimited"}},
        "external_ids": {
          "type": {"key": "string", "value": "string",
-                  "min": 0, "max": "unlimited"}}}},
+                  "min": 0, "max": "unlimited"}}},
+     "isRoot": true},
    "Queue": {
      "columns": {
        "other_config": {
@@ -273,7 +264,8 @@
                   "min": 0, "max": "unlimited"}},
        "external_ids": {
          "type": {"key": "string", "value": "string",
-                  "min": 0, "max": "unlimited"}}}},
+                  "min": 0, "max": "unlimited"}}},
+     "isRoot": true},
    "Mirror": {
      "columns": {
        "name": {
@@ -357,10 +349,6 @@
                   "min": 0, "max": 1}},
        "inactivity_probe": {
          "type": {"key": "integer", "min": 0, "max": 1}},
-       "discover_accept_regex": {
-         "type": {"key": "string", "min": 0, "max": 1}},
-       "discover_update_resolv_conf": {
-         "type": {"key": "boolean", "min": 0, "max": 1}},
        "connection_mode": {
          "type": {"key": {"type": "string",
                   "enum": ["set", ["in-band", "out-of-band"]]},