[#687] Rearranged table in the docs

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index be5f90ed62ba02460b6d2acf7424283abf2cfdc7..e9776050565e880f8f15a730266f6f16df00d0bd 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -1236,20 +1236,22 @@ avoid this, use the ``min-max`` notation.
     Here are some liberties and limits to the values that subnets and pools can
     take in Kea configurations that are out of the ordinary:
 
-    +-------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Kea configuration case                                      | Result        | Comment                                                                        |
-    +=============================================================+===============+================================================================================+
-    | Overlapping subnets                                         | Allowed       | Administrator consideration needs to be given to how clients are matched to    |
-    |                                                             |               | these subnets.                                                                 |
-    +-------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Overlapping pools in one subnet                             | Startup error | DHCP4_PARSER_FAIL                                                              |
-    +-------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Overlapping address pools in different subnets              | Allowed       | Can act as a substitute for a global pool mechanic. When assigning leases from |
-    |                                                             |               | one pool, Kea correctly excludes leases given under any pool that overlaps     |
-    |                                                             |               | with it such that no lease is given twice.                                     |
-    +-------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Pools that are outside the subnet they are configured under | Startup error | DHCP4_PARSER_FAIL                                                              |
-    +-------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
+    +-------------------------------------------------------------+---------+--------------------------------------------------------------------------------------+
+    | Kea configuration case                                      | Allowed | Comment                                                                              |
+    +=============================================================+=========+======================================================================================+
+    | Overlapping subnets                                         | Yes     | Administrator should consider how clients are matched to these subnets.              |
+    +-------------------------------------------------------------+---------+--------------------------------------------------------------------------------------+
+    | Overlapping pools in one subnet                             | No      | Startup error: DHCP4_PARSER_FAIL                                                     |
+    +-------------------------------------------------------------+---------+--------------------------------------------------------------------------------------+
+    | Overlapping address pools in different subnets              | Yes     | Specifying the same address pool in different subnets can be used as an equivalent   |
+    |                                                             |         | of the global address pool. In that case, the server can assign addresses from the   |
+    |                                                             |         | same range regardless of the client's subnet. If an address from such a pool is      |
+    |                                                             |         | assigned to a client in one subnet, the same address will be renewed for this        |
+    |                                                             |         | client if it moves to another subnet. Another client in a different subnet will      |
+    |                                                             |         | not be assigned an address already assigned to the client in any of the subnets.     |
+    +-------------------------------------------------------------+---------+--------------------------------------------------------------------------------------+
+    | Pools that are outside the subnet they are configured under | No      | Startup error: DHCP4_PARSER_FAIL                                                     |
+    +-------------------------------------------------------------+---------+--------------------------------------------------------------------------------------+
 
 .. _dhcp4-t1-t2-times:
 

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 41d9ef9e886091e1c5ab88bf258a9e42768daa33..87439aaf73fa4eea3c612daf41155b8bb1430400 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -1147,28 +1147,33 @@ and which is delegated a prefix from this pool.
     Here are some liberties and limits to the values that subnets and pools can
     take in Kea configurations that are out of the ordinary:
 
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Kea configuration case                                                        | Result        | Comment                                                                        |
-    +===============================================================================+===============+================================================================================+
-    | Overlapping subnets                                                           | Allowed       | Administrator consideration needs to be given to how clients are matched to    |
-    |                                                                               |               | these subnets.                                                                 |
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Overlapping address pools in one subnet                                       | Startup error | DHCP6_PARSER_FAIL                                                              |
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Overlapping address pools in different subnets                                | Allowed       | Can act as a substitute for a global pool mechanic. When assigning leases from |
-    |                                                                               |               | one pool, Kea correctly excludes leases given under any pool that overlaps     |
-    |                                                                               |               | with it such that no lease is given twice.                                     |
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Address pools that are outside the subnet they are configured under           | Startup error | DHCP6_PARSER_FAIL                                                              |
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Overlapping prefix delegation pools in one subnet                             | Startup error | DHCP6_PARSER_FAIL                                                              |
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Overlapping prefix delegation pools in different subnets                      | Allowed       | Can act as a substitute for a global pool mechanic. When assigning leases from |
-    |                                                                               |               | one pool, Kea correctly excludes leases given under any pool that overlaps     |
-    |                                                                               |               | with it such that no lease is given twice.                                     |
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
-    | Prefix delegation pools that are outside the subnet they are configured under | Allowed       |                                                                                |
-    +-------------------------------------------------------------------------------+---------------+--------------------------------------------------------------------------------+
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
+    | Kea configuration case                                                        | Allowed | Comment                                                                            |
+    +===============================================================================+=========+====================================================================================+
+    | Overlapping subnets                                                           | Yes     | Administrator consideration needs to be given to how clients are matched to        |
+    |                                                                               |         | these subnets.                                                                     |
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
+    | Overlapping address pools in one subnet                                       | No      | Startup error: DHCP6_PARSER_FAIL                                                   |
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
+    | Overlapping address pools in different subnets                                | Yes     | Specifying the same address pool in different subnets can be used as an equivalent |
+    |                                                                               |         | of the global address pool. In that case, the server can assign addresses from the |
+    |                                                                               |         | same range regardless of the client's subnet. If an address from such a pool is    |
+    |                                                                               |         | assigned to a client in one subnet, the same address will be renewed for this      |
+    |                                                                               |         | client if it moves to another subnet. Another client in a different subnet will    |
+    |                                                                               |         | not be assigned an address already assigned to the client in any of the subnets.   |
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
+    | Address pools that are outside the subnet they are configured under           | No      | Startup error: DHCP6_PARSER_FAIL                                                   |
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
+    | Overlapping prefix delegation pools in one subnet                             | No      | Startup error: DHCP6_PARSER_FAIL                                                   |
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
+    | Overlapping prefix delegation pools in different subnets                      | Yes     | Can act as a substitute for a global pool mechanic. When assigning leases from     |
+    |                                                                               |         | one pool, Kea correctly excludes leases given under any pool that overlaps         |
+    |                                                                               |         | with it such that no lease is given twice.                                         |
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
+    | Prefix delegation pools not matching the subnet prefix                        | Yes     | It is common in many deployments to configure the prefix delegation pools not      |
+    |                                                                               |         | matching the subnet prefix, e.g. a prefix pool of 3000::/96 within the             |
+    |                                                                               |         | 2001:db8:1::/64 subnet. Such use cases are supported by Kea DHCPv6 server.         |
+    +-------------------------------------------------------------------------------+---------+------------------------------------------------------------------------------------+
 
 .. _dhcp6-std-options: