ovsdb: Correct specification inconsistency between "lock" and "assert".

The "lock" request requires the lock name to be an <id> but it is shown as
<string> in the "assert" operation.  This corrects the "assert"
specification and fixes the suggested naming convention (since ":" is not
valid in an <id>).

This commit also updates the implementation to match the specification.

Reported-by: Jeremy Stribling <strib@nicira.com>

diff --git a/ovsdb/SPECS b/ovsdb/SPECS
index e2898c2f0c726643e3e5c950759042d247b932d3..5bdb9741de225ce3419f948f7ca2c1d8bf6043d4 100644 (file)
--- a/ovsdb/SPECS
+++ b/ovsdb/SPECS
@@ -682,7 +682,7 @@ The "locked" and "stolen" notifications (see below) report
 asynchronous changes to ownership.
 
 The scope of a lock is a database server, not a database hosted by
-that server.  A naming convention, such as "<db-name>:<lock-name>",
+that server.  A naming convention, such as "<db-name>__<lock-name>",
 can effectively limit the scope of a lock to a particular database.
 
 locked
@@ -1300,7 +1300,7 @@ assert
 Request object members:
 
     "op": "assert"                     required
-    "lock": <string>                   required
+    "lock": <id>                       required
 
 Result object members:
 

diff --git a/ovsdb/execution.c b/ovsdb/execution.c
index 9e3a8d07b5d04252531d5fe6196f5ff66ce88fab..675c1c31a7ca603cff1c983d11c0550b73aa7e2f 100644 (file)
--- a/ovsdb/execution.c
+++ b/ovsdb/execution.c
@@ -719,7 +719,7 @@ ovsdb_execute_assert(struct ovsdb_execution *x, struct ovsdb_parser *parser,
 {
     const struct json *lock_name;
 
-    lock_name = ovsdb_parser_member(parser, "lock", OP_STRING);
+    lock_name = ovsdb_parser_member(parser, "lock", OP_ID);
     if (!lock_name) {
         return NULL;
     }