]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#2827] reverted src/share/api and updated script
authorRazvan Becheriu <razvan@isc.org>
Wed, 10 May 2023 19:35:25 +0000 (22:35 +0300)
committerRazvan Becheriu <razvan@isc.org>
Thu, 11 May 2023 08:31:16 +0000 (11:31 +0300)
123 files changed:
doc/examples/kea6/all-options.json
doc/sphinx/api2doc.py
doc/sphinx/arm/ctrl-channel.rst
doc/sphinx/arm/dhcp4-srv.rst
doc/sphinx/arm/dhcp6-srv.rst
doc/sphinx/arm/hooks-cb-cmds.rst
doc/sphinx/arm/hooks-host-cmds.rst
doc/sphinx/arm/hooks-lease-cmds.rst
src/lib/dhcp/duid.cc
src/share/api/build-report.json
src/share/api/cache-get-by-id.json
src/share/api/cache-get.json
src/share/api/class-add.json
src/share/api/class-del.json
src/share/api/class-get.json
src/share/api/class-list.json
src/share/api/class-update.json
src/share/api/config-get.json
src/share/api/config-test.json
src/share/api/ha-heartbeat.json
src/share/api/ha-maintenance-notify.json
src/share/api/ha-scopes.json
src/share/api/ha-sync.json
src/share/api/lease4-get-all.json
src/share/api/lease4-get-page.json
src/share/api/lease6-bulk-apply.json
src/share/api/lease6-get-page.json
src/share/api/network4-get.json
src/share/api/network6-get.json
src/share/api/remote-class4-del.json
src/share/api/remote-class4-get-all.json
src/share/api/remote-class4-get.json
src/share/api/remote-class4-set.json
src/share/api/remote-class6-del.json
src/share/api/remote-class6-get-all.json
src/share/api/remote-class6-get.json
src/share/api/remote-class6-set.json
src/share/api/remote-global-parameter4-del.json
src/share/api/remote-global-parameter4-get-all.json
src/share/api/remote-global-parameter4-get.json
src/share/api/remote-global-parameter4-set.json
src/share/api/remote-global-parameter6-del.json
src/share/api/remote-global-parameter6-get-all.json
src/share/api/remote-global-parameter6-get.json
src/share/api/remote-global-parameter6-set.json
src/share/api/remote-network4-del.json
src/share/api/remote-network4-get.json
src/share/api/remote-network4-list.json
src/share/api/remote-network4-set.json
src/share/api/remote-network6-del.json
src/share/api/remote-network6-get.json
src/share/api/remote-network6-list.json
src/share/api/remote-network6-set.json
src/share/api/remote-option-def4-del.json
src/share/api/remote-option-def4-get-all.json
src/share/api/remote-option-def4-get.json
src/share/api/remote-option-def4-set.json
src/share/api/remote-option-def6-del.json
src/share/api/remote-option-def6-get-all.json
src/share/api/remote-option-def6-get.json
src/share/api/remote-option-def6-set.json
src/share/api/remote-option4-global-del.json
src/share/api/remote-option4-global-get-all.json
src/share/api/remote-option4-global-get.json
src/share/api/remote-option4-global-set.json
src/share/api/remote-option4-network-del.json
src/share/api/remote-option4-network-set.json
src/share/api/remote-option4-pool-del.json
src/share/api/remote-option4-pool-set.json
src/share/api/remote-option4-subnet-del.json
src/share/api/remote-option4-subnet-set.json
src/share/api/remote-option6-global-del.json
src/share/api/remote-option6-global-get-all.json
src/share/api/remote-option6-global-get.json
src/share/api/remote-option6-global-set.json
src/share/api/remote-option6-network-del.json
src/share/api/remote-option6-network-set.json
src/share/api/remote-option6-pd-pool-del.json
src/share/api/remote-option6-pd-pool-set.json
src/share/api/remote-option6-pool-del.json
src/share/api/remote-option6-pool-set.json
src/share/api/remote-option6-subnet-del.json
src/share/api/remote-option6-subnet-set.json
src/share/api/remote-server4-del.json
src/share/api/remote-server4-get-all.json
src/share/api/remote-server4-get.json
src/share/api/remote-server4-set.json
src/share/api/remote-server6-del.json
src/share/api/remote-server6-get-all.json
src/share/api/remote-server6-get.json
src/share/api/remote-server6-set.json
src/share/api/remote-subnet4-del-by-id.json
src/share/api/remote-subnet4-del-by-prefix.json
src/share/api/remote-subnet4-get-by-id.json
src/share/api/remote-subnet4-get-by-prefix.json
src/share/api/remote-subnet4-list.json
src/share/api/remote-subnet4-set.json
src/share/api/remote-subnet6-del-by-id.json
src/share/api/remote-subnet6-del-by-prefix.json
src/share/api/remote-subnet6-get-by-id.json
src/share/api/remote-subnet6-get-by-prefix.json
src/share/api/remote-subnet6-list.json
src/share/api/remote-subnet6-set.json
src/share/api/reservation-add.json
src/share/api/reservation-del.json
src/share/api/reservation-get-all.json
src/share/api/reservation-get-by-hostname.json
src/share/api/reservation-get-by-id.json
src/share/api/reservation-get-page.json
src/share/api/reservation-get.json
src/share/api/reservation-update.json
src/share/api/status-get.json
src/share/api/subnet4-add.json
src/share/api/subnet4-delta-add.json
src/share/api/subnet4-delta-del.json
src/share/api/subnet4-get.json
src/share/api/subnet4-update.json
src/share/api/subnet6-add.json
src/share/api/subnet6-delta-add.json
src/share/api/subnet6-delta-del.json
src/share/api/subnet6-get.json
src/share/api/subnet6-update.json
tools/check-for-json-errors-in-doc.sh

index 4904df585301de60704960247c24cbc2039935a4..844a921cf9ec826a6f5762b1fad6181b878e6dc0 100644 (file)
         "name": "v6-dnr",
         "data": "1234, 23, example.some.host.org., " // please notice comma and space at the end put on purpose
                                                      // this means empty last type of the record - binary type
-
       },
 
       // Option codes 145-65535 are unassigned.
index c4af3b33c8209b9e92927aa8ed80398159d9eb8c..de56d8c33ef2a09562f87b0a8fbfaed11ee2410d 100755 (executable)
@@ -167,7 +167,7 @@ API Reference
 
         else:
             rst += '   {\n'
-            rst += '       "result": "<integer>",\n'
+            rst += '       "result": <integer>,\n'
             rst += '       "text": "<string>"\n'
             rst += '   }'
         rst += '\n\n'
index 4ab515f247f7e918c70a9566dd968bd6cafbca9e..5e705d403537367143ffc026ce2547f96e62d912 100644 (file)
@@ -95,9 +95,10 @@ following structure:
            }
        }
 
-The ``command`` is the name of the command to execute and is mandatory.
-The ``arguments`` is a map of the parameters required to carry out the given
-command. The exact content and format of the map are command-specific.
+The ``command`` parameter contains the name of the command to execute and it
+is mandatory.
+The ``arguments`` map contains the parameters required to carry out the
+given command. The exact content and format of the map are command specific.
 
 ``service`` is a list of the servers at which the control command is
 targeted. In the example above, the control command is targeted at the
index 55989df6d1767990b01e848ad7d3fb3e26dca83e..9213236b7bb4bbbb9eea2d620adab3cda4acdf7f 100644 (file)
@@ -250,11 +250,10 @@ client begins the renewal and rebind processes.
    See section :ref:`dhcp4-t1-t2-times`
    for more details on generating T1 and T2.
 
-The ``interfaces-config`` map specifies the
-network interfaces on which the server should listen to
-DHCP messages. The ``interfaces`` parameter specifies a list of
-network interfaces on which the server should listen. Lists are opened
-and closed with square brackets, with elements separated by commas. To
+The ``interfaces-config`` map specifies the network interfaces on which the
+server should listen to DHCP messages. The ``interfaces`` parameter specifies
+a list of network interfaces on which the server should listen. Lists are
+opened and closed with square brackets, with elements separated by commas. To
 listen on two interfaces, the ``interfaces-config`` element should look like
 this:
 
@@ -2224,9 +2223,9 @@ configuration statement only defines the format of an option and does
 not set its value(s).
 
 The ``name``, ``code``, and ``type`` parameters are required; all others
-are optional. The ``array`` default value is ``false``. The
-``record-types`` and ``encapsulate`` default values are blank (``""``).
-The default ``space`` is ``dhcp4``.
+are optional. The ``array`` parameter default value is ``false``. The
+``record-types`` and ``encapsulate`` parameters default values are blank
+(``""``). The default ``space`` is ``dhcp4``.
 
 Once the new option format is defined, its value is set in the same way
 as for a standard option. For example, the following commands set a
@@ -2275,8 +2274,8 @@ defined in the following way:
        ...
    }
 
-The ``type`` is set to ``"record"`` to indicate that the option contains
-multiple values of different types. These types are given as a
+The ``type`` parameter is set to ``"record"`` to indicate that the option
+contains multiple values of different types. These types are given as a
 comma-separated list in the ``record-types`` field and should be ones
 from those listed in :ref:`dhcp-types`.
 
@@ -2297,10 +2296,10 @@ The option's values are set in an ``option-data`` statement as follows:
        ...
    }
 
-The ``csv-format`` is set to ``true`` to indicate that the ``data`` field
-comprises a comma-separated list of values. The values in ``data``
-must correspond to the types set in the ``record-types`` field of the
-option definition.
+The ``csv-format`` parameter is set to ``true`` to indicate that the ``data``
+field comprises a comma-separated list of values. The values in ``data`` must
+correspond to the types set in the ``record-types`` field of the option
+definition.
 
 When ``array`` is set to ``true`` and ``type`` is set to ``"record"``, the
 last field is an array, i.e. it can contain more than one value, as in:
@@ -3519,7 +3518,7 @@ conflict with existing entries owned by other DHCPv4 clients.
     to generate DNS removal requests to D2.
 
 The DNS entries Kea creates contain a value for TTL (time to live).
-The ``kea-dhcp4`` calculates that value based on
+The ``kea-dhcp4`` server calculates that value based on
 `RFC 4702, Section 5 <https://tools.ietf.org/html/rfc4702#section-5>`__,
 which suggests that the TTL value be 1/3 of the lease's lifetime, with
 a minimum value of 10 minutes.
@@ -3597,9 +3596,9 @@ following configuration is required:
 When Does the ``kea-dhcp4`` Server Generate a DDNS Request?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``kea-dhcp4`` follows the behavior prescribed for DHCP servers in `RFC
-4702 <https://tools.ietf.org/html/rfc4702>`__. It is important to keep in
-mind that ``kea-dhcp4`` makes the initial decision of when and what to
+The ``kea-dhcp4`` server follows the behavior prescribed for DHCP servers in
+`RFC 4702 <https://tools.ietf.org/html/rfc4702>`__. It is important to keep
+in mind that ``kea-dhcp4`` makes the initial decision of when and what to
 update and forwards that information to D2 in the form of NCRs. Carrying
 out the actual DNS updates and dealing with such things as conflict
 resolution are within the purview of D2 itself
@@ -3697,8 +3696,8 @@ To override client delegation, issue the following commands:
         ...
     }
 
-The ``kea-dhcp4`` always generates DDNS update requests if the client
-request only contains the Host Name option. In addition, it includes
+The ``kea-dhcp4`` server always generates DDNS update requests if the
+client request only contains the Host Name option. In addition, it includes
 an FQDN option in the response to the client with the FQDN N-S-O flags
 set to 0-1-0, respectively. The domain name portion of the FQDN option
 is the name submitted to D2 in the DDNS update request.
@@ -4047,9 +4046,9 @@ for a particular subnet. Consider the following simplified server configuration:
      }
    }
 
-The ``match-client-id`` is a boolean value which controls this behavior.
-The default value of ``true`` indicates that the server will use the
-client identifier for lease lookups and ``chaddr`` if the first lookup
+The ``match-client-id`` parameter is a boolean value which controls this
+behavior. The default value of ``true`` indicates that the server will use
+the client identifier for lease lookups and ``chaddr`` if the first lookup
 returns no results. ``false`` means that the server will only use
 the ``chaddr`` to search for the client's lease. Whether the DHCID for DNS
 updates is generated from the client identifier or ``chaddr`` is
@@ -5041,9 +5040,9 @@ For example:
         ]
     }
 
-The ``only-if-required`` parameter is needed here to force
-evaluation of the class after the lease has been allocated and thus the
-reserved class has been also assigned.
+The ``only-if-required`` parameter is needed here to force evaluation
+of the class after the lease has been allocated and thus the reserved
+class has been also assigned.
 
 .. note::
 
@@ -5794,8 +5793,8 @@ The ``reservations-lookup-first`` is a boolean parameter which controls whether
 host reservations lookup should be performed before lease lookup. This parameter
 has effect only when multi-threading is disabled. When multi-threading is
 enabled, host reservations lookup is always performed first to avoid lease
-lookup resource locking. The ``reservations-lookup-first`` defaults to ``false``
-when multi-threading is disabled.
+lookup resource locking. The ``reservations-lookup-first`` parameter defaults to
+``false`` when multi-threading is disabled.
 
 .. _host_reservations_as_basic_access_control4:
 
@@ -5951,6 +5950,7 @@ introduced:
 
 ::
 
+   {
    "Dhcp4": {
        "shared-networks": [ {
                # Name of the shared network. It may be an arbitrary string
@@ -5990,6 +5990,7 @@ introduced:
            }
        ]
    }
+   }
 
 As demonstrated in the example, it is possible to mix shared and regular
 ("plain") subnets. Each shared network must have a unique name. This is
index ab4c8d314cac69a7912238c083ba7ba54e11a961..06d97078d5c8756ff0fb1d6fd8b90a1ae25188ff 100644 (file)
@@ -211,11 +211,10 @@ address to create new connections. ``renew-timer`` and
 ``rebind-timer`` are values (also in seconds) that define T1 and T2 timers, which govern
 when the client begins the renewal and rebind procedures.
 
-The ``interfaces-config`` map specifies the
-network interfaces on which the server should listen to
-DHCP messages. The ``interfaces`` parameter specifies a list of
-network interfaces on which the server should listen. Lists are opened
-and closed with square brackets, with elements separated by commas. To
+The ``interfaces-config`` map specifies the network interfaces on which the
+server should listen to DHCP messages. The ``interfaces`` parameter specifies
+a list of network interfaces on which the server should listen. Lists are
+opened and closed with square brackets, with elements separated by commas. To
 listen on two interfaces, the ``interfaces-config`` element should look like
 this:
 
@@ -2059,10 +2058,10 @@ option space, the parameter should be left blank. Note that the ``option-def``
 configuration statement only defines the format of an option and does
 not set its value(s).
 
-The ``name``, ``code``, and ``type`` parameters are required; all
-others are optional. The ``array`` default value is ``false``. The
-``record-types`` and ``encapsulate`` default values are blank (``""``).
-The default ``space`` is ``dhcp6``.
+The ``name``, ``code``, and ``type`` parameters are required; all others
+are optional. The ``array`` parameter default value is ``false``. The
+``record-types`` and ``encapsulate`` parameters default values are blank
+(``""``). The default ``space`` is ``dhcp6``.
 
 Once the new option format is defined, its value is set in the same way
 as for a standard option. For example, the following commands set a
@@ -2111,8 +2110,8 @@ defined in the following way:
        ...
    }
 
-The ``type`` is set to ``"record"`` to indicate that the option contains
-multiple values of different types. These types are given as a
+The ``type`` parameter is set to ``"record"`` to indicate that the option
+contains multiple values of different types. These types are given as a
 comma-separated list in the ``record-types`` field and should be ones
 from those listed in :ref:`dhcp-types`.
 
@@ -2134,10 +2133,10 @@ follows:
        ...
    }
 
-The ``csv-format`` is set to ``true`` to indicate that the ``data`` field
-comprises a comma-separated list of values. The values in ``data``
-must correspond to the types set in the ``record-types`` field of the
-option definition.
+The ``csv-format`` parameter is set to ``true`` to indicate that the ``data``
+field comprises a comma-separated list of values. The values in ``data`` must
+correspond to the types set in the ``record-types`` field of the option
+definition.
 
 When ``array`` is set to ``true`` and ``type`` is set to ``"record"``, the
 last field is an array, i.e. it can contain more than one value, as in:
@@ -3173,9 +3172,9 @@ configuration is required:
 When Does the ``kea-dhcp6`` Server Generate a DDNS Request?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``kea-dhcp6`` follows the behavior prescribed for DHCP servers in `RFC
-4704 <https://tools.ietf.org/html/rfc4704>`__. It is important to keep in
-mind that ``kea-dhcp6`` makes the initial decision of when and what to
+The ``kea-dhcp6`` server follows the behavior prescribed for DHCP servers in
+`RFC 4704 <https://tools.ietf.org/html/rfc4704>`__. It is important to keep
+in mind that ``kea-dhcp6`` makes the initial decision of when and what to
 update and forwards that information to D2 in the form of NCRs. Carrying
 out the actual DNS updates and dealing with such things as conflict
 resolution are within the purview of D2 itself
@@ -3276,8 +3275,8 @@ To override client delegation, issue the following commands:
         ...
     }
 
-The ``kea-dhcp6`` always generates DDNS update requests if the client
-request only contains the Host Name option. In addition, it includes
+The ``kea-dhcp6`` server always generates DDNS update requests if the
+client request only contains the Host Name option. In addition, it includes
 an FQDN option in the response to the client with the FQDN N-S-O flags
 set to 0-1-0, respectively. The domain name portion of the FQDN option
 is the name submitted to D2 in the DDNS update request.
@@ -5183,6 +5182,7 @@ introduced:
 
 ::
 
+   {
    "Dhcp6": {
        "shared-networks": [ {
            # Name of the shared network. It may be an arbitrary string
@@ -5227,6 +5227,7 @@ introduced:
            }
        ]
    }
+   }
 
 As demonstrated in the example, it is possible to mix shared and regular
 ("plain") subnets. Each shared network must have a unique name. This is
index b51dd8b848e902c1d72aafb7fe67c60cbc22d5d9..6459414c4b367e431746faef7b1034c4f9b35e4f 100644 (file)
@@ -9,7 +9,7 @@ be used in conjunction with the available CB hook libraries implementing
 the common APIs to create, read, update, and delete (CRUD) the
 configuration information in the respective databases. For example:
 the ``mysql_cb`` hook library implements this API for MySQL while the
-``pgsql_cg`` hook library implements this API for PostgreSQL.
+``pgsql_cb`` hook library implements this API for PostgreSQL.
 To manage the configuration information in a MySQL database, both the
 ``mysql_cb`` and ``cb_cmds`` libraries must be loaded by the server used for the
 configuration management.
@@ -1097,8 +1097,8 @@ For example:
        }
    }
 
-The "dhcp4" is the top-level option space where the standard DHCPv4 options
-belong. The ``server-tags`` parameter is mandatory and must include a
+The "dhcp4" value represents the top-level option space where the standard DHCPv4
+options belong. The ``server-tags`` parameter is mandatory and must include a
 single option tag or the keyword "all". If the explicit server tag is specified,
 this command attempts to delete a global option associated with this
 server. If there is no such option associated with the given server, no option
@@ -1296,8 +1296,8 @@ network "fancy".
        }
    }
 
-The "dhcp4" is the top-level option space where the standard DHCPv4 options
-belong. The ``server-tags`` parameter cannot be specified for this command.
+The "dhcp4" value represents the top-level option space where the standard DHCPv4
+options belong. The ``server-tags`` parameter cannot be specified for this command.
 
 .. _command-remote-option4-network-set:
 
@@ -1382,8 +1382,8 @@ option. To delete a subnet level option, the
        }
    }
 
-The "dhcp6" is the top-level option space where the standard DHCPv6 options
-belong. The ``server-tags`` parameter cannot be specified for this command.
+The "dhcp6" value represents the top-level option space where the standard DHCPv6
+options belong. The ``server-tags`` parameter cannot be specified for this command.
 
 .. _command-remote-option6-pd-pool-set:
 
@@ -1475,8 +1475,8 @@ pool:
        }
    }
 
-The "dhcp4" is the top-level option space where the standard DHCPv4 options
-belong. The ``server-tags`` parameter cannot be specified for this command.
+The "dhcp4" value represents the top-level option space where the standard DHCPv4
+options belong. The ``server-tags`` parameter cannot be specified for this command.
 
 .. _command-remote-option4-pool-set:
 
@@ -1564,8 +1564,8 @@ having an identifier of 123.
        }
    }
 
-The "dhcp4" is the top-level option space where the standard DHCPv4 options
-belong. The ``server-tags`` parameter cannot be specified for this command.
+The "dhcp4" value represents the top-level option space where the standard DHCPv4
+options belong. The ``server-tags`` parameter cannot be specified for this command.
 
 .. _command-remote-option4-subnet-set:
 
index d6573f57cd9cb1653f8ddc37a06f9cf1d7f65740..0ec1013cb986648872cc219c044bdfb237db4896 100644 (file)
@@ -269,7 +269,7 @@ follows:
        }
    }
 
-The ``reservation-get`` typically returns the result 0 when a query was
+``reservation-get`` typically returns the result 0 when a query was
 conducted properly. In particular, 0 is returned when the host was not
 found. If the query was successful, the host parameters are
 returned. An example of a query that did not find the host looks as
@@ -685,7 +685,7 @@ follows:
        }
    }
 
-The ``reservation-del`` returns a result of 0 when the host deletion was
+``reservation-del`` returns a result of 0 when the host deletion was
 successful, or 1 if it failed. Descriptive text is provided in the event of
 an error. Here are some examples of possible results:
 
index ae0ae0c81fc086e9b6c75acf4020385c5c45f2e3..63d42b619566c611fcfd75bea61ffd4622324ba7 100644 (file)
@@ -166,8 +166,8 @@ subnet. For example:
        }
    }
 
-The ``lease6-add`` can also be used to add leases for IPv6 prefixes. In this
-case there are three additional parameters that must be specified:
+The ``lease6-add`` command can also be used to add leases for IPv6 prefixes.
+In this case there are three additional parameters that must be specified:
 ``subnet-id``, ``type`` (set to "IA_PD"), and prefix length. The actual
 prefix is set using the ``ip-address`` field. Note that Kea cannot guess
 ``subnet-id`` values for prefixes; they must be specified explicitly. For
@@ -840,7 +840,7 @@ This parameter defaults to ``false``. An example of its use is shown below:
    }
 
 
-The ``lease4-del`` and ``lease6-del`` return a result that indicates the outcome
+``lease4-del`` and ``lease6-del`` return a result that indicates the outcome
 of the operation. It has one of the following values: 0 (success), 1 (error),
 or 3 (empty). The empty result means that a query has been completed properly,
 but the object (a lease, in this case) has not been found.
@@ -1000,11 +1000,10 @@ An example of the ``lease6-resend-ddns`` query is:
      }
    }
 
-The ``lease4-resend-ddns`` and ``lease6-resend-ddns`` return an indication of the
-result of the operation.
-it has one of the following values: 0 (success), 1 (error), or 3 (empty). An empty
-result means that a query has been completed properly, but the object (a lease in
-this case) has not been found.
+``lease4-resend-ddns`` and ``lease6-resend-ddns`` return an indication of the
+result of the operation. It has one of the following values: 0 (success), 1 (error),
+or 3 (empty). An empty result means that a query has been completed properly, but the
+object (a lease in this case) has not been found.
 
 A successful result does not mean that DNS has been successfully updated; it
 indicates that a request to update DNS has been successfully created and
index 0b18f23f1e565de30790781b19f02bf1d3052771..1986880380b4166549ec019df365c95545dd82e7 100644 (file)
@@ -22,6 +22,9 @@ namespace dhcp {
 IdentifierBaseType::~IdentifierBaseType() {
 }
 
+constexpr size_t DUID::MIN_DUID_LEN;
+constexpr size_t DUID::MAX_DUID_LEN;
+
 DUID::DUID(const std::vector<uint8_t>& data) : IdentifierType<3, 130>(data) {
 }
 
@@ -32,9 +35,6 @@ const std::vector<uint8_t>& DUID::getDuid() const {
     return (data_);
 }
 
-constexpr size_t DUID::MIN_DUID_LEN;
-constexpr size_t DUID::MAX_DUID_LEN;
-
 DUID::DUIDType DUID::getType() const {
     if (data_.size() < 2) {
         return (DUID_UNKNOWN);
index b2ae83289046ba6037357fc4e2604c3e4ea4f813..bd09c089ccb53f16d804b84ef3477963f8daac55 100644 (file)
@@ -16,7 +16,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"<string with build details>\"",
+        "    \"text\": <string with build details>",
         "}"
     ],
     "support": [
index 8a014239a35cc3b96284e484862074e2b793ba17..64bb8fd964d84372e5f71e12033f27d51a36d4d8 100644 (file)
@@ -18,7 +18,7 @@
         "{",
         "    \"result\": 0,",
         "    \"text\": \"2 entries returned.\",",
-        "    \"arguments\": \"<list of host reservations>\"",
+        "    \"arguments\": <list of host reservations>",
         "}"
     ],
     "support": [
index 55ec80e98b194bddcfdb0b3f06cdad28bcac262b..0ea703edc3129fffae0ac9160ea22c69f393c63d 100644 (file)
@@ -10,7 +10,7 @@
         "{",
         "    \"result\": 0,",
         "    \"text\": \"123 entries returned.\",",
-        "    \"arguments\": \"<list of host reservations>\"",
+        "    \"arguments\": <list of host reservations>",
         "}"
     ],
     "support": [
index 998b54a5ff19e47e74edfce81607ad52b94dc4ab..07d8762b458f33b774c0ba96a195a76db0e9f00a 100644 (file)
         "    \"command\": \"class-add\",",
         "    \"arguments\": {",
         "        \"client-classes\": [ {",
-        "           \"name\": \"<name of the class>\",",
-        "           \"test\": \"<test expression to be evaluated on incoming packets>\",",
-        "           \"option-data\": [ \"<option values here>\" ],",
-        "           \"option-def\": [ \"<option definitions here>\" ],",
-        "           \"next-server\": \"<ipv4 address>\",",
-        "           \"server-hostname\": \"<string>\",",
-        "           \"boot-file-name\": \"<name of the boot file>\"",
+        "           \"name\": <name of the class>,",
+        "           \"test\": <test expression to be evaluated on incoming packets>,",
+        "           \"option-data\": [ <option values here> ],",
+        "           \"option-def\": [ <option definitions here> ],",
+        "           \"next-server\": <ipv4 address>,",
+        "           \"server-hostname\": <string>,",
+        "           \"boot-file-name\": <name of the boot file>",
         "        } ]",
         "    }",
         "}"
index df417af149cb867f77db837f6152a14321f6a595..38c481865956c4a125b11b8f05608a9ca35c07b5 100644 (file)
@@ -8,7 +8,7 @@
         "{",
         "    \"command\": \"class-del\",",
         "    \"arguments\": {",
-        "        \"name\": \"<name of the class>\"",
+        "        \"name\": <name of the class>",
         "    }",
         "}"
     ],
index e1cb1fe03b14e3b697094bc9b4cd726b8186157e..1d7c5b2906e4b213ade688825cf0933901b08f21 100644 (file)
@@ -8,7 +8,7 @@
         "{",
         "    \"command\": \"class-get\",",
         "    \"arguments\": {",
-        "        \"name\": \"<name of the class>\"",
+        "        \"name\": <name of the class>",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<name of the class>\",",
-        "                \"only-if-required\": \"<only if required boolean value>\",",
-        "                \"test\": \"<test expression to be evaluated on incoming packets>\",",
-        "                \"option-data\": [ \"<option values here>\" ],",
-        "                \"option-def\": [ \"<option definitions here>\" ],",
-        "                \"next-server\": \"<ipv4 address>\",",
-        "                \"server-hostname\": \"<string>\",",
-        "                \"boot-file-name\": \"<name of the boot file>\"",
+        "                \"name\": <name of the class>,",
+        "                \"only-if-required\": <only if required boolean value>,",
+        "                \"test\": <test expression to be evaluated on incoming packets>,",
+        "                \"option-data\": [ <option values here> ],",
+        "                \"option-def\": [ <option definitions here> ],",
+        "                \"next-server\": <ipv4 address>,",
+        "                \"server-hostname\": <string>,",
+        "                \"boot-file-name\": <name of the boot file>",
         "            }",
         "        ]",
         "    }",
index 8383dff8af287f26747c48a465a15190ff17fdda..17544c89b2036d70ea12c091c6fa5f0438343c76 100644 (file)
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<first class name>\"",
+        "                \"name\": <first class name>",
         "            },",
         "            {",
-        "                \"name\": \"<second class name>\"",
+        "                \"name\": <second class name>",
         "            }",
         "        ]",
         "    }",
index a5e09dcadd068484f4d1734e97a94529a6e5f46d..c3b8284f9a820ece30501a44c677e9e5305956c1 100644 (file)
         "    \"command\": \"class-update\",",
         "    \"arguments\": {",
         "        \"client-classes\": [ {",
-        "           \"name\": \"<name of the class>\",",
-        "           \"test\": \"<test expression to be evaluated on incoming packets>\",",
-        "           \"option-data\": [ \"<option values here>\" ],",
-        "           \"option-def\": [ \"<option definitions here>\" ],",
-        "           \"next-server\": \"<ipv4 address>\",",
-        "           \"server-hostname\": \"<string>\",",
-        "           \"boot-file-name\": \"<name of the boot file>\"",
+        "           \"name\": <name of the class>,",
+        "           \"test\": <test expression to be evaluated on incoming packets>,",
+        "           \"option-data\": [ <option values here> ],",
+        "           \"option-def\": [ <option definitions here> ],",
+        "           \"next-server\": <ipv4 address>,",
+        "           \"server-hostname\": <string>,",
+        "           \"boot-file-name\": <name of the boot file>",
         "        } ]",
         "    }",
         "}"
index da749d83d8c9496b0b1114875ca2d5222615a22e..3a49afbaff967ca03c4d4b0b19a4d5ace609f3d1 100644 (file)
@@ -15,9 +15,9 @@
     "name": "config-get",
     "resp-syntax": [
         "{",
-        "    \"result\": \"<integer>\",",
+        "    \"result\": <integer>,",
         "    \"arguments\": {",
-        "        \"<Dhcp4, Dhcp6, or Control-agent object>\": \"<JSON configuration here>\" ",
+        "        <Dhcp4, Dhcp6, or Control-agent object>: <JSON configuration here> ",
         "    }",
         "}"
     ],
index c0a0f43759396e6504061c72a3a4bb2449201923..fef0e1ad93cefc79057800e078a14a5ea8ff9d11 100644 (file)
@@ -5,7 +5,7 @@
         "This command instructs the server to check whether the new configuration supplied in the command's arguments can be loaded."
     ],
     "cmd-comment": [
-        "In the example below, \"<server>\" is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\"."
+        "In the example below, <server> is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\"."
     ],
     "cmd-syntax": [
         "{",
index 535fd229d1b44614165782a735e7ed13b2af3af2..f7f05399581da76a91cbe8c42e7d649ded803664 100644 (file)
         "    \"result\": 0,",
         "    \"text\": \"HA peer status returned.\",",
         "    \"arguments\": {",
-        "        \"state\": \"<server state>\",",
-        "        \"date-time\": \"<server notion of time>\",",
-        "        \"scopes\": [ \"<first scope>, <second scope>\" ],",
-        "        \"unsent-update-count\": \"<total number of lease allocations in partner-down state>\"",
+        "        \"state\": <server state>,",
+        "        \"date-time\": <server notion of time>,",
+        "        \"scopes\": [ <first scope>, <second scope>, ... ],",
+        "        \"unsent-update-count\": <total number of lease allocations in partner-down state>",
         "    }",
         "}"
     ],
index c8ab4ff823874f2899e54acd557b92317bca2973..d187107f15b67895f3c1926053a07e76f1f6c8bc 100644 (file)
@@ -19,7 +19,7 @@
         "{",
         "    \"command\": \"ha-maintenance-notify\",",
         "    \"arguments\": {",
-        "        \"cancel\": \"<boolean>\"",
+        "        \"cancel\": <boolean>",
         "    }",
         "}"
     ],
index d988933de5e7eb2cb377f5cbbff11ee3cf2a5db5..99240aa6956c59f739999a0ac659f2e30688b3a1 100644 (file)
@@ -10,7 +10,7 @@
     "cmd-syntax": [
         "{",
         "    \"command\": \"ha-scopes\",",
-        "    \"service\": [ \"<service, typically 'dhcp4' or 'dhcp6'>\" ],",
+        "    \"service\": [ <service, typically 'dhcp4' or 'dhcp6'> ],",
         "    \"arguments\": {",
         "        \"scopes\": [ \"HA_server1\", \"HA_server2\" ]",
         "    }",
index d15d7f2448004c2ba5ff606aad7185343f079964..b4e427719a89b02a66d0b76281377c1f1daf4657 100644 (file)
@@ -7,10 +7,10 @@
     "cmd-syntax": [
         "{",
         "    \"command\": \"ha-sync\",",
-        "    \"service\": [ \"<service affected: 'dhcp4' or 'dhcp6'>\" ],",
+        "    \"service\": [ <service affected: 'dhcp4' or 'dhcp6'> ],",
         "    \"arguments\": {",
-        "        \"server-name\": \"<name of the partner server>\",",
-        "        \"max-period\": \"<integer, in seconds>\"",
+        "        \"server-name\": <name of the partner server>,",
+        "        \"max-period\": <integer, in seconds>",
         "    }",
         "}"
     ],
index f9549686893cf48f29e3bd5f643ad4c0d9e7703b..117995b7e07ef0d87b49f9b3571d16aed6ba64e5 100644 (file)
@@ -13,7 +13,7 @@
         "{",
         "    \"command\": \"lease4-get-all\",",
         "    \"arguments\": {",
-        "        \"subnets\": [ 1, 2, 3 ]",
+        "        \"subnets\": [ 1, 2, 3, ... ]",
         "    }",
         "}"
     ],
index 12d048fcffd376fb7ad4d260d9c508bb170e1101..741215025da7668acaa021beafc70b32a2acffd2 100644 (file)
@@ -11,8 +11,8 @@
         "{",
         "    \"command\": \"lease4-get-page\",",
         "    \"arguments\": {",
-        "        \"limit\": \"<integer>\",",
-        "        \"from\": \"<IPv4 address or 'start'>\"",
+        "        \"limit\": <integer>,",
+        "        \"from\": <IPv4 address or 'start'>",
         "    }",
         "}"
     ],
index e417b80e79aabec7b97d6ea23ebeac3639f8ba94..db86b655d0f5e186173ff9d48db72f666df5947b 100644 (file)
         "            {",
         "                \"ip-address\": \"2001:db8:abcd::\",",
         "                \"type\": \"IA_PD\",",
-        "                \"<other\": \"properties>\"",
+        "                ...",
         "            },",
         "            {",
         "                \"ip-address\": \"2001:db8:abcd::234\",",
         "                \"type\": \"IA_NA\",",
-        "                \"<other\": \"properties>\"",
+        "                ...",
         "            }",
         "        ],",
         "        \"leases\": [",
         "                \"subnet-id\": 66,",
         "                \"ip-address\": \"2001:db8:cafe::\",",
         "                \"type\": \"IA_PD\",",
-        "                \"<other\": \"properties>\"",
+        "                ...",
         "            },",
         "            {",
         "                \"subnet-id\": 66,",
         "                \"ip-address\": \"2001:db8:abcd::333\",",
         "                \"type\": \"IA_NA\",",
-        "                \"<other\": \"properties>\"",
+        "                ...",
         "            }",
         "        ]",
         "    }",
         "            {",
         "                \"ip-address\": \"2001:db8:abcd::\",",
         "                \"type\": \"IA_PD\",",
-        "                \"result\": \"<control result>\",",
-        "                \"error-message\": \"<error message>\"",
+        "                \"result\": <control result>,",
+        "                \"error-message\": <error message>",
         "            }",
         "        ],",
         "        \"failed-leases\": [",
         "            {",
         "                \"ip-address\": \"2001:db8:cafe::\",",
         "                \"type\": \"IA_PD\",",
-        "                \"result\": \"<control result>\",",
-        "                \"error-message\": \"<error message>\"",
+        "                \"result\": <control result>,",
+        "                \"error-message\": <error message>",
         "            }",
         "        ]",
         "    }",
index 6f6860cec69cc8ad0af63b58ffad1b086da23083..dc9606bf121371bdc20030e124938875aaf3ab01 100644 (file)
@@ -11,8 +11,8 @@
         "{",
         "    \"command\": \"lease6-get-page\",",
         "    \"arguments\": {",
-        "        \"limit\": \"<integer>\",",
-        "        \"from\": \"<IPv6 address or 'start'>\"",
+        "        \"limit\": <integer>,",
+        "        \"from\": <IPv6 address or 'start'>",
         "    }",
         "}"
     ],
index 3d1b42f231fb7c90ee9e42cda02ce10cde4100f4..84c1da9f4f97dc5a570a4bc7383119ed0934f48e 100644 (file)
         "                {",
         "                    \"subnet\": \"192.0.2.0/24\",",
         "                    \"id\": 5,",
-        "                    \"<other\": \"properties>\"",
+        "                    <many other subnet specific details here>",
         "                },",
         "                {",
         "                    \"subnet\": \"192.0.3.0/31\",",
         "                    \"id\": 6,",
-        "                    \"<other\": \"properties>\"",
+        "                    <many other subnet specific details here>",
         "                }",
         "            ],",
         "            \"valid-lifetime\": 120",
index f648d8353aa6a8bb2855ed2891bc44a560b314fb..f9196186eb87f92c279f968affc2bf238526558d 100644 (file)
         "                {",
         "                    \"subnet\": \"2003:db8:1::/64\",",
         "                    \"id\": 5,",
-        "                    \"<other\": \"properties>\"",
+        "                    <many other subnet specific details here>",
         "                },",
         "                {",
         "                    \"subnet\": \"2003:db8:2::/71\",",
         "                    \"id\": 6,",
-        "                    \"<other\": \"properties>\"",
+        "                    <many other subnet specific details here>",
         "                }",
         "            ],",
         "            \"valid-lifetime\": 120",
index a9a226653057856453d7a2b13f082aff940bfe5a..af73605a9a0b20b41d4778b7bacaeb9df2314859 100644 (file)
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<client class name>\"",
+        "                \"name\": <client class name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 95cce36fb2e79dbf351e2195e76aea358f0d298b..639fc369cfb4320788ce6c4d6d8f03a5eb6ccba9 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-class4-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"<first\": \"client class specification>\",",
+        "                <first client class specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"client class specification>\",",
+        "                <second client class specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, ... ]",
         "                }",
         "            }",
         "        ],",
index 25d959d256a92aa1c6f2b1c7574e351cae4d2418..5dfdcb568c43fc3f543355e59c51c7cfe168f3ea 100644 (file)
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<client class name>\"",
+        "                \"name\": <client class name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<client class name>\",",
+        "                \"name\": <client class name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                },",
-        "                \"<the\": \"rest of the client class information>\"",
+        "                <the rest of the client class information>",
         "            }",
         "        ],",
         "        \"count\": 1",
index 7c515ff308ca007aaec2e0818bf1af145eb97ab4..014071d26aa12bc9d27d1d1a71570a867a393389 100644 (file)
         "    \"arguments\": {",
         "        \"client-class\": [",
         "            {",
-        "                \"<client\": \"class specification>\",",
-        "                \"follow-class-name\": \"<existing class name>\"",
+        "                <client class specification>,",
+        "                \"follow-class-name\": <existing class name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
@@ -33,7 +33,7 @@
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<set client class name>\"",
+        "                \"name\": <set client class name>",
         "            }",
         "        ]",
         "    }",
index 4b79bf21f8803c92022e52d294e473fa8cc23a2f..f74578da94ed8ba280f8fd2fda5a62917e0328a3 100644 (file)
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<client class name>\"",
+        "                \"name\": <client class name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 90185ee0af5df8c40f152153e94fcc52989a01b2..216611c77b1d2a3cead551388306bd44cf105cb0 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-class6-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"<first\": \"client class specification>\",",
+        "                <first client class specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"client class specification>\",",
+        "                <second client class specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, ... ]",
         "                }",
         "            }",
         "        ],",
index b8d4fe54c8b68c2fba51690ead11ce36df4d1599..bf90fbeb5be729a5cc7ffd9c37c901c61c59eed3 100644 (file)
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<client class name>\"",
+        "                \"name\": <client class name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<client class name>\",",
+        "                \"name\": <client class name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                },",
-        "                \"<the\": \"rest of the client class information>\"",
+        "                <the rest of the client class information>",
         "            }",
         "        ],",
         "        \"count\": 1",
index b560972be29c638e6839228c4365bb65bc0adadb..1c2fed805919d2ed2f24e0f1f1e43a5249e52a4e 100644 (file)
         "    \"arguments\": {",
         "        \"client-class\": [",
         "            {",
-        "                \"<client\": \"class specification>\",",
-        "                \"follow-class-name\": \"<existing class name>\"",
+        "                <client class specification>,",
+        "                \"follow-class-name\": <existing class name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
@@ -33,7 +33,7 @@
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
-        "                \"name\": \"<set client class name>\"",
+        "                \"name\": <set client class name>",
         "            }",
         "        ]",
         "    }",
index ca0e61f0384b56fb31c5ddebe0f7ef3e752c6484..3c1564a08dbf69df5759fba8045776d34ce8c6b0 100644 (file)
         "{",
         "    \"command\": \"remote-global-parameter4-del\",",
         "    \"arguments\": {",
-        "        \"parameters\": [ \"<parameter name as string>\" ],",
+        "        \"parameters\": [ <parameter name as string> ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index 666dd79425210cebbcc6e808b059f47decc3ea80..1eb42970016aabeeb034f068769666934a28b1f4 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-global-parameter4-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"parameters\": [",
         "            {",
-        "                \"<first\": \"parameter name>: <first parameter value>\",",
+        "                <first parameter name>: <first parameter value>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"parameter name>: <second parameter value>\",",
+        "                <second parameter name>: <second parameter value>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index f6848fa96efa5d3b67a7ab3d5dcf62ad7b192bb8..1d7f09bbd65d57a790ccddb5f0e217435cb4869b 100644 (file)
         "{",
         "    \"command\": \"remote-global-parameter4-get\",",
         "    \"arguments\": {",
-        "        \"parameters\": [ \"<parameter name as string>\" ],",
+        "        \"parameters\": [ <parameter name as string> ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -30,9 +30,9 @@
         "    \"text\": \"DHCPv4 global parameter found.\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
-        "            \"<parameter\" :\" name>: <parameter value>\",",
+        "            <parameter name>: <parameter value>,",
         "            \"metadata\": {",
-        "                \"server-tags\": [ \"<server tag>\" ]",
+        "                \"server-tags\": [ <server tag> ]",
         "            }",
         "        },",
         "        \"count\": 1",
index 73bce1e2915ac500df19f32f15fff86091a54a87..d09af68713d7e31dbc73be854db25adfd653e0c1 100644 (file)
         "    \"command\": \"remote-global-parameter4-set\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
-        "            \"<first\": \"parameter name>: <first parameter value>\",",
-        "            \"<second\": \"parameter name>: <second parameter value>\"",
+        "            <first parameter name>: <first parameter value>,",
+        "            <second parameter name>: <second parameter value>",
         "        },",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -30,8 +30,8 @@
         "    \"text\": \"DHCPv4 global parameter(s) successfully set.\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
-        "            \"<first\": \"parameter name>: <first parameter value>\",",
-        "            \"<second\": \"parameter name>: <second parameter value>\"",
+        "            <first parameter name>: <first parameter value>,",
+        "            <second parameter name>: <second parameter value>",
         "        },",
         "        \"count\": 2",
         "    }",
index 4fbabf92b8406cdfddcd50f8e6b1607813b22d87..545921ef9926264d7783eab43a34920adc6155ff 100644 (file)
         "{",
         "    \"command\": \"remote-global-parameter6-del\",",
         "    \"arguments\": {",
-        "        \"parameters\": [ \"<parameter name as string>\" ],",
+        "        \"parameters\": [ <parameter name as string> ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index f8072e0ac782c9e4ed3c13e00bba50b25e57d725..12d8541330ea10d50f8e2a76902d812aacbc7f7f 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-global-parameter6-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"parameters\": [",
         "            {",
-        "                \"<first\": \"parameter name>: <first parameter value>\",",
+        "                <first parameter name>: <first parameter value>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"parameter name>: <second parameter value>\",",
+        "                <second parameter name>: <second parameter value>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index 293a1e96d80018edf0a35273ffccc404ec9a7be5..4c3975eabfde70a067560c42c7a652ea77acfab5 100644 (file)
         "{",
         "    \"command\": \"remote-global-parameter6-get\",",
         "    \"arguments\": {",
-        "        \"parameters\": [ \"<parameter name as string>\" ],",
+        "        \"parameters\": [ <parameter name as string> ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -30,9 +30,9 @@
         "    \"text\": \"DHCPv6 global parameter found.\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
-        "            \"<parameter\": \"name>: <parameter value>\",",
+        "            <parameter name>: <parameter value>,",
         "            \"metadata\": {",
-        "                \"server-tags\": [ \"<server tag>\" ]",
+        "                \"server-tags\": [ <server tag> ]",
         "            }",
         "        },",
         "        \"count\": 1",
index 270079338a2011490aae4e1243c2568ddde4ff05..2f1fc6770a0937bebd8985ff1abcf57d6dd14c65 100644 (file)
         "    \"command\": \"remote-global-parameter6-set\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
-        "            \"<first\": \"parameter name>: <first parameter value>\",",
-        "            \"<second\": \"parameter name>: <second parameter value>\"",
+        "            <first parameter name>: <first parameter value>,",
+        "            <second parameter name>: <second parameter value>",
         "        },",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -30,8 +30,8 @@
         "    \"text\": \"DHCPv6 global parameter(s) successfully set.\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
-        "            \"<first\": \"parameter name>: <first parameter value>\",",
-        "            \"<second\": \"parameter name>: <second parameter value>\"",
+        "            <first parameter name>: <first parameter value>,",
+        "            <second parameter name>: <second parameter value>",
         "        },",
         "        \"count\": 2",
         "    }",
index d0d0f7d7d232aa25834d04d145b448f3c53f652a..2c3b5c8c915c8bf191984306b84538ff12614c0e 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-action\": \"<'keep' | 'delete'>\",",
+        "        \"subnets-action\": <'keep' | 'delete'>,",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 8d5cd6f2e13ffe64a97c25d2015c2413e8cb7b79..5ad6b488e828f3b830755608e4a5730a12e22508 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-include\": \"<'full' | 'no'>\",",
+        "        \"subnets-include\": <'full' | 'no'>,",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\",",
+        "                \"name\": <shared network name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                },",
-        "                \"<the\": \"rest of the shared network information, potentially including subnets>\"",
+        "                <the rest of the shared network information, potentially including subnets>",
         "            }",
         "        ],",
         "        \"count\": 1",
index bcf183ff51c2a71187ca82538274c327359e6682..db10c684d8cf3d2dc372301257c5fe445dc7e4e7 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-network4-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<first shared network name>\",",
+        "                \"name\": <first shared network name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                }",
         "            },",
         "            {",
-        "                \"name\": \"<second shared network name>\",",
+        "                \"name\": <second shared network name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, ... ]",
         "                }",
         "            }",
         "        ],",
index 0ba7d9d0fba42ef3ad2361e106442bd5ae8786fb..5f2969d9859be31b39ae254d5267e1e1d5b05899 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"<shared\": \"network specification excluding subnets list>\"",
+        "                <shared network specification excluding subnets list>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
index 8a05909f93c123b7093f2703fcb08b3456773695..2d0cf1759896a21a495cc1424be74fb49b9e4ebc 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-action\": \"<'keep' | 'delete'>\",",
+        "        \"subnets-action\": <'keep' | 'delete'>,",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 0840b1b92fb73b06781563b631f6a641cab5cc13..2ba0274f3eb3d32c84bbdd400d82bec2a402a63f 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-include\": \"<'full' | 'no'>\",",
+        "        \"subnets-include\": <'full' | 'no'>,",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\",",
+        "                \"name\": <shared network name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                },",
-        "                \"<the\": \"rest of the shared network information, potentially including subnets>\"",
+        "                <the rest of the shared network information, potentially including subnets>",
         "            }",
         "        ],",
         "        \"count\": 1",
index e1e8d8055654fe9507f053bc8a8e278a74eb14a4..107ba80ebde21875168da58588c4b478b9754e94 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-network6-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<first shared network name>\",",
+        "                \"name\": <first shared network name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                }",
         "            },",
         "            {",
-        "                \"name\": \"<second shared network name>\",",
+        "                \"name\": <second shared network name>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, ... ]",
         "                }",
         "            }",
         "        ],",
index 217cdb13b7648f9212f88f83d46ff6c8837f4996..a540124be8048a9b53211d88b3c096f0c3d5bcb1 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"<shared\": \"network specification excluding subnets list>\"",
+        "                <shared network specification excluding subnets list>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
index 83b64ba50b6474744a2378f0da4c002a48ab7f14..9c8efca6b083ff2a89d1b9adddf70b01bcc2e6d4 100644 (file)
         "    \"command\": \"remote-option-def4-del\",",
         "    \"arguments\": {",
         "        \"option-defs\": [ {",
-        "            \"code\": \"<option code>\",",
-        "            \"space\": \"<option space>\"",
+        "            \"code\": <option code>,",
+        "            \"space\": <option space>",
         "        } ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index b13cb23b9d0d22fca57d82d14beb4ee1707a29cc..df6752ddcd2feb788ab2e42539724829ca38897f 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-option-def4-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"<first\": \"option definition>\",",
+        "                <first option definition>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"option definition>\",",
+        "                <second option definition>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index 2441eb5dba6afb358a2543d079f041974b73098c..c48fda4db16add1c9b575e03654cbaf32b96794a 100644 (file)
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -36,9 +36,9 @@
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"<option\": \"definition>\",",
+        "                <option definition>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index f28f14533137e2a8e96a22bb9d9289b333d57dda..78a27e8630351c08dce2079deae43f2755ecfea7 100644 (file)
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"<option\": \"definition specification>\"",
+        "                <option definition specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index b6fac511136478d3b4760587b099d013115d04a7..9121c6eca6e233979f3f53ad62add87274a99450 100644 (file)
         "    \"command\": \"remote-option-def6-del\",",
         "    \"arguments\": {",
         "        \"option-defs\": [ {",
-        "            \"code\": \"<option code>\",",
-        "            \"space\": \"<option space>\"",
+        "            \"code\": <option code>,",
+        "            \"space\": <option space>",
         "        } ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index 9f5304842ba91e67328c1e8abbcea8bbb5014c03..9d6435802af3a6f19e31f8912298f7dca11811d2 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-option-def6-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"<first\": \"option definition>\",",
+        "                <first option definition>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"option definition>\",",
+        "                <second option definition>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index d90a8783c26a6a3396b26d371113f8341bcc47c3..f7c58956df159873910aadec2c717152e0fa3d8b 100644 (file)
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -36,9 +36,9 @@
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"<option\": \"definition>\",",
+        "                <option definition>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index 178fb884cb996494463d8a907900eb1cbbb50618..1a32e821a999de28a7b5e992056532d99c9e2377 100644 (file)
         "    \"arguments\": {",
         "        \"option-defs\": [",
         "            {",
-        "                \"<option\": \"definition specification>\"",
+        "                <option definition specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index a3d2c26b19ed948a3b905a3bdeea4509f47cbd42..15b88dbdc1f96bfc94e748b945892365b634db1f 100644 (file)
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index 49d296f4ae1f08780e9255d3adad190b146a8058..d64ff312dc60b48a1889140611daabacd21767b2 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-option4-global-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"<first\": \"option specification>\",",
+        "                <first option specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"option specification>\",",
+        "                <second option specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index 4f38e74d05d78b19ce8d6397e8c2ef68c0f0b942..f6a11bfb0f72b467805bf279c841a6a05effd93f 100644 (file)
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -36,9 +36,9 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"<option\": \"information>\",",
+        "                <option information>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ]",
index 10b099d0cc5a79510a985be3b877a983717d08ba..32c1611cb5e15825a1e27b280e09f89b7dde8587 100644 (file)
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"<global\": \"option specification>\"",
+        "                <global option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -32,8 +32,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index 6dbf125e47aa4b3386ced647e6c7044d4d59e55c..6ba9f99f0264e97c9a3d4308bb0c79f543187220 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 5bd2c424930577233b477e076fb9a2135f8517f7..ad9cc06cfaf09dc7be55fbe2113a5524e7ea36ad 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"<shared\": \"network option specification>\"",
+        "                <shared network option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -36,8 +36,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index b5b97b2ab45909bf989c49c792f6ea77502dfa99..b54ec2bf77eafc0e51af9b9c7e8a960058b1ba5f 100644 (file)
         "    \"arguments\": {",
         "        \"pools\": [",
         "            {",
-        "                \"pool\": \"<pool range or prefix>\"",
+        "                \"pool\": <pool range or prefix>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index c2d18953928bad7bd9812bd3dabd889ebfa8bb7a..6567141bdd605acf4f022dafca1a1b0b4d071048 100644 (file)
         "    \"arguments\": {",
         "        \"pools\": [",
         "            {",
-        "                \"pool\": \"<pool range or prefix>\"",
+        "                \"pool\": <pool range or prefix>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"<address\": \"pool option specification>\"",
+        "                <address pool option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -36,8 +36,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index 98545dbb30165d3aefccfa940ba3bcef2a7e506a..c43fff853e3d7d2dc2f6f977bb5df923f0ee3530 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\"",
+        "                \"id\": <subnet identifier>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 100429132b52b57e1498f404efc681e1dca77491..e332f7208b4e2529c50e25cf33cbadf740ac2c98 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\"",
+        "                \"id\": <subnet identifier>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"<subnet\": \"option specification>\"",
+        "                <subnet option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -36,8 +36,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index 258cfed03a07ef1e8805af288d306e87dcf0a89a..e5c3a354fe1f0f24c68afdba2a0a82c78cecc760 100644 (file)
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
index 9cccb3a78e15cb6311c9c29830cf76c74c1af52f..616354db55c886a4fea3bf6c07313f7a6f74a6ac 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-option6-global-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"<first\": \"option specification>\",",
+        "                <first option specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            },",
         "            {",
-        "                \"<second\": \"option specification>\",",
+        "                <second option specification>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ],",
index 0b76884ecc0bfaf8253125e0e31fd77fc6ff41a1..487c3de4ecf564914b53a01dd95618b4021bcb5d 100644 (file)
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -36,9 +36,9 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"<option\": \"information>\",",
+        "                <option information>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<server tag>\" ]",
+        "                    \"server-tags\": [ <server tag> ]",
         "                }",
         "            }",
         "        ]",
index e0cedb52ce1f1d2b3cec0c59586680783a87bf85..27274038b643bcd8f42db3f3f8b45614ba5f44a8 100644 (file)
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"<global\": \"option specification>\"",
+        "                <global option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<single server tag as string>\" ]",
+        "        \"server-tags\": [ <single server tag as string> ]",
         "    }",
         "}"
     ],
@@ -32,8 +32,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index fa1301542f49daa6d6b54a6ac14707f0a5c40adf..6a819290659cb25ff66e950c295ce1d463d2cdeb 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 11a27ef536a09d20dc212906f5a574a862a6d884..ab989b3b41cc6f1ae0214b6b7b01451512568bfe 100644 (file)
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
-        "                \"name\": \"<shared network name>\"",
+        "                \"name\": <shared network name>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"<shared\": \"network option specification>\"",
+        "                <shared network option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -36,8 +36,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index 83a3624a584531292bfa7f55e903e74f14486aeb..f0d2be1441b34a62b4bb62e32573a78efa1177fc 100644 (file)
         "    \"arguments\": {",
         "        \"pd-pools\": [",
         "            {",
-        "                \"prefix\": \"<pool prefix (address part)>\",",
-        "                \"prefix-len\": \"<pool prefix (length part)>\"",
+        "                \"prefix\": <pool prefix (address part)>,",
+        "                \"prefix-len\": <pool prefix (length part)>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 9afa088a9e480d98d2f93b67570820aea055bbe6..17d752e5182c78bd33ca36ca411907be8e249fda 100644 (file)
         "    \"arguments\": {",
         "        \"pd-pools\": [",
         "            {",
-        "                \"prefix\": \"<pool prefix (address part)>\",",
-        "                \"prefix-len\": \"<pool prefix (length part)>\"",
+        "                \"prefix\": <pool prefix (address part)>,",
+        "                \"prefix-len\": <pool prefix (length part)>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"<prefix\": \"delegation pool option specification>\"",
+        "                <prefix delegation pool option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -37,8 +37,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index 01688b4ccc8c4d4525038e688c5ed6d44b40700f..1fafd833c90e37449537e0a7e32d0070cad62639 100644 (file)
         "    \"arguments\": {",
         "        \"pools\": [",
         "            {",
-        "                \"pool\": \"<pool range or prefix>\"",
+        "                \"pool\": <pool range or prefix>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index dc3d17c4cd793486fc2ebb363a25f4f986aca775..ae45e3e49c633f69947067e2d68613f932294b36 100644 (file)
         "    \"arguments\": {",
         "        \"pools\": [",
         "            {",
-        "                \"pool\": \"<pool range or prefix>\"",
+        "                \"pool\": <pool range or prefix>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"<address\": \"pool option specification>\"",
+        "                <address pool option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -36,8 +36,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index fee7443a5c9ca09019b1bcb569d8ec6802220a7d..ff24ed3482a79436d18b1ca556760c1afd92cbfa 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\"",
+        "                \"id\": <subnet identifier>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 3ee3996077fae387564ec5cf8203c8b9c2bbcaf4..d0097d69e5e6cb7d3d0753eaaa892756cfbf6a42 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\"",
+        "                \"id\": <subnet identifier>",
         "            }",
         "        ],",
         "        \"options\": [",
         "            {",
-        "                \"<subnet\": \"option specification>\"",
+        "                <subnet option specification>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -36,8 +36,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": \"<option code>\",",
-        "                \"space\": \"<option space>\"",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>",
         "            }",
         "        ]",
         "    }",
index 22494fee9b01295eb9a4fd84ccd72327611cabe3..4f7718c90c10462e3bad103810dcb88cb100fbda 100644 (file)
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server name>\"",
+        "                \"server-tag\": <server name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 42fa66ac7f7646b6a58c63ef499d4151f76c96b0..5555752e40520f2f7fc715bd8010848d57cdd29e 100644 (file)
@@ -12,7 +12,7 @@
         "    \"command\": \"remote-server4-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<first server tag>\",",
-        "                \"description\": \"<first server description>\"",
+        "                \"server-tag\": <first server tag>,",
+        "                \"description\": <first server description>",
         "            },",
         "            {",
-        "                \"server-tag\": \"<second server tag>\",",
-        "                \"description\": \"<second server description>\"",
+        "                \"server-tag\": <second server tag>,",
+        "                \"description\": <second server description>",
         "            }",
         "        ],",
         "        \"count\": 2",
index 490e476ac63a5907c9c327cf8dadcc094ee21454..c64860636ffbb4a7ac7427407e27f199ef615fe2 100644 (file)
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\"",
+        "                \"server-tag\": <server tag>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -34,8 +34,8 @@
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\",",
-        "                \"description\": \"<server description>\"",
+        "                \"server-tag\": <server tag>,",
+        "                \"description\": <server description>",
         "            }",
         "        ],",
         "        \"count\": 1",
index 5f6de463569096f713187e21a74eed4fdfc6d03a..b63e38930a3a97e69488b8626990754de3822680 100644 (file)
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\",",
-        "                \"description\": \"<server description>\"",
+        "                \"server-tag\": <server tag>,",
+        "                \"description\": <server description>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -32,8 +32,8 @@
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\",",
-        "                \"description\": \"<server description>\"",
+        "                \"server-tag\": <server tag>,",
+        "                \"description\": <server description>",
         "            }",
         "        ]",
         "    }",
index 9647cc0e48b2def47acc98056599fe7348d40032..5ca04c2b433ed37c060f93771beea8f19b1f4205 100644 (file)
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server name>\"",
+        "                \"server-tag\": <server name>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index ca75c195159b15215805d41ebc8affe97fc25a1a..ab12139156f104fbbe8833383d16212b1d4168c5 100644 (file)
@@ -12,7 +12,7 @@
         "    \"command\": \"remote-server6-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<first server tag>\",",
-        "                \"description\": \"<first server description>\"",
+        "                \"server-tag\": <first server tag>,",
+        "                \"description\": <first server description>",
         "            },",
         "            {",
-        "                \"server-tag\": \"<second server tag>\",",
-        "                \"description\": \"<second server description>\"",
+        "                \"server-tag\": <second server tag>,",
+        "                \"description\": <second server description>",
         "            }",
         "        ],",
         "        \"count\": 2",
index 3a08aba3967e35adedca7904e8dffaa391619320..1acbfd4fd5fdecc4b29649ab929fd50dd92caa75 100644 (file)
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\"",
+        "                \"server-tag\": <server tag>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -34,8 +34,8 @@
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\",",
-        "                \"description\": \"<server description>\"",
+        "                \"server-tag\": <server tag>,",
+        "                \"description\": <server description>",
         "            }",
         "        ],",
         "        \"count\": 1",
index 5586a57946f6fac66ee4c660af1f18bf153154ad..211a4dc9184e14a12c1fe20fe829c84cd974cdd7 100644 (file)
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\",",
-        "                \"description\": \"<server description>\"",
+        "                \"server-tag\": <server tag>,",
+        "                \"description\": <server description>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
@@ -32,8 +32,8 @@
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
-        "                \"server-tag\": \"<server tag>\",",
-        "                \"description\": \"<server description>\"",
+        "                \"server-tag\": <server tag>,",
+        "                \"description\": <server description>",
         "            }",
         "        ]",
         "    }",
index a708640f5e4e0359b84467ff3cff06b093a66fb8..4ccf7f8662ab7e9aa90a132a4a79f64c6de0b4dd 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\"",
+        "                \"id\": <subnet identifier>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index fc27e57680eb3d8952055eb4957de633f8c18c7b..7d7b1a384c3bbdac42676b4f4a84f04041dab803 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"subnet\": \"<subnet prefix>\"",
+        "                \"subnet\": <subnet prefix>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index c8c841165ade91481af1c123a37de00bac3f68d3..e23bbe15e11117d15768f7191e77072811aceb52 100644 (file)
         "    \"command\": \"remote-subnet4-get-by-id\",",
         "    \"arguments\": {",
         "        \"subnets\": [ {",
-        "            \"id\": \"<subnet identifier>\"",
+        "            \"id\": <subnet identifier>",
         "        } ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"text\": \"IPv4 subnet found.\",",
         "    \"arguments\": {",
         "        \"subnets\": [ {",
-        "            \"id\": \"<subnet identifier>\",",
-        "            \"subnet\": \"<subnet prefix>\",",
-        "            \"shared-network-name\": \"<shared network name or null>\",",
+        "            \"id\": <subnet identifier>,",
+        "            \"subnet\": <subnet prefix>,",
+        "            \"shared-network-name\": <shared network name or null>,",
         "            \"metadata\": {",
-        "                \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "            },",
-        "            \"<the\": \"rest of the subnet specification here>\"",
+        "            <the rest of the subnet specification here>",
         "        } ],",
         "        \"count\": 1",
         "    }",
index c8b9e12cae61507cc5c03ddee228e44185454401..d973412344ad8a8c3fc80581b0f0f8f4690e266d 100644 (file)
         "    \"command\": \"remote-subnet4-get-by-prefix\",",
         "    \"arguments\": {",
         "        \"subnets\": [ {",
-        "            \"subnet\": \"<subnet prefix>\"",
+        "            \"subnet\": <subnet prefix>",
         "        } ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\",",
-        "                \"subnet\": \"<subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
+        "                \"id\": <subnet identifier>,",
+        "                \"subnet\": <subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                },",
-        "                \"<the\": \"rest of the subnet specification here>\"",
+        "                <the rest of the subnet specification here>",
         "            }",
         "        ],",
         "        \"count\": 1",
index 154501b5b1d0b6a40b2d43bee057468d035f4301..d4f6902169ceb28170cb560d6bb47f529519358c 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-subnet4-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<first subnet identifier>\",",
-        "                \"subnet\": \"<first subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
+        "                \"id\": <first subnet identifier>,",
+        "                \"subnet\": <first subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                }",
         "            },",
         "            {",
-        "                \"id\": \"<second subnet identifier>\",",
-        "                \"subnet\": \"<second subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
+        "                \"id\": <second subnet identifier>,",
+        "                \"subnet\": <second subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, ... ]",
         "                }",
         "            }",
         "        ],",
index 99b693b473af9e7b2eab160892fc2bf347f470aa..772e13e85c8d0d9c2ac850c90f5b03c0ff975293 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\",",
-        "                \"subnet\": \"<subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
-        "                \"<the\": \"rest of the subnet specification here>\"",
+        "                \"id\": <subnet identifier>,",
+        "                \"subnet\": <subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
+        "                <the rest of the subnet specification here>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
@@ -33,8 +33,8 @@
         "    \"result\": 0,",
         "    \"text\": \"IPv4 subnet successfully set.\",",
         "    \"arguments\": {",
-        "        \"id\": \"<subnet identifier>\",",
-        "        \"subnet\": \"<subnet prefix>\"",
+        "        \"id\": <subnet identifier>,",
+        "        \"subnet\": <subnet prefix>",
         "    }",
         "}"
     ],
index 465b54376e41c574629f72bae1b73a615784a8a3..291cdfd98597bb2c7771b62c61961f52ff38a3b1 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\"",
+        "                \"id\": <subnet identifier>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index e11ab9686e577f62186896bc95f66142d16f57f1..5dff846baa573505d803b44331fa051f0e59cb8b 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"subnet\": \"<subnet prefix>\"",
+        "                \"subnet\": <subnet prefix>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
index 15aceeb69ca71b1c60cdb85eabb6113a0c4612c6..b1dd25f0882d35153097643cff5056fbbdfa42d3 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\"",
+        "                \"id\": <subnet identifier>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\",",
-        "                \"subnet\": \"<subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
+        "                \"id\": <subnet identifier>,",
+        "                \"subnet\": <subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                },",
-        "                \"<the\": \"rest of the subnet specification here>\"",
+        "                <the rest of the subnet specification here>",
         "            }",
         "        ],",
         "        \"count\": 1",
index f7ec7654c88e84d9c13ec8bedf2fdade4034d18b..249f9bb9481ffc961e3944e20eaec4c79291d9ec 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"subnet\": \"<subnet prefix>\"",
+        "                \"subnet\": <subnet prefix>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        }",
         "    }",
         "}"
         "    \"text\": \"IPv6 subnet found.\",",
         "    \"arguments\": {",
         "        \"subnets\": [ {",
-        "            \"id\": \"<subnet identifier>\",",
-        "            \"subnet\": \"<subnet prefix>\",",
-        "            \"shared-network-name\": \"<shared network name or null>\",",
+        "            \"id\": <subnet identifier>,",
+        "            \"subnet\": <subnet prefix>,",
+        "            \"shared-network-name\": <shared network name or null>,",
         "            \"metadata\": {",
-        "                \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "            },",
-        "            \"<the\": \"rest of the subnet specification here>\"",
+        "            <the rest of the subnet specification here>",
         "        } ],",
         "        \"count\": 1",
         "    }",
index d993542442d72231de4f8440ffa91c3671afffae..72318ecc5c19ee4bf52f68b19a0fbae870ff3748 100644 (file)
@@ -12,9 +12,9 @@
         "    \"command\": \"remote-subnet6-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<first subnet identifier>\",",
-        "                \"subnet\": \"<first subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
+        "                \"id\": <first subnet identifier>,",
+        "                \"subnet\": <first subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "                }",
         "            },",
         "            {",
-        "                \"id\": \"<second subnet identifier>\",",
-        "                \"subnet\": \"<second subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
+        "                \"id\": <second subnet identifier>,",
+        "                \"subnet\": <second subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
         "                \"metadata\": {",
-        "                    \"server-tags\": [ \"<first server tag>\" ]",
+        "                    \"server-tags\": [ <first server tag>, ... ]",
         "                }",
         "            }",
         "        ],",
index 06f2d046408bd005da548ffef360ca0a9cbacc23..a746926e9e5eceb34a88f02450681bc4355e6f5a 100644 (file)
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
-        "                \"id\": \"<subnet identifier>\",",
-        "                \"subnet\": \"<subnet prefix>\",",
-        "                \"shared-network-name\": \"<shared network name or null>\",",
-        "                \"<the\": \"rest of the subnet specification here>\"",
+        "                \"id\": <subnet identifier>,",
+        "                \"subnet\": <subnet prefix>,",
+        "                \"shared-network-name\": <shared network name or null>,",
+        "                <the rest of the subnet specification here>",
         "            }",
         "        ],",
         "        \"remote\": {",
-        "            \"<specification\": \"of the database to connect to>\"",
+        "            <specification of the database to connect to>",
         "        },",
-        "        \"server-tags\": [ \"<first server tag>, <second server tag>\" ]",
+        "        \"server-tags\": [ <first server tag>, <second server tag>, ... ]",
         "    }",
         "}"
     ],
@@ -33,8 +33,8 @@
         "    \"result\": 0,",
         "    \"text\": \"IPv6 subnet successfully set.\",",
         "    \"arguments\": {",
-        "        \"id\": \"<subnet identifier>\",",
-        "        \"subnet\": \"<subnet prefix>\"",
+        "        \"id\": <subnet identifier>,",
+        "        \"subnet\": <subnet prefix>",
         "    }",
         "}"
     ],
index 4109ca5d012f1200f30e71acc660916b65ad4d6c..d77172561340e0819b9b7349f3a43264d2df992a 100644 (file)
         "    \"command\": \"reservation-add\",",
         "    \"arguments\": {",
         "        \"reservation\": {",
-        "            \"boot-file-name\": \"<string>\",",
-        "            \"client-id\": \"<string>\",",
-        "            \"circuit-id\": \"<string>\",",
-        "            \"duid\": \"<string>\",",
-        "            \"flex-id\": \"<string>\",",
-        "            \"ip-address\": \"<string (IPv4 address)>\",",
-        "            \"ip-addresses\": [ \"<comma-separated strings>\" ],",
-        "            \"hw-address\": \"<string>\",",
-        "            \"hostname\": \"<string>\",",
-        "            \"next-server\": \"<string (IPv4 address)>\",",
-        "            \"option-data\": [ \"<comma-separated structures defining options>\" ],",
-        "            \"prefixes\": [ \"<comma-separated IPv6 prefixes>\" ],",
-        "            \"client-classes\": [ \"<comma-separated strings>\" ],",
-        "            \"server-hostname\": \"<string>\",",
-        "            \"subnet-id\": \"<integer>\",",
-        "            \"user-context\": \"<any valid JSON>\"",
+        "            \"boot-file-name\": <string>,",
+        "            \"client-id\": <string>,",
+        "            \"circuit-id\": <string>,",
+        "            \"duid\": <string>,",
+        "            \"flex-id\": <string>,",
+        "            \"ip-address\": <string (IPv4 address)>,",
+        "            \"ip-addresses\": [ <comma-separated strings> ],",
+        "            \"hw-address\": <string>,",
+        "            \"hostname\": <string>,",
+        "            \"next-server\": <string (IPv4 address)>,",
+        "            \"option-data\": [ <comma-separated structures defining options> ],",
+        "            \"prefixes\": [ <comma-separated IPv6 prefixes> ],",
+        "            \"client-classes\": [ <comma-separated strings> ],",
+        "            \"server-hostname\": <string>,",
+        "            \"subnet-id\": <integer>,",
+        "            \"user-context\": <any valid JSON>",
         "        }",
         "    }",
         "}"
@@ -38,8 +38,8 @@
     "resp-syntax": [
         "",
         "{",
-        "    \"result\": \"<integer>\",",
-        "    \"text\": \"<string>\"",
+        "    \"result\": <integer>,",
+        "    \"text\": <string>",
         "}"
     ],
     "support": [
index 95db1fb2e9890b47d3a6f39e64ce067659555b9b..61ec8d78788dd1ade76dc750a6d17c6dcd5bbda8 100644 (file)
         "{",
         "    \"command\": \"reservation-del\",",
         "    \"arguments\": {",
-        "        \"subnet-id\": \"<integer>\",",
-        "        \"ip-address\": \"<string>\",",
-        "        \"identifier-type\": \"<one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>\",",
-        "        \"identifier\": \"<string>\"",
+        "        \"subnet-id\": <integer>,",
+        "        \"ip-address\": <string>,",
+        "        \"identifier-type\": <one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>,",
+        "        \"identifier\": <string>",
         "    }",
         "}"
     ],
index 10c5ed15aa6030bfa7632f72220a560e007b9677..5e1eeb594c22944437dc0bc830af610172a7d305 100644 (file)
@@ -8,7 +8,7 @@
         "{",
         "    \"command\": \"reservation-get-all\",",
         "    \"arguments\": {",
-        "        \"subnet-id\": \"<integer>\"",
+        "        \"subnet-id\": <integer>",
         "    }",
         "}"
     ],
index 4ed5453ef4c4fbd7276c035d7156a24d88ee1b6e..06d0e5cb941503f424195ac1dcdf3cbd83d27b69 100644 (file)
@@ -8,8 +8,8 @@
         "{",
         "    \"command\": \"reservation-get-by-hostname\",",
         "    \"arguments\": {",
-        "        \"hostname\": \"<hostname>\",",
-        "        \"subnet-id\": \"<integer>\"",
+        "        \"hostname\": <hostname>,",
+        "        \"subnet-id\": <integer>",
         "    }",
         "}"
     ],
index bc7f4971a742e5e85913eac6d18d460da0ef0079..59958df62e8ae0930f1432ba0b3749c047a59370 100644 (file)
@@ -8,8 +8,8 @@
         "{",
         "    \"command\": \"reservation-get-by-id\",",
         "    \"arguments\": {",
-        "        \"identifier-type\": \"<one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>\",",
-        "        \"identifier\": \"<string>\"",
+        "        \"identifier-type\": <one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>,",
+        "        \"identifier\": <string>",
         "    }",
         "}"
     ],
index 4ee3db908bc835f3be180d842b848963e24e1045..6be2b52ff1ea4ce19a54b836a257c3d5fe1dc847 100644 (file)
         "{",
         "    \"command\": \"reservation-get-page\",",
         "    \"arguments\": {",
-        "        \"subnet-id\": \"<integer>\",",
-        "        \"limit\": \"<integer>\",",
-        "        \"source-index\": \"<integer>\",",
-        "        \"from\": \"<integer>\"",
+        "        \"subnet-id\": <integer>,",
+        "        \"limit\": <integer>,",
+        "        \"source-index\": <integer>,",
+        "        \"from\": <integer>",
         "    }",
         "}"
     ],
index 7930962227c4f262f04141fdcb6cde029c656a86..16b3f194c73c7a3c62508097b03810248305e5ce 100644 (file)
@@ -11,9 +11,9 @@
         "{",
         "    \"command\": \"reservation-get\",",
         "    \"arguments\": {",
-        "        \"subnet-id\": \"<integer>\",",
-        "        \"identifier-type\": \"<one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>\",",
-        "        \"identifier\": \"<string>\"",
+        "        \"subnet-id\": <integer>,",
+        "        \"identifier-type\": <one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>,",
+        "        \"identifier\": <string>",
         "    }",
         "}"
     ],
     ],
     "resp-syntax": [
         "{",
-        "    \"result\": \"<integer>\",",
-        "    \"text\": \"<string>\",",
+        "    \"result\": <integer>,",
+        "    \"text\": <string>,",
         "    \"arguments\": {",
-        "        \"boot-file-name\": \"<string>\",",
-        "        \"comment\": \"<string>\",",
-        "        \"client-id\": \"<string>\",",
-        "        \"circuit-id\": \"<string>\",",
-        "        \"duid\": \"<string>\",",
-        "        \"flex-id\": \"<string>\",",
-        "        \"ip-address\": \"<string (IPv4 address)>\",",
-        "        \"ip-addresses\": [ \"<comma-separated strings>\" ],",
-        "        \"hw-address\": \"<string>\",",
-        "        \"hostname\": \"<string>\",",
-        "        \"next-server\": \"<string (IPv4 address)>\",",
-        "        \"option-data\": [ \"<comma-separated structures defining options>\" ],",
-        "        \"prefixes\": [ \"<comma-separated IPv6 prefixes>\" ],",
-        "        \"client-classes\": [ \"<comma-separated strings>\" ],",
-        "        \"server-hostname\": \"<string>\",",
-        "        \"subnet-id\": \"<integer>\",",
-        "        \"user-context\": \"<any valid JSON>\"",
+        "        \"boot-file-name\": <string>,",
+        "        \"comment\": <string>,",
+        "        \"client-id\": <string>,",
+        "        \"circuit-id\": <string>,",
+        "        \"duid\": <string>,",
+        "        \"flex-id\": <string>,",
+        "        \"ip-address\": <string (IPv4 address)>,",
+        "        \"ip-addresses\": [ <comma-separated strings> ],",
+        "        \"hw-address\": <string>,",
+        "        \"hostname\": <string>,",
+        "        \"next-server\": <string (IPv4 address)>,",
+        "        \"option-data\": [ <comma-separated structures defining options> ],",
+        "        \"prefixes\": [ <comma-separated IPv6 prefixes> ],",
+        "        \"client-classes\": [ <comma-separated strings> ],",
+        "        \"server-hostname\": <string>,",
+        "        \"subnet-id\": <integer>,",
+        "        \"user-context\": <any valid JSON>",
         "    }",
         "}"
     ],
index 26285927776750a8792c39967d40c60a277a7fa4..7af996b6fbea28e6520cf85fa2a07eef75f3c0e6 100644 (file)
         "    \"command\": \"reservation-update\",",
         "    \"arguments\": {",
         "        \"reservation\": {",
-        "            \"boot-file-name\": \"<string>\",",
-        "            \"client-id\": \"<string>\",",
-        "            \"circuit-id\": \"<string>\",",
-        "            \"duid\": \"<string>\",",
-        "            \"flex-id\": \"<string>\",",
-        "            \"ip-address\": \"<string (IPv4 address)>\",",
-        "            \"ip-addresses\": [ \"<comma-separated strings>\" ],",
-        "            \"hw-address\": \"<string>\",",
-        "            \"hostname\": \"<string>\",",
-        "            \"next-server\": \"<string (IPv4 address)>\",",
-        "            \"option-data\": [ \"<comma-separated structures defining options>\" ],",
-        "            \"prefixes\": [ \"<comma-separated IPv6 prefixes>\" ],",
-        "            \"client-classes\": [ \"<comma-separated strings>\" ],",
-        "            \"server-hostname\": \"<string>\",",
-        "            \"subnet-id\": \"<integer>\",",
-        "            \"user-context\": \"<any valid JSON>\"",
+        "            \"boot-file-name\": <string>,",
+        "            \"client-id\": <string>,",
+        "            \"circuit-id\": <string>,",
+        "            \"duid\": <string>,",
+        "            \"flex-id\": <string>,",
+        "            \"ip-address\": <string (IPv4 address)>,",
+        "            \"ip-addresses\": [ <comma-separated strings> ],",
+        "            \"hw-address\": <string>,",
+        "            \"hostname\": <string>,",
+        "            \"next-server\": <string (IPv4 address)>,",
+        "            \"option-data\": [ <comma-separated structures defining options> ],",
+        "            \"prefixes\": [ <comma-separated IPv6 prefixes> ],",
+        "            \"client-classes\": [ <comma-separated strings> ],",
+        "            \"server-hostname\": <string>,",
+        "            \"subnet-id\": <integer>,",
+        "            \"user-context\": <any valid JSON>",
         "        }",
         "    }",
         "}"
@@ -38,8 +38,8 @@
     "resp-syntax": [
         "",
         "{",
-        "    \"result\": \"<integer>\",",
-        "    \"text\": \"<string>\"",
+        "    \"result\": <integer>,",
+        "    \"text\": <string>",
         "}"
     ],
     "support": [
index deb4f458fcad9d5f900e8806af02bf74fb451ae9..8e107a71d550321b166d9c0310c9c0bbfb5f6b7e 100644 (file)
     ],
     "resp-syntax": [
         "{",
-        "    \"result\": \"<integer>\",",
+        "    \"result\": <integer>,",
         "    \"arguments\": {",
-        "        \"pid\": \"<integer>\",",
-        "        \"uptime\": \"<uptime in seconds>\",",
-        "        \"reload\": \"<time since reload in seconds>\",",
+        "        \"pid\": <integer>,",
+        "        \"uptime\": <uptime in seconds>,",
+        "        \"reload\": <time since reload in seconds>,",
         "        \"high-availability\": [",
         "            {",
-        "                \"ha-mode\": \"<HA mode configured for this relationship>\",",
+        "                \"ha-mode\": <HA mode configured for this relationship>,",
         "                \"ha-servers\": {",
         "                    \"local\": {",
-        "                        \"role\": \"<role of this server as in the configuration file>\",",
-        "                        \"scopes\": \"<list of scope names served by this server>\",",
-        "                        \"state\": \"<HA state name of the server receiving the command>\"",
+        "                        \"role\": <role of this server as in the configuration file>,",
+        "                        \"scopes\": <list of scope names served by this server>,",
+        "                        \"state\": <HA state name of the server receiving the command>",
         "                    },",
         "                    \"remote\": {",
-        "                        \"age\": \"<the age of the remote status in seconds>\",",
-        "                        \"in-touch\": \"<indicates if this server communicated with remote>\",",
-        "                        \"last-scopes\": \"<list of scopes served by partner>\",",
-        "                        \"last-state\": \"<HA state name of the partner>\",",
-        "                        \"role\": \"<partner role>\"",
+        "                        \"age\": <the age of the remote status in seconds>,",
+        "                        \"in-touch\": <indicates if this server communicated with remote>,",
+        "                        \"last-scopes\": <list of scopes served by partner>,",
+        "                        \"last-state\": <HA state name of the partner>,",
+        "                        \"role\": <partner role>",
         "                    }",
         "                }",
         "            }",
         "        \"packet-queue-size\": 64,",
         "        \"packet-queue-statistics\": [ 1.2, 2.3, 3.4 ],",
         "        \"sockets\": {",
-        "            \"errors\": [",
-        "                \"<error received during the last attempt to open all sockets>\"",
-        "            ],",
-        "            \"status\": \"<ready, retrying, or failed>\"",
+        "            \"errors\": [ <error received during the last attempt to open all sockets> ],",
+        "            \"status\": <ready, retrying, or failed>",
         "        }",
         "    }",
         "}"
index cfb1dc67af260a7cce6e09d8daed90bf26ecf1ec..7b1ea8b0b54871b86920a4db9f9d8526cd9c90c6 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet4\": [ {",
         "            \"id\": 123,",
         "            \"subnet\": \"10.20.30.0/24\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index 575b56907647dd04ccbcee7d57c844322fe43dd4..fb66313cc92c7e5052de87e2f8424303033fefee 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet4\": [ {",
         "            \"id\": 123,",
         "            \"subnet\": \"10.20.30.0/24\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index 0653c98645f9a4c01fe4eef8baeabb5b97fa6e93..16c60d77c180168967dcd05269c4c2adae9f67a1 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet4\": [ {",
         "            \"id\": 123,",
         "            \"subnet\": \"10.20.30.0/24\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index bddb2c0ddf788b2bd59155a5ff42bf7740308baf..97d24cce8ae534354171c5e955ac42771485caed 100644 (file)
         "            {",
         "                \"subnet\": \"10.0.0.0/8\",",
         "                \"id\": 1,",
-        "                \"option-data\": [",
-        "                    \"<other properties>\"",
-        "                ],",
-        "                \"<other\": \"properties>\"",
+        "                \"option-data\": [{",
+        "                    ...",
+        "                }],",
+        "                ...",
         "            }",
         "        ]",
         "    }",
index 66e7a9a228afbcc6ed915dd939c8c45044502956..f131b9e815cca99b29ace02b209c4c2783636144 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet4\": [ {",
         "            \"id\": 123,",
         "            \"subnet\": \"10.20.30.0/24\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index 6ff7c16a89636b71f1d75833abc783d92c821dff..77418d55cd5d6b41ee27b5fc06eee944bdbf0392 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet6\": [ {",
         "            \"id\": 234,",
         "            \"subnet\": \"2001:db8:1::/64\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index e0d3c41666790aaeb4d47c1384c67c4303568f61..0b48c995dbc6a4dec46567edf2d70d9211962436 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet6\": [ {",
         "            \"id\": 234,",
         "            \"subnet\": \"2001:db8:1::/64\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index 633f48ff48eec5a16040cf5acaba89cb2efab6c9..39118bf2f6e36f9e2715b8ecaa16e04740d97ab2 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet6\": [ {",
         "            \"id\": 234,",
         "            \"subnet\": \"2001:db8:1::/64\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index 101541eb390890d18a7888069e8df923868412c0..f7ac2efd10ee31213db20ca0a837a50f5ca9cc1c 100644 (file)
         "            {",
         "                \"subnet\": \"2001:db8:1::/64\",",
         "                \"id\": 1,",
-        "                \"option-data\": [",
-        "                    \"<other properties>\"",
-        "                ],",
-        "                \"<other\": \"properties>\"",
+        "                \"option-data\": [{",
+        "                    ...",
+        "                }],",
+        "                ...",
         "            }",
         "        ]",
         "    }",
index fa022e925797b9750508b78486fb87592a58fea4..3d5725da989707dcdd165430e2c10dc421acf22a 100644 (file)
@@ -11,7 +11,7 @@
         "        \"subnet6\": [ {",
         "            \"id\": 234,",
         "            \"subnet\": \"2001:db8:1::/64\",",
-        "            \"<other\": \"properties>\"",
+        "            ...",
         "        } ]",
         "    }",
         "}"
index 19fad3d2799272eafd11fff104d2ce4228c9fb37..91704b877d09d34e33cc4f06a8e2b8c9f556c68b 100755 (executable)
@@ -5,48 +5,83 @@ for file in `find ./ | grep -v "\.git" | grep -v "_build" | grep -v "\/man\/" |
        comment=0
        line_num=0
        echo "processing: $file"
-       while read line; do
+       while IFS= read line; do
                line_num=$((line_num+1))
-               if [ $comment -eq 0 -a $json -eq 0 -a `echo "$line" | grep -e "^\[A-Za-z]+" | wc -l` -eq 1 ]; then
+               if [ $comment -eq 0 -a $json -eq 0 -a `echo "$line" | grep -e "^[A-Za-z]+\|^\s*\\\`" | wc -l` -eq 1 ]; then
+                       # ignore line if it starts with 'A-Za-z' or spaces followed by '`'
                        continue
-                elif [ $comment -eq 0 -a `echo "$line" | grep -e "\/\*" | grep -v -e "\*\/" | wc -l` -eq 1 ]; then
+               elif [ $comment -eq 0 -a `echo "$line" | grep -e "\/\*" | grep -v -e "\*\/" | wc -l` -eq 1 ]; then
+                       # if the line contains /* and it does not contain */ on the same line
                        comment=1
                        echo "" >> $work_file
                        continue
-                elif [ $comment -eq 1 -a `echo "$line" | grep "\*\/" | wc -l` -eq 1 ]; then
+               elif [ $comment -eq 1 -a `echo "$line" | grep "\*\/" | wc -l` -eq 1 ]; then
+                       # if the line contains */
                        comment=0
                        echo "" >> $work_file
                        continue
                elif [ $comment -eq 0 -a $json -eq 0 -a `echo "$line" | grep "^\s*{\|^\s*\".*{" | grep -v "}" | grep -v "key\|pre" | wc -l` -eq 1 ]; then
+                       # if this is not a commend and the line starts with spaces followed by '{' or by '"' followed by "{"
+                       # ignore dns config:
+                       #      key "key.four.example.com." {
+                       #          algorithm hmac-sha224;
+                       #          secret "bZEG7Ow8OgAUPfLWV3aAUQ==";
+                       #      };
+                       # ignore detailed html:
+                       #                       .. raw:: html
+                       #    <details><summary>Expand here!</summary>
+                       #    <pre>{
+                       #    ...
+                       #    }</pre>
+                       #    </details><br>
                        json=1
                        # ignore any map name before top level map
                        line=`echo "$line" | sed "s/.*{/{/g"`
                        echo "" > $work_file
-               elif [ $comment -eq 0 -a $json -eq 1 -a `echo "$line" | grep -e "^\s*[A-Za-z]" | wc -l` -eq 1 ]; then
+               elif [ $comment -eq 0 -a $json -eq 1 -a `echo "$line" | grep -e "^\s*[A-Za-z]\|^\s*\\\`" | wc -l` -eq 1 ]; then
+                       # if the line is not a comment and the line starts with spaces followed by 'A-Za-z' or followed by "`" and the parser is processing a json structure
                        json=0
                        cat $work_file | jq . > /dev/null
                        if [ $? -ne 0 ]; then
+                               # if the jq tool returned error
                                echo "file $file contains invalid JSON near line $line_num"
                                echo "===start of JSON block==="
                                cat $work_file
                                echo "====end of JSON block===="
                        fi
                fi
-                if [ $comment -eq 0 -a $json -eq 1 ]; then
+               if [ $comment -eq 0 -a $json -eq 1 ]; then
                        if [ `echo "$line" | grep -e "^\s*\.\.\s" | wc -l` -eq 1 ]; then
                                echo "" >> $work_file
                        else
+                                       # if file is .json the following replace in line are done:
+                                       # 1. delete everything after '#'
+                                       # 2. delete everything after //
+                                       # 3. ignore <?include?>
+                                       # 4. replace all '[ <DATA> ]' with '[ "<DATA>"]' where DATA contains: '-' and 'A-Za-z0-9' and ' '
+                                       # 5. replace all ' <DATA>:' with ' "<DATA>":'
+                                       # 6. replace all ': <DATA>' with ': "<DATA>"'
+                                       # 7. replace '   ...' with '   "placeholder": "value"
+                                       # 8. replace ', ... ' with ' '
+                                       # 9. replace '   <DATA>' with '   "placeholder": "value"'
+                                       # 10. replace ' <DATA>' with ' "placeholder"'
                                if [ `echo "$file" | grep "\.json" | wc -l` -eq 0 ]; then
-                                       echo "$line" | cut -d "#" -f 1 | sed "s/\.\.\./\"placeholder\": 0/g" | sed "s/\/\/ .*//g" | sed "s/<?.*?>//g" >> $work_file
+                                       echo "$line" | cut -d "#" -f 1 | sed "s/\/\/ .*//g" | sed "s/<?.*?>//g" | sed "s/\[ <\([-A-Za-z0-9 ]*\)> \]/\[ \"<\1>\" \]/g" | sed "s/ <\(.*\)>:/ \"<\1>\":/g" | sed "s/: <\(.*\)>/: \"<\1>\"/g" | sed "s/   \.\.\./   \"placeholder\": \"value\"/g" | sed "s/, \.\.\. / /g" | sed "s/   <\(.*\)>/   \"placeholder\": \"value\"/g" | sed "s/ <\(.*\)>/ \"placeholder\"/g" >> $work_file
                                else
+                                       # if file is .rst the following replace in line are done:
+                                       # 1. delete everything after '#'
+                                       # 2. delete everything after //
+                                       # 3. ignore <?include?>
                                        echo "$line" | cut -d "#" -f 1 | sed "s/\/\/ .*//g" | sed "s/<?.*?>//g" >> $work_file
                                fi
                        fi
                fi
        done <<< $(cat $file | sed ':a;N;$!ba;s/,\s*\n\s*\.\.\.//g' | sed 's/\\\"/\\\\\"/g' | sed 's/\\\\,/\\\\\\\\,/g')
        if [ $comment -eq 0 -a $json -eq 1 ]; then
+               # if the file ended but the parser is processing a json structure
                cat $work_file | jq . > /dev/null
                if [ $? -ne 0 ]; then
+                       # if the jq tool returned error
                        echo "file $file contains invalid JSON near line $line_num"
                        echo "===start of JSON block==="
                        cat $work_file