X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2FSPECS;h=e5cc21b92411f40b6c3316863a20d2ead301c3c9;hb=4bda8288fb2fba14d02359f636375ca128aaad02;hp=c77f28c0043ffdb71b08139ddfd025177a09ea12;hpb=a817e5246e7446e6381b408b69f3bf353bea8bed;p=openvswitch

diff --git a/ovsdb/SPECS b/ovsdb/SPECS
index c77f28c0..e5cc21b9 100644
--- a/ovsdb/SPECS
+++ b/ovsdb/SPECS
@@ -37,6 +37,10 @@ values.  Additional notation is presented later.
 
     Any JSON value.
 
+<nonnull-json-value>
+
+    Any JSON value except null.
+
 <error>
 
     A JSON object with the following members:
@@ -169,12 +173,11 @@ is represented by <database-schema>, as described below.
     <atomic-type> or a JSON object with the following members:
 
         "type": <atomic-type>              required
+        "enum": <value>                    optional
         "minInteger": <integer>            optional, integers only
         "maxInteger": <integer>            optional, integers only
         "minReal": <real>                  optional, reals only
         "maxReal": <real>                  optional, reals only 
-        "reMatch": <string>                optional, strings only
-        "reComment": <string>              optional, strings only
         "minLength": <integer>             optional, strings only
         "maxLength": <integer>             optional, strings only
         "refTable": <id>                   optional, uuids only
@@ -182,6 +185,13 @@ is represented by <database-schema>, as described below.
     An <atomic-type> by itself is equivalent to a JSON object with a
     single member "type" whose value is the <atomic-type>.
 
+    "enum" may be specified as a <value> whose type is a set of one
+    or more values specified for the member "type".  If "enum" is
+    specified, then the valid values of the <base-type> are limited to
+    those in the <value>.
+
+    "enum" is mutually exclusive with the following constraints.
+
     If "type" is "integer", then "minInteger" or "maxInteger" or both
     may also be specified, restricting the valid integer range.  If
     both are specified, then the maxInteger must be greater than or
@@ -192,23 +202,11 @@ is represented by <database-schema>, as described below.
     specified, then the maxReal must be greater than or equal to
     minReal.
 
-    If "type" is "string", then:
-
-        "reMatch" may be a JavaScript (Perl 5-like) regular expression
-        that restricts the allowed values.  The regular expression
-        must match the entire string value, that is, it is treated as
-        if it begins with ^ and ends with $, regardless of whether it
-        really does.
-
-        If "reMatch" is specified, then "reComment" may be a string
-        that describes the allowed values, phrased so that it fits
-        into a sentence such as "This value must be...".
-
-        "minLength" and "maxLength" or both may be specified,
-        restricting the valid length of value strings.  If both are
-        specified, then maxLength must be greater than or equal to
-        minLength.  String length is measured in characters (not bytes
-        or UTF-16 code units).
+    If "type" is "string", then "minLength" and "maxLength" or both
+    may be specified, restricting the valid length of value strings.
+    If both are specified, then maxLength must be greater than or
+    equal to minLength.  String length is measured in characters (not
+    bytes or UTF-16 code units).
 
     If "type" is "uuid", then "refTable", if present, must be the name
     of a table within this database.  If "refTable" is set, the
@@ -250,7 +248,7 @@ Request object members:
 
     "method": "list_dbs"              required
     "params": []                      required
-    "id": any JSON value except null  required
+    "id": <nonnull-json-value>        required
 
 Response object members:
 
@@ -269,7 +267,7 @@ Request object members:
 
     "method": "get_schema"            required
     "params": [<db-name>]             required
-    "id": any JSON value except null  required
+    "id": <nonnull-json-value>        required
 
 Response object members:
 
@@ -287,7 +285,7 @@ Request object members:
 
     "method": "transact"                  required
     "params": [<db-name>, <operation>*]   required
-    "id": any JSON value except null      required
+    "id": <nonnull-json-value>            required
 
 Response object members:
 
@@ -397,7 +395,7 @@ Request object members:
 
     "method": "monitor"                                       required
     "params": [<db-name>, <json-value>, <monitor-requests>]   required
-    "id": any JSON value except null                          required
+    "id": <nonnull-json-value>                                required
 
 <monitor-requests> is an object that maps from a table name to a
 <monitor-request>.
@@ -505,7 +503,7 @@ Request object members:
 
     "method": "monitor_cancel"                              required
     "params": [<json-value>]                                required
-    "id": any JSON value except null                        required
+    "id": <nonnull-json-value>                              required
 
 Response object members: