From: Ben Pfaff <blp@nicira.com>
Date: Tue, 12 Feb 2013 19:38:05 +0000 (-0800)
Subject: Revert "vswitchd: Require "target" column to be unique in OVS database."
X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~46
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4b95a9e9bb8d45010a5765f431b6d15367914704;p=sliver-openvswitch.git

Revert "vswitchd: Require "target" column to be unique in OVS database."

This reverts commit 41219e63a02bd315e7066145d72798f7a4204566.

In fact, the "target" column cannot be made unique within the
Controller table, because different bridges are allowed to have
the same target.  OVSDB does not have a way to express this
constraint, so it must be omitted entirely.

Reported-by: Saul St. John <sstjohn@cs.wisc.edu>
CC: Natasha Gude <natasha@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
index 53d167528..a7901a86a 100644
--- a/vswitchd/vswitch.ovsschema
+++ b/vswitchd/vswitch.ovsschema
@@ -1,6 +1,6 @@
 {"name": "Open_vSwitch",
  "version": "7.0.0",
- "cksum": "438518409 17329",
+ "cksum": "3537583872 17299",
  "tables": {
    "Open_vSwitch": {
      "columns": {
@@ -428,8 +428,7 @@
          "ephemeral": true},
        "status": {
          "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"},
-         "ephemeral": true}},
-     "indexes": [["target"]]},
+         "ephemeral": true}}},
    "Manager": {
      "columns": {
        "target": {