From: Tomek Mrugalski Date: Thu, 4 Oct 2018 20:56:08 +0000 (+0200) Subject: [#10,!3] Fixing minor mistakes X-Git-Tag: 176-update-to-sysrepo-0-7-6-release_base~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7bf14bb408fc65d403d28fa0bef2fb562514da9;p=thirdparty%2Fkea.git [#10,!3] Fixing minor mistakes - 80% were simple trailing commas - one or two typos - our parser doesn't like escaped single quote. it's a bug in our parser code, but until it is fixed, I've removed the escapes. \' => ' --- diff --git a/doc/api/cache-insert.json b/doc/api/cache-insert.json index 3daa0cd840..e872c9ae04 100644 --- a/doc/api/cache-insert.json +++ b/doc/api/cache-insert.json @@ -17,7 +17,7 @@ \"client-classes6\": [ ], \"option-data4\": [ ], \"option-data6\": [ ], - \"next-server\": "192.0.0.2", + \"next-server\": \"192.0.0.2\", \"server-hostname\": \"server-hostname.example.org\", \"boot-file-name\": \"bootfile.efi\", \"host-id\": 0 @@ -36,10 +36,10 @@ \"client-classes6\": [ ], \"option-data4\": [ ], \"option-data6\": [ ], - \"next-server\": "0.0.0.0", + \"next-server\": \"0.0.0.0\", \"server-hostname\": \"\", \"boot-file-name\": \"\", \"host-id\": 0 } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/cache-load.json b/doc/api/cache-load.json index 2ccfca29c3..582dc11b86 100644 --- a/doc/api/cache-load.json +++ b/doc/api/cache-load.json @@ -8,5 +8,5 @@ "cmd-syntax": "{ \"command\": \"cache-load\", \"arguments\": \"/tmp/kea-host-cache.json\" -}", +}" } diff --git a/doc/api/cache-remove.json b/doc/api/cache-remove.json index c52490b74d..cde6b4d89d 100644 --- a/doc/api/cache-remove.json +++ b/doc/api/cache-remove.json @@ -18,5 +18,5 @@ \"duid\": \"00:01:ab:cd:f0:a1:c2:d3:e4\", \"subnet-id\": 123 } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/config-reload.json b/doc/api/config-reload.json index 74898effdb..8104db373e 100644 --- a/doc/api/config-reload.json +++ b/doc/api/config-reload.json @@ -6,5 +6,5 @@ "avail": "1.2.0", "cmd-syntax": "{ \"command\": \"config-reload\" -}", +}" } diff --git a/doc/api/config-set.json b/doc/api/config-set.json index 45284737f1..dd39e94132 100644 --- a/doc/api/config-set.json +++ b/doc/api/config-set.json @@ -18,5 +18,5 @@ or - {\"result\": 1, \"text\": \"unsupported parameter: BOGUS (:16:26)\" }", -} \ No newline at end of file + {\"result\": 1, \"text\": \"unsupported parameter: BOGUS (:16:26)\" }" +} diff --git a/doc/api/config-test.json b/doc/api/config-test.json index dd4632b9cf..079c6d942e 100644 --- a/doc/api/config-test.json +++ b/doc/api/config-test.json @@ -18,5 +18,5 @@ or - {\"result\": 1, \"text\": \"unsupported parameter: BOGUS (:16:26)\" }", -} \ No newline at end of file + {\"result\": 1, \"text\": \"unsupported parameter: BOGUS (:16:26)\" }" +} diff --git a/doc/api/config-write.json b/doc/api/config-write.json index d15cfb997d..b998e866c6 100644 --- a/doc/api/config-write.json +++ b/doc/api/config-write.json @@ -7,7 +7,7 @@ "cmd-syntax": "{ \"command\": \"config-write\", \"arguments\": { - \"filename": \"config-modified-2017-03-15.json\" + \"filename\": \"config-modified-2017-03-15.json\" } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/dhcp-disable.json b/doc/api/dhcp-disable.json index 44b028cf3c..80baa6b2b9 100644 --- a/doc/api/dhcp-disable.json +++ b/doc/api/dhcp-disable.json @@ -9,5 +9,5 @@ \"arguments\": { \"max-period\": 20 } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/dhcp-enable.json b/doc/api/dhcp-enable.json index 6b90c397b0..a945b931f4 100644 --- a/doc/api/dhcp-enable.json +++ b/doc/api/dhcp-enable.json @@ -6,5 +6,5 @@ "avail": "1.4.0", "cmd-syntax": "{ \"command\": \"dhcp-enable\" -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/lease4-add.json b/doc/api/lease4-add.json index 35757f6541..1a2b21280e 100644 --- a/doc/api/lease4-add.json +++ b/doc/api/lease4-add.json @@ -11,5 +11,5 @@ \"ip-address\": \"192.0.2.202\", \"hw-address\": \"1a:1b:1c:1d:1e:1f\" } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/lease4-del.json b/doc/api/lease4-del.json index f1799533ce..274f5664fb 100644 --- a/doc/api/lease4-del.json +++ b/doc/api/lease4-del.json @@ -11,5 +11,5 @@ \"ip-address\": \"192.0.2.202\" } }", - "cmd-comment": "leaseX-del returns a result that indicates a 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.", -} \ No newline at end of file + "cmd-comment": "leaseX-del returns a result that indicates a 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." +} diff --git a/doc/api/lease4-get-all.json b/doc/api/lease4-get-all.json index a52b765a7b..f8a60b8dd0 100644 --- a/doc/api/lease4-get-all.json +++ b/doc/api/lease4-get-all.json @@ -8,5 +8,5 @@ "cmd-syntax": "{ \"command\": \"lease4-get-all\" }", - "cmd-comment": "The lease4-get-all command may result in very large responses.", -} \ No newline at end of file + "cmd-comment": "The lease4-get-all command may result in very large responses." +} diff --git a/doc/api/lease4-get.json b/doc/api/lease4-get.json index 9051621077..5512e84474 100644 --- a/doc/api/lease4-get.json +++ b/doc/api/lease4-get.json @@ -28,4 +28,4 @@ \"text\": \"IPv4 lease found.\" }", "resp-comment": "lease4-get returns a result that indicates a result of the operation and lease details, if found. It has one of the following values: 0 (success), 1 (error) or 2 (empty)." -} \ No newline at end of file +} diff --git a/doc/api/lease4-update.json b/doc/api/lease4-update.json index c8f6c2ef9c..416a3263d8 100644 --- a/doc/api/lease4-update.json +++ b/doc/api/lease4-update.json @@ -14,5 +14,5 @@ \"subnet-id\": 44, \"force-create\": true } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/lease4-wipe.json b/doc/api/lease4-wipe.json index 94b7daea52..8b357ac46c 100644 --- a/doc/api/lease4-wipe.json +++ b/doc/api/lease4-wipe.json @@ -10,6 +10,5 @@ \"arguments\": { \"subnet-id\": 44 } +}" } -", -} \ No newline at end of file diff --git a/doc/api/lease6-add.json b/doc/api/lease6-add.json index b77a24ca2f..ac361b110f 100644 --- a/doc/api/lease6-add.json +++ b/doc/api/lease6-add.json @@ -16,5 +16,5 @@ }", "cmd-comment": "lease6-add can be also used to add leases for IPv6 prefixes..", "resp-syntax": "{ \"result\": 0, \"text\": \"Lease added.\" } - { \"result\": 1, \"text\": \"missing parameter 'ip-address' (:3:19)\" }", -} \ No newline at end of file + { \"result\": 1, \"text\": \"missing parameter 'ip-address' (:3:19)\" }" +} diff --git a/doc/api/lease6-del.json b/doc/api/lease6-del.json index 5275393adc..0f5ab56b1c 100644 --- a/doc/api/lease6-del.json +++ b/doc/api/lease6-del.json @@ -2,7 +2,7 @@ "name": "lease6-del", "brief": "lease6-del can be used to delete a lease from the lease database.", "description": "See ", - "support": [ "kea-dhcp4", "kea-dhcp6"" ], + "support": [ "kea-dhcp4", "kea-dhcp6" ], "avail": "1.3.0", "hook": "lease_cmds", "cmd-syntax": "{ @@ -11,5 +11,5 @@ \"ip-address\": \"192.0.2.202\" } }", - "cmd-comment": "lease6-del returns a result that indicates a outcome of the operation. It has one of the following values: 0 (success), 1 (error) or 3 (empty).", -} \ No newline at end of file + "cmd-comment": "lease6-del returns a result that indicates a outcome of the operation. It has one of the following values: 0 (success), 1 (error) or 3 (empty)." +} diff --git a/doc/api/lease6-update.json b/doc/api/lease6-update.json index 7add848694..adfafc3d3b 100644 --- a/doc/api/lease6-update.json +++ b/doc/api/lease6-update.json @@ -16,5 +16,5 @@ \"force-create\": false } } -", -} \ No newline at end of file +" +} diff --git a/doc/api/lease6-wipe.json b/doc/api/lease6-wipe.json index c50bcd2332..cffbf1d501 100644 --- a/doc/api/lease6-wipe.json +++ b/doc/api/lease6-wipe.json @@ -11,5 +11,5 @@ \"subnet-id\": 66 } }", - "cmd-comment": "Note: not all backends support this command.", -} \ No newline at end of file + "cmd-comment": "Note: not all backends support this command." +} diff --git a/doc/api/leases-reclaim.json b/doc/api/leases-reclaim.json index 45fba07933..c6d9b8f2bc 100644 --- a/doc/api/leases-reclaim.json +++ b/doc/api/leases-reclaim.json @@ -9,5 +9,5 @@ \"arguments\": { \"remove\": true } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/libreload.json b/doc/api/libreload.json index 81ab60fd96..3b881a990a 100644 --- a/doc/api/libreload.json +++ b/doc/api/libreload.json @@ -8,5 +8,5 @@ \"command\": \"libreload\", \"arguments\": { } }", - "cmd-comment": "The server will respond with a result of 0 indicating success, or 1 indicating a failure.", -} \ No newline at end of file + "cmd-comment": "The server will respond with a result of 0 indicating success, or 1 indicating a failure." +} diff --git a/doc/api/list-commands.json b/doc/api/list-commands.json index fb36bc05d8..e7a58962f3 100644 --- a/doc/api/list-commands.json +++ b/doc/api/list-commands.json @@ -2,11 +2,11 @@ "name": "list-commands", "brief": "The list-commands command retrieves a list of all commands supported by the server.", "description": "See ", - "support": [ "kea-dhcp4", "kea-dhcp6" ], + "support": [ "kea-dhcp4", "kea-dhcp6" , "ca" ], "avail": "1.0.0", "cmd-syntax": "{ \"command\": \"list-commands\", \"arguments\": { } }", - "cmd-comment": "The server will respond with a list of all supported commands.", -} \ No newline at end of file + "cmd-comment": "The server will respond with a list of all supported commands." +} diff --git a/doc/api/network4-add.json b/doc/api/network4-add.json index 663660a044..79d94222b1 100644 --- a/doc/api/network4-add.json +++ b/doc/api/network4-add.json @@ -41,6 +41,6 @@ \"shared-networks\": [ { \"name\": \"floor13\" } ] }, \"result\": 0, - \"text\": \"A new IPv4 shared network \'floor13\' added\" -}", -} \ No newline at end of file + \"text\": \"A new IPv4 shared network 'floor13' added\" +}" +} diff --git a/doc/api/network4-del.json b/doc/api/network4-del.json index 8aa783969f..ec5727eae6 100644 --- a/doc/api/network4-del.json +++ b/doc/api/network4-del.json @@ -20,6 +20,6 @@ ] }, \"result\": 0, - \"text\": \"IPv4 shared network \'floor13\' deleted\" -}", -} \ No newline at end of file + \"text\": \"IPv4 shared network 'floor13' deleted\" +}" +} diff --git a/doc/api/network4-get.json b/doc/api/network4-get.json index caecb1a1fd..bef4a308d3 100644 --- a/doc/api/network4-get.json +++ b/doc/api/network4-get.json @@ -13,7 +13,7 @@ }", "resp-syntax": "{ \"result\": 0, - \"text\": \"Info about IPv4 shared network \'floor13\' returned\", + \"text\": \"Info about IPv4 shared network 'floor13' returned\", \"arguments\": { \"shared-networks\": [ { @@ -44,4 +44,4 @@ } }", "resp-comment": "Note that the actual response contains many additional fields that are omitted here for clarity." -} \ No newline at end of file +} diff --git a/doc/api/network4-list.json b/doc/api/network4-list.json index b1554ca7e0..a1ec62a6ff 100644 --- a/doc/api/network4-list.json +++ b/doc/api/network4-list.json @@ -7,7 +7,7 @@ "hook": "subnet_cmds", "cmd-syntax": "{ \"command\": \"network4-list\" -}d", +}", "resp-syntax": "{ \"arguments\": { \"shared-networks\": [ @@ -17,5 +17,5 @@ }, \"result\": 0, \"text\": \"2 IPv4 network(s) found\" -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/network4-subnet-add.json b/doc/api/network4-subnet-add.json index 5840c942ad..4eb8080e33 100644 --- a/doc/api/network4-subnet-add.json +++ b/doc/api/network4-subnet-add.json @@ -14,6 +14,6 @@ }", "resp-syntax": "{ \"result\": 0, - \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network \'floor1\'\" -}", -} \ No newline at end of file + \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network 'floor1'\" +}" +} diff --git a/doc/api/network4-subnet-del.json b/doc/api/network4-subnet-del.json index e8ab0a70d0..1fb9ed7b05 100644 --- a/doc/api/network4-subnet-del.json +++ b/doc/api/network4-subnet-del.json @@ -14,6 +14,6 @@ }", "resp-syntax": "{ \"result\": 0, - \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network \'floor13\'\" -}", -} \ No newline at end of file + \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network 'floor13'\" +}" +} diff --git a/doc/api/network6-add.json b/doc/api/network6-add.json index d3804f42f3..d3b56c944a 100644 --- a/doc/api/network6-add.json +++ b/doc/api/network6-add.json @@ -42,6 +42,6 @@ \"shared-networks\": [ { \"name\": \"floor13\" } ] }, \"result\": 0, - \"text\": \"A new IPv4 shared network \'floor13\' added\" -}", -} \ No newline at end of file + \"text\": \"A new IPv4 shared network 'floor13' added\" +}" +} diff --git a/doc/api/network6-del.json b/doc/api/network6-del.json index f78aa60d02..84e509f49b 100644 --- a/doc/api/network6-del.json +++ b/doc/api/network6-del.json @@ -18,5 +18,5 @@ \"name\": \"floor13\", \"subnets-action\": \"delete\" } -}", -} \ No newline at end of file +}" +} diff --git a/doc/api/network6-get.json b/doc/api/network6-get.json index 2f48d204eb..69e8b35257 100644 --- a/doc/api/network6-get.json +++ b/doc/api/network6-get.json @@ -13,7 +13,7 @@ }", "resp-syntax": "{ \"result\": 0, - \"text\": \"Info about IPv4 shared network \'floor13\' returned\", + \"text\": \"Info about IPv4 shared network 'floor13' returned\", \"arguments\": { \"shared-networks\": [ { @@ -44,4 +44,4 @@ } }", "resp-comment": "Note that the actual response contains many additional fields that are omitted here for clarity." -} \ No newline at end of file +} diff --git a/doc/api/network6-list.json b/doc/api/network6-list.json index c9e5447a95..64cd2089ca 100644 --- a/doc/api/network6-list.json +++ b/doc/api/network6-list.json @@ -16,7 +16,7 @@ { \"name\": \"office\" } ] }, - "result": 0, - "text": "2 IPv4 network(s) found" -}", -} \ No newline at end of file + \"result\": 0, + \"text\": \"2 IPv4 network(s) found\" +}" +} diff --git a/doc/api/network6-subnet-add.json b/doc/api/network6-subnet-add.json index bc406d7883..0864d353eb 100644 --- a/doc/api/network6-subnet-add.json +++ b/doc/api/network6-subnet-add.json @@ -15,6 +15,6 @@ "cmd-comment": "The network6-subnet-add command uses exactly the same syntax for both the command and the response.", "resp-syntax": "{ \"result\": 0, - \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network \'floor1\'\" -}", -} \ No newline at end of file + \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network 'floor1'\" +}" +} diff --git a/doc/api/network6-subnet-del.json b/doc/api/network6-subnet-del.json index f6d8fc91f1..f0e12e123f 100644 --- a/doc/api/network6-subnet-del.json +++ b/doc/api/network6-subnet-del.json @@ -15,6 +15,6 @@ "cmd-comment": "The network6-subnet-del command uses exactly the same syntax for both the command and the response.", "resp-syntax": "{ \"result\": 0, - \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network \'floor13\'\" -}", -} \ No newline at end of file + \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network 'floor13'\" +}" +} diff --git a/doc/api/shutdown.json b/doc/api/shutdown.json index 593154b041..137418ecf2 100644 --- a/doc/api/shutdown.json +++ b/doc/api/shutdown.json @@ -7,5 +7,5 @@ "cmd-syntax": "{ \"command\": \"shutdown\" }", - "cmd-comment": "The server will respond with a confirmation that the shutdown procedure has been initiated.", -} \ No newline at end of file + "cmd-comment": "The server will respond with a confirmation that the shutdown procedure has been initiated." +} diff --git a/doc/api/stat-lease4-get.json b/doc/api/stat-lease4-get.json index 3aac547227..d8f16452b7 100644 --- a/doc/api/stat-lease4-get.json +++ b/doc/api/stat-lease4-get.json @@ -21,5 +21,5 @@ \"timestamp\": \"2018-05-04 15:03:37.000000\" } } - }", -} \ No newline at end of file + }" +} diff --git a/doc/api/stat-lease6-get.json b/doc/api/stat-lease6-get.json index 6967f4b275..29b96e8704 100644 --- a/doc/api/stat-lease6-get.json +++ b/doc/api/stat-lease6-get.json @@ -25,5 +25,5 @@ \"timestamp\": \"2018-05-04 15:03:37.000000\" } } - }", -} \ No newline at end of file + }" +} diff --git a/doc/api/statistic-get-all.json b/doc/api/statistic-get-all.json index 6c6d63654f..fcfdce1161 100644 --- a/doc/api/statistic-get-all.json +++ b/doc/api/statistic-get-all.json @@ -8,5 +8,5 @@ \"command\": \"statistic-get-all\", \"arguments\": { } }", - "cmd-comment": "The server will respond with details of all recorded statistics, with result set to 0 indicating that it iterated over all statistics (even when the total number of statistics is zero).", -} \ No newline at end of file + "cmd-comment": "The server will respond with details of all recorded statistics, with result set to 0 indicating that it iterated over all statistics (even when the total number of statistics is zero)." +} diff --git a/doc/api/statistic-get.json b/doc/api/statistic-get.json index 70dcb92618..97cf96ef87 100644 --- a/doc/api/statistic-get.json +++ b/doc/api/statistic-get.json @@ -10,5 +10,5 @@ \"name\": \"pkt4-received\" } }", - "cmd-comment": "The server will respond with details of the requested statistic, with a result set to 0 indicating success and the specified statistic as the value of the "arguments" parameter.", -} \ No newline at end of file + "cmd-comment": "The server will respond with details of the requested statistic, with a result set to 0 indicating success and the specified statistic as the value of the \"arguments\" parameter." +} diff --git a/doc/api/statistic-remove-all.json b/doc/api/statistic-remove-all.json index 821992ac28..b1cae435b3 100644 --- a/doc/api/statistic-remove-all.json +++ b/doc/api/statistic-remove-all.json @@ -8,5 +8,5 @@ \"command\": \"statistic-remove-all\", \"arguments\": { } }", - "cmd-comment": "If the removal of all statistics was successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered, the server will return a status code of 1 (error) and the text field will contain the error description.", -} \ No newline at end of file + "cmd-comment": "If the removal of all statistics was successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered, the server will return a status code of 1 (error) and the text field will contain the error description." +} diff --git a/doc/api/statistic-remove.json b/doc/api/statistic-remove.json index a2bfb4ff28..8e3eaa6874 100644 --- a/doc/api/statistic-remove.json +++ b/doc/api/statistic-remove.json @@ -10,5 +10,5 @@ \"name\": \"pkt4-received\" } }", - "cmd-comment": "If the specific statistic is found and its removal was successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered (e.g. requested statistic was not found), the server will return a status code of 1 (error) and the text field will contain the error description.", -} \ No newline at end of file + "cmd-comment": "If the specific statistic is found and its removal was successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered (e.g. requested statistic was not found), the server will return a status code of 1 (error) and the text field will contain the error description." +}