X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2FSPECS;h=4020241e54e44a17a7b5eb9922724bce784304f8;hb=3b1acc9955fa9c595f6b9e41999aa40041c7b049;hp=d2de137aab30421be9787be3552b7b0c906cf03d;hpb=c69ee87c10818267f991236201150b1fa51ae519;p=openvswitch

diff --git a/ovsdb/SPECS b/ovsdb/SPECS
index d2de137a..4020241e 100644
--- a/ovsdb/SPECS
+++ b/ovsdb/SPECS
@@ -33,10 +33,14 @@ values.  Additional notation is presented later.
     A JSON number with an integer value, within a certain range
     (currently -2**63...+2**63-1).
 
-<value>
+<json-value>
 
     Any JSON value.
 
+<nonnull-json-value>
+
+    Any JSON value except null.
+
 <error>
 
     A JSON object with the following members:
@@ -250,7 +254,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 +273,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 +291,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:
 
@@ -395,9 +399,9 @@ monitor
 
 Request object members:
 
-    "method": "monitor"                                   required
-    "params": [<db-name>, <value>, <monitor-requests>]    required
-    "id": any JSON value except null                      required
+    "method": "monitor"                                       required
+    "params": [<db-name>, <json-value>, <monitor-requests>]   required
+    "id": <nonnull-json-value>                                required
 
 <monitor-requests> is an object that maps from a table name to a
 <monitor-request>.
@@ -461,11 +465,11 @@ update
 Notification object members:
 
     "method": "update"
-    "params": [<value>, <table-updates>]
+    "params": [<json-value>, <table-updates>]
     "id": null
 
-The <value> in "params" is the same as the value passed as the <value>
-in "params" for the "monitor" request.
+The <json-value> in "params" is the same as the value passed as the
+<json-value> in "params" for the "monitor" request.
 
 <table-updates> is an object that maps from a table name to a
 <table-update>.
@@ -504,8 +508,8 @@ monitor_cancel
 Request object members:
 
     "method": "monitor_cancel"                              required
-    "params": [<value>]                                     required
-    "id": any JSON value except null                        required
+    "params": [<json-value>]                                required
+    "id": <nonnull-json-value>                              required
 
 Response object members:
 
@@ -513,10 +517,10 @@ Response object members:
     "error": null
     "id": the request "id" member
 
-Cancels the ongoing table monitor request, identified by the <value>
-in "params" matching the <value> in "params" for an ongoing "monitor"
-request.  No more "update" messages will be sent for this table
-monitor.
+Cancels the ongoing table monitor request, identified by the
+<json-value> in "params" matching the <json-value> in "params" for an
+ongoing "monitor" request.  No more "update" messages will be sent for
+this table monitor.
 
 echo
 ....
@@ -525,7 +529,7 @@ Request object members:
 
     "method": "echo"                                required
     "params": JSON array with any contents          required
-    "id": <value>                                   required
+    "id": <json-value>                              required
 
 Response object members: