[#1405] updated unittests

4 files changed, 32 insertions, 17 deletions

diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json
index b7b9cc5624..9a0e231491 100644
--- a/doc/examples/kea6/all-keys.json
+++ b/doc/examples/kea6/all-keys.json
@@ -666,6 +666,7 @@
 
                 // Specify if server can assume that all reserved addresses
                 // are out-of-pool.
+                // Ignored when reservations-in-subnet is false.
                 "reservations-out-of-pool": false,
 
                 // List of client classes which must be evaluated when this shared
@@ -865,6 +866,7 @@
 
                         // Specify if server can assume that all reserved
                         // addresses are out-of-pool.
+                        // Ignored when reservations-in-subnet is false.
                         "reservations-out-of-pool": false,
 
                         // Subnet level compute T1 and T2 timers.
@@ -1002,6 +1004,7 @@
 
         // Specify if server can assume that all reserved addresses
         // are out-of-pool.
+        // Ignored when reservations-in-subnet is false.
         "reservations-out-of-pool": false,
 
         // Data directory.
diff --git a/doc/examples/kea6/global-reservations.json b/doc/examples/kea6/global-reservations.json
index 519c7ca7d9..6fdb0bee54 100644
--- a/doc/examples/kea6/global-reservations.json
+++ b/doc/examples/kea6/global-reservations.json
@@ -52,6 +52,7 @@
 
 // Specify if server can assume that all reserved addresses
 // are out-of-pool.
+// Ignored when reservations-in-subnet is false.
   "reservations-out-of-pool": false,
 
 // Define several global host reservations.
diff --git a/doc/examples/kea6/reservations.json b/doc/examples/kea6/reservations.json
index 27d1bf6cab..8146bfd511 100644
--- a/doc/examples/kea6/reservations.json
+++ b/doc/examples/kea6/reservations.json
@@ -41,37 +41,45 @@
 // least subnet and pool entries.
   "subnet6": [
     {
-      "subnet": "2001:db8:1::/48",
+        "subnet": "2001:db8:1::/48",
 
-      // This directive tells Kea that reservations may be made both in-pool
-      // and out-of-pool. For improved performance, you may move all reservations
-      // out of the dynamic pool and change reservation-mode to "out-of-pool".
-      // Kea will then be able to skip querying for host reservations when
-      // assigning leases from dynamic pool.
-      // "reservation-mode": "all",
-      // It is replaced by the "reservations-global", "reservations-in-subnet"
-      // and "reservations-out-of-pool" parameters.
-      "reservations-in-subnet": true,
+        // This directive tells Kea that reservations may be made both in-pool
+        // and out-of-pool. For improved performance, you may move all reservations
+        // out of the dynamic pool and change reservation-mode to "out-of-pool".
+        // Kea will then be able to skip querying for host reservations when
+        // assigning leases from dynamic pool.
+        // "reservation-mode": "all",
+        // It is replaced by the "reservations-global", "reservations-in-subnet"
+        // and "reservations-out-of-pool" parameters.
 
-      "reservations-out-of-pool": false,
+        // Specify if server should lookup global reservations.
+        "reservations-global": false,
 
-      "pools": [ { "pool": "2001:db8:1::/120" } ],
+        // Specify if server should lookup in-subnet reservations.
+        "reservations-in-subnet": true,
 
-      "pd-pools": [
+        // Specify if server can assume that all reserved addresses
+        // are out-of-pool.
+        // Ignored when reservations-in-subnet is false.
+        "reservations-out-of-pool": false,
+
+        "pools": [ { "pool": "2001:db8:1::/120" } ],
+
+        "pd-pools": [
           {
               "prefix": "2001:db8:1:8000::",
               "prefix-len": 56,
               "delegated-len": 64
           }
-      ],
-      "interface": "ethX",
+        ],
+        "interface": "ethX",
 
 // Host reservations. Define several reservations, note that
 // they are all within the range of the pool of the dynamically
 // allocated address. The server will exclude the addresses from this
 // pool and only assign them to the client which has a reservation for
 // them.
-      "reservations": [
+       "reservations": [
 // This is a simple host reservation. The host with DUID matching
 // the specified value will get an address of 2001:db8:1::100.
           {
@@ -96,7 +104,7 @@
               {
                   "name": "nis-servers",
                   "data": "3000:1::234"
-              }],
+              } ],
               "client-classes": [ "special_snowflake", "office" ]
           },
 // This is a bit more advanced reservation. The client with the specified
diff --git a/doc/examples/kea6/shared-network.json b/doc/examples/kea6/shared-network.json
index 992a0d0350..cbec7d321b 100644
--- a/doc/examples/kea6/shared-network.json
+++ b/doc/examples/kea6/shared-network.json
@@ -83,6 +83,7 @@
 
             // Specify if server can assume that all reserved addresses
             // are out-of-pool.
+            // Ignored when reservations-in-subnet is false.
             "reservations-out-of-pool": false,
 
             // List of subnets belonging to this particular shared-network
@@ -109,6 +110,7 @@
                     "reservations-in-subnet": true,
                     // Specify if server can assume that all reserved addresses
                     // are out-of-pool.
+                    // Ignored when reservations-in-subnet is false.
                     "reservations-out-of-pool": false,
                     "subnet": "2001:db8:1::/64",
                     "pools": [ { "pool": "2001:db8:1:abcd::/64" } ],
@@ -135,6 +137,7 @@
                     "reservations-in-subnet": true,
                     // Specify if server can assume that all reserved addresses
                     // are out-of-pool.
+                    // Ignored when reservations-in-subnet is false.
                     "reservations-out-of-pool": false,
                     "subnet": "3000::/16",
                     "valid-lifetime": 40