ofp-util: Simplify logic for computing vlan_tci and vlan_tci_mask.

[openvswitch] / vswitchd / vswitch.ovsschema

diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index 98e4a1006bf661ef583109648cdc035000fcf7a9..4ad5c38b28a28d024a469ebc6f2c26288df9102f 100644 (file)
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -1,6 +1,6 @@
 {"name": "Open_vSwitch",
- "version": "3.0.1",
- "cksum": "1940448373 15497",
+ "version": "4.0.0",
+ "cksum": "2606080158 14328",
  "tables": {
    "Open_vSwitch": {
      "columns": {
@@ -121,7 +121,7 @@
                   "min": 0, "max": 1}},
        "bond_mode": {
          "type": {"key": {"type": "string",
-           "enum": ["set", ["balance-tcp", "balance-slb", "active-backup"]]},
+           "enum": ["set", ["balance-tcp", "balance-slb", "active-backup", "stable"]]},
          "min": 0, "max": 1}},
        "lacp": {
          "type": {"key": {"type": "string",
@@ -162,11 +162,24 @@
        "ofport": {
          "type": {"key": "integer", "min": 0, "max": 1},
          "ephemeral": true},
-       "monitor": {
+       "cfm_mpid": {
          "type": {
-           "key": {"type": "uuid", "refTable": "Monitor"},
+           "key": {"type": "integer", "minInteger": 1, "maxInteger": 8191},
            "min": 0,
            "max": 1}},
+       "cfm_remote_mpid": {
+         "type" : {
+           "key": { "type": "integer", "minInteger": 1, "maxInteger": 8191},
+           "min": 0,
+           "max": 1}},
+       "cfm_fault": {
+         "type": {
+           "key": { "type": "boolean"},
+           "min": 0,
+           "max": 1}},
+       "lacp_current": {
+         "type": {"key": {"type": "boolean"},
+                  "min": 0, "max": 1}},
        "other_config": {
          "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}},
        "statistics": {
@@ -196,61 +209,6 @@
        "mtu": {
          "type": {"key": "integer", "min": 0, "max": 1},
          "ephemeral": true}}},
-   "Monitor": {
-     "columns": {
-       "mpid": {
-         "type" : {
-           "key": { "type": "integer", "minInteger": 1, "maxInteger": 8191}}},
-       "md_name": {
-         "type" : {
-           "key": { "type": "string", "minLength": 1, "maxLength": 43},
-           "min": 0,
-           "max": 1}},
-       "ma_name": {
-         "type" : {
-           "key": { "type": "string", "minLength": 1, "maxLength": 43},
-           "min": 0,
-           "max": 1}},
-       "interval": {
-         "type": {
-           "key": { "type": "integer", "minInteger": 100},
-           "min": 0,
-           "max": 1}},
-       "remote_mps": {
-         "type": {
-           "key": { "type": "uuid", "refTable": "Maintenance_Point"},
-           "min": 0,
-           "max": "unlimited"}},
-       "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},
-       "fault": {
-         "type": {
-           "key": { "type": "boolean"},
-           "min": 0,
-           "max": 1},
-         "ephemeral": true}}},
-   "Maintenance_Point": {
-     "columns": {
-       "mpid": {
-         "type" : {
-           "key": { "type": "integer", "minInteger": 1, "maxInteger": 8191}},
-         "mutable": false},
-       "fault": {
-         "type": {
-           "key": { "type": "boolean"},
-           "min": 0,
-           "max": 1},
-         "ephemeral": true}}},
    "QoS": {
      "columns": {
        "type": {