[#1405] addressed comments

4 files changed, 66 insertions, 15 deletions

diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json
index da08911928..b7b9cc5624 100644
--- a/doc/examples/kea6/all-keys.json
+++ b/doc/examples/kea6/all-keys.json
@@ -653,10 +653,10 @@
 
                 // Enumeration specifying server's mode of operation when it
                 // fetches host reservations.
+                // "reservation-mode": "all",
                 // It is replaced by the "reservations-global",
                 // "reservations-in-subnet" and "reservations-out-of-pool"
                 // parameters.
-                // "reservation-mode": "all",
 
                 // Specify if server should lookup global reservations.
                 "reservations-global": false,
@@ -852,10 +852,10 @@
 
                         // Enumeration specifying server's mode of operation when it
                         // fetches host reservations.
+                        // "reservation-mode": "all",
                         // It is replaced by the "reservations-global",
                         // "reservations-in-subnet" and
                         // "reservations-out-of-pool" parameters.
-                        // "reservation-mode": "all",
 
                         // Specify if server should lookup global reservations.
                         "reservations-global": false,
@@ -990,9 +990,9 @@
         },
 
         // Fetches host reservations.
+        // "reservation-mode": "all",
         // It is replaced by the "reservations-global",
         // "reservations-in-subnet" and "reservations-out-of-pool" parameters.
-        // "reservation-mode": "all",
 
         // Specify if server should lookup global reservations.
         "reservations-global": false,
diff --git a/doc/examples/kea6/global-reservations.json b/doc/examples/kea6/global-reservations.json
index b5674178c1..519c7ca7d9 100644
--- a/doc/examples/kea6/global-reservations.json
+++ b/doc/examples/kea6/global-reservations.json
@@ -36,14 +36,26 @@
 // costly database lookup to do so. It is therefore useful from a performance
 // perspective to use only the reservation types that are actually used in a
 // given network.
-    "host-reservation-identifiers": [ "duid", "hw-address", "flex-id" ],
+  "host-reservation-identifiers": [ "duid", "hw-address", "flex-id" ],
 
 // This directive tells Kea that reservations are global. Note that this
 // can also be specified at shared network and/or subnet level.
-    "reservation-mode": "global",
+//  "reservation-mode": "global",
+// It is replaced by the "reservations-global", "reservations-in-subnet" and
+// "reservations-out-of-pool" parameters.
+
+// Specify if server should lookup global reservations.
+  "reservations-global": true,
+
+// Specify if server should lookup in-subnet reservations.
+  "reservations-in-subnet": false,
+
+// Specify if server can assume that all reserved addresses
+// are out-of-pool.
+  "reservations-out-of-pool": false,
 
 // Define several global host reservations.
-    "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.
@@ -113,11 +125,11 @@
 // quotes.
 // Note: flexible identifier requires flex_id hook library to be
 // loaded to work.
-        {
-            "flex-id": "'somevalue'",
-            "ip-addresses": [ "2001:db8:1:cafe::2" ]
-        }
-    ],
+      {
+          "flex-id": "'somevalue'",
+          "ip-addresses": [ "2001:db8:1:cafe::2" ]
+      }
+  ],
 
 // The following list defines subnets. Subnet, pools and interface definitions
 // are the same as in the regular scenario.
diff --git a/doc/examples/kea6/reservations.json b/doc/examples/kea6/reservations.json
index dad59d4f1e..27d1bf6cab 100644
--- a/doc/examples/kea6/reservations.json
+++ b/doc/examples/kea6/reservations.json
@@ -48,7 +48,12 @@
       // 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",
+      // "reservation-mode": "all",
+      // It is replaced by the "reservations-global", "reservations-in-subnet"
+      // and "reservations-out-of-pool" parameters.
+      "reservations-in-subnet": true,
+
+      "reservations-out-of-pool": false,
 
       "pools": [ { "pool": "2001:db8:1::/120" } ],
 
diff --git a/doc/examples/kea6/shared-network.json b/doc/examples/kea6/shared-network.json
index a8a537e36f..992a0d0350 100644
--- a/doc/examples/kea6/shared-network.json
+++ b/doc/examples/kea6/shared-network.json
@@ -69,7 +69,21 @@
                 "ip-address": "2001:db8::1"
             },
             "renew-timer": 100,
-            "reservation-mode": "all",
+
+            // "reservation-mode": "all",
+            // It is replaced by the "reservations-global",
+            // "reservations-in-subnet" and "reservations-out-of-pool"
+            // parameters.
+
+            // Specify if server should lookup global reservations.
+            "reservations-global": false,
+
+            // Specify if server should lookup in-subnet reservations.
+            "reservations-in-subnet": true,
+
+            // Specify if server can assume that all reserved addresses
+            // are out-of-pool.
+            "reservations-out-of-pool": false,
 
             // List of subnets belonging to this particular shared-network
             // start here.
@@ -85,7 +99,17 @@
                         "ip-address": "2001:db8:1::123"
                     },
                     "renew-timer": 10,
-                    "reservation-mode": "all",
+                    // "reservation-mode": "all",
+                    // It is replaced by the "reservations-global",
+                    // "reservations-in-subnet" and "reservations-out-of-pool"
+                    // parameters.
+                    // Specify if server should lookup global reservations.
+                    "reservations-global": false,
+                    // Specify if server should lookup in-subnet reservations.
+                    "reservations-in-subnet": true,
+                    // Specify if server can assume that all reserved addresses
+                    // are out-of-pool.
+                    "reservations-out-of-pool": false,
                     "subnet": "2001:db8:1::/64",
                     "pools": [ { "pool": "2001:db8:1:abcd::/64" } ],
                     "valid-lifetime": 40
@@ -101,7 +125,17 @@
                         "ip-address": "3000::1"
                     },
                     "renew-timer": 10,
-                    "reservation-mode": "all",
+                    // "reservation-mode": "all",
+                    // It is replaced by the "reservations-global",
+                    // "reservations-in-subnet" and "reservations-out-of-pool"
+                    // parameters.
+                    // Specify if server should lookup global reservations.
+                    "reservations-global": false,
+                    // Specify if server should lookup in-subnet reservations.
+                    "reservations-in-subnet": true,
+                    // Specify if server can assume that all reserved addresses
+                    // are out-of-pool.
+                    "reservations-out-of-pool": false,
                     "subnet": "3000::/16",
                     "valid-lifetime": 40
                 }