From: Michal Nowikowski Date: Fri, 19 Jul 2019 08:17:31 +0000 (+0200) Subject: fixes after rebase X-Git-Tag: Kea-1.6.1~10^2~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6fc57d1ce9d65227652464c8a5c3709cefac964;p=thirdparty%2Fkea.git fixes after rebase --- diff --git a/doc/api/lease6-bulk-apply.json b/doc/api/lease6-bulk-apply.json deleted file mode 100644 index d132b9758f..0000000000 --- a/doc/api/lease6-bulk-apply.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "lease6-bulk-apply", - "brief": "The lease6-bulk-apply command can be used to create, update and delete multiple IPv6 leases in a single transaction. This is used to communicate lease changes between the HA peers but may be used in all cases when it is desired to apply multiple lease updates in a single transaction.", - "support": [ "kea-dhcp6" ], - "avail": "1.6.0", - "hook": "lease_cmds", - "cmd-syntax": "{ - \"command\": \"lease6-bulk-apply\", - \"arguments\": { - \"deleted-leases\": [ - { - \"ip-address\": \"2001:db8:abcd::\", - \"type\": \"IA_PD\", - ... - }, - { - \"ip-address\": \"2001:db8:abcd::234\", - \"type\": \"IA_NA\", - ... - } - ], - \"leases\": [ - { - \"subnet-id\": 66, - \"ip-address\": \"2001:db8:cafe::\", - \"type\": \"IA_PD\", - ... - }, - { - \"subnet-id\": 66, - \"ip-address\": \"2001:db8:abcd::333\", - \"type\": \"IA_NA\", - ... - } - ] - } -}", - "cmd-comment": "If any of the leases is malformed, all changes are rolled back. If the leases are well formed but the operation fails for one or more leases, the these leases are listed in the response but the changes are preserved for all leases for which the operation was successful. The \"deleted-leases\" and \"leases\" are optional parameters but one of them must be specified.", - "resp-syntax": " { - { - \"result\": 0, - \"text\": IPv6 leases bulk apply completed. - \"arguments\": { - \"failed-deleted-leases\": [ - { - \"ip-address\": \"2001:db8:abcd::\", - \"type\": \"IA_PD\", - \"result\": , - \"error-message\": - } - ], - \"failed-leases\": [ - { - \"ip-address\": \"2001:db8:cafe::\", - \"type\": \"IA_PD\", - \"result\" , - \"error-message\": - } - ] - } - } -}", - "resp-comment": "The \"failed-deleted-leases\" holds the list of leases which failed to delete. This includes leases which were not found in the database. The \"failed-leases\" includes the list of leases which failed to create or update. For each lease for which there was an error while processing the lease, inserting it into the database etc. the result is set to 1. For each lease which was not deleted because the server didn't find it in the database the result of 3 is returned." -} diff --git a/doc/guide/kea-docbook.xsl b/doc/guide/kea-docbook.xsl deleted file mode 100644 index af61b7eced..0000000000 --- a/doc/guide/kea-docbook.xsl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am index 113b52abba..4c1c0b86c1 100644 --- a/doc/sphinx/Makefile.am +++ b/doc/sphinx/Makefile.am @@ -139,6 +139,7 @@ api_files+=api/lease4-get.json api_files+=api/lease4-update.json api_files+=api/lease4-wipe.json api_files+=api/lease6-add.json +api_files+=api/lease6-bulk-apply.json api_files+=api/lease6-del.json api_files+=api/lease6-get-all.json api_files+=api/lease6-get.json diff --git a/doc/sphinx/api/lease6-bulk-apply.json b/doc/sphinx/api/lease6-bulk-apply.json new file mode 100644 index 0000000000..05cf30ae94 --- /dev/null +++ b/doc/sphinx/api/lease6-bulk-apply.json @@ -0,0 +1,58 @@ +{ + "name": "lease6-bulk-apply", + "brief": "The lease6-bulk-apply command can be used to create, update and delete multiple IPv6 leases in a single transaction. This is used to communicate lease changes between the HA peers but may be used in all cases when it is desired to apply multiple lease updates in a single transaction.", + "support": [ "kea-dhcp6" ], + "avail": "1.6.0", + "hook": "lease_cmds", + "cmd-syntax": { + "command": "lease6-bulk-apply", + "arguments": { + "deleted-leases": [ + { + "ip-address": "2001:db8:abcd::", + "type": "IA_PD" + }, + { + "ip-address": "2001:db8:abcd::234", + "type": "IA_NA" + } + ], + "leases": [ + { + "subnet-id": 66, + "ip-address": "2001:db8:cafe::", + "type": "IA_PD" + }, + { + "subnet-id": 66, + "ip-address": "2001:db8:abcd::333", + "type": "IA_NA" + } + ] + } + }, + "cmd-comment": "If any of the leases is malformed, all changes are rolled back. If the leases are well formed but the operation fails for one or more leases, the these leases are listed in the response but the changes are preserved for all leases for which the operation was successful. The 'deleted-leases' and 'leases' are optional parameters but one of them must be specified.", + "resp-syntax": { + "result": 0, + "text": "IPv6 leases bulk apply completed.", + "arguments": { + "failed-deleted-leases": [ + { + "ip-address": "2001:db8:abcd::", + "type": "IA_PD", + "result": "", + "error-message": "" + } + ], + "failed-leases": [ + { + "ip-address": "2001:db8:cafe::", + "type": "IA_PD", + "result": "", + "error-message": "" + } + ] + } + }, + "resp-comment": "The 'failed-deleted-leases' holds the list of leases which failed to delete. This includes leases which were not found in the database. The 'failed-leases' includes the list of leases which failed to create or update. For each lease for which there was an error while processing the lease, inserting it into the database etc. the result is set to 1. For each lease which was not deleted because the server didn't find it in the database the result of 3 is returned." +}