[#2959] removed deprecated parameter reservation-mode

Author: Razvan Becheriu

doc/examples/kea4/all-keys-netconf.json

@@ -801,13 +801,6 @@
                 // lease is returned as it was "cached".
                 "cache-max-age": 1000,
 
-                // Enumeration specifying the 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.
-
                 // Specify whether the server should look up global reservations.
                 "reservations-global": false,
 
@@ -1001,13 +994,6 @@
                         // Subnet-level value of the renew timer.
                         "renew-timer": 30,
 
-                        // Enumeration specifying the 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.
-
                         // Specify whether the server should look up global reservations.
                         "reservations-global": false,
 
@@ -1144,11 +1130,6 @@
             "capacity": 64
         },
 
-        // Fetches host reservations.
-        // "reservation-mode": "all",
-        // It is replaced by the "reservations-global",
-        // "reservations-in-subnet", and "reservations-out-of-pool" parameters.
-
         // Specify whether the server should look up global reservations.
         "reservations-global": false,
 

doc/examples/kea4/all-keys.json

@@ -828,13 +828,6 @@
                 // lease is returned as it was "cached".
                 "cache-max-age": 1000,
 
-                // Enumeration specifying the 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.
-
                 // Specify whether the server should look up global reservations.
                 "reservations-global": false,
 
@@ -1033,13 +1026,6 @@
                         // Subnet-level value of the renew timer.
                         "renew-timer": 30,
 
-                        // Enumeration specifying the 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.
-
                         // Specify whether the server should look up global reservations.
                         "reservations-global": false,
 
@@ -1180,11 +1166,6 @@
             "capacity": 64
         },
 
-        // Fetches host reservations.
-        // "reservation-mode": "all",
-        // It is replaced by the "reservations-global",
-        // "reservations-in-subnet", and "reservations-out-of-pool" parameters.
-
         // Specify whether the server should look up global reservations.
         "reservations-global": false,
 

doc/examples/kea4/global-reservations.json

@@ -51,9 +51,6 @@
 
 // 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",
-// It is replaced by the "reservations-global", "reservations-in-subnet", and
-// "reservations-out-of-pool" parameters.
 
 // Specify whether the server should look up global reservations.
   "reservations-global": true,

doc/examples/kea4/reservations.json

@@ -48,11 +48,10 @@
 // to the dynamic pool. Kea is able to handle this case, but it is not
 // recommended from a performance perspective, as Kea would not only need to
 // check if a given address is free, but also whether it is reserved.
-// To avoid this check, one can change reservation-mode to out-of-pool, rather
-// than 'all'. If a subnet does not have reservations at all, the reservation
-// lookup can be skipped altogether (reservation-mode is set to 'disabled').
-// The reservation-mode has been replaced by reservations-global,
-// reservations-in-subnet and reservations-out-of-pool.
+// To avoid this check, one can set "reservations-out-of-pool", beside
+// the "reservations-in-subnet". If a subnet does not have reservations at all,
+// the reservation lookup can be skipped altogether by disabling
+// "reservations-in-subnet".
 
 // Note that the second reservation is for an address which is within the
 // range of the pool of the dynamically allocated address. The server will
@@ -66,12 +65,9 @@
         "interface": "eth0",
         // 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".
+        // out of the dynamic pool and set "reservations-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.
 
         // Specify whether the server should look up global reservations.
         "reservations-global": false,

doc/examples/kea4/shared-network.json

@@ -65,11 +65,6 @@
             // Timer values can be overridden here.
             "renew-timer": 100,
 
-            // "reservation-mode": "all",
-            // It is replaced by the "reservations-global",
-            // "reservations-in-subnet", and "reservations-out-of-pool"
-            // parameters.
-
             // Specify whether the server should look up global reservations.
             "reservations-global": false,
 
@@ -102,10 +97,6 @@
                         "ip-addresses": [ "0.0.0.0" ]
                     },
                     "renew-timer": 10,
-                    // "reservation-mode": "all",
-                    // It is replaced by the "reservations-global",
-                    // "reservations-in-subnet", and "reservations-out-of-pool"
-                    // parameters.
                     // Specify whether the server should look up global reservations.
                     "reservations-global": false,
                     // Specify whether the server should look up in-subnet reservations.
@@ -127,10 +118,6 @@
                     "pools": [ ],
                     "rebind-timer": 20,
                     "renew-timer": 10,
-                    // "reservation-mode": "all",
-                    // It is replaced by the "reservations-global",
-                    // "reservations-in-subnet", and "reservations-out-of-pool"
-                    // parameters.
                     // Specify whether the server should look up global reservations.
                     "reservations-global": false,
                     // Specify whether the server should look up in-subnet reservations.

doc/examples/kea6/all-keys-netconf.json

@@ -751,13 +751,6 @@
                 // lease is returned as it was "cached".
                 "cache-max-age": 1000,
 
-                // Enumeration specifying the 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.
-
                 // Specify whether the server should look up global reservations.
                 "reservations-global": false,
 
@@ -975,13 +968,6 @@
                         // Subnet-level renew timer.
                         "renew-timer": 30,
 
-                        // Enumeration specifying the 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.
-
                         // Specify whether the server should look up global reservations.
                         "reservations-global": false,
 
@@ -1115,11 +1101,6 @@
             "capacity": 64
         },
 
-        // Fetches host reservations.
-        // "reservation-mode": "all",
-        // It is replaced by the "reservations-global",
-        // "reservations-in-subnet", and "reservations-out-of-pool" parameters.
-
         // Specify whether the server should look up global reservations.
         "reservations-global": false,
 

doc/examples/kea6/all-keys.json

@@ -778,13 +778,6 @@
                 // lease is returned as it was "cached".
                 "cache-max-age": 1000,
 
-                // Enumeration specifying the 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.
-
                 // Specify whether the server should look up global reservations.
                 "reservations-global": false,
 
@@ -1007,13 +1000,6 @@
                         // Subnet-level renew timer.
                         "renew-timer": 30,
 
-                        // Enumeration specifying the 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.
-
                         // Specify whether the server should look up global reservations.
                         "reservations-global": false,
 
@@ -1147,11 +1133,6 @@
             "capacity": 64
         },
 
-        // Fetches host reservations.
-        // "reservation-mode": "all",
-        // It is replaced by the "reservations-global",
-        // "reservations-in-subnet", and "reservations-out-of-pool" parameters.
-
         // Specify whether the server should look up global reservations.
         "reservations-global": false,
 

doc/examples/kea6/global-reservations.json

@@ -40,9 +40,6 @@
 
 // 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",
-// It is replaced by the "reservations-global", "reservations-in-subnet", and
-// "reservations-out-of-pool" parameters.
 
 // Specify whether the server should look up global reservations.
   "reservations-global": true,

doc/examples/kea6/reservations.json

@@ -47,12 +47,9 @@
 
         // 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".
+        // out of the dynamic pool and set "reservations-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.
 
         // Specify whether the server should look up global reservations.
         "reservations-global": false,

doc/examples/kea6/shared-network.json

@@ -71,11 +71,6 @@
             },
             "renew-timer": 100,
 
-            // "reservation-mode": "all",
-            // It is replaced by the "reservations-global",
-            // "reservations-in-subnet", and "reservations-out-of-pool"
-            // parameters.
-
             // Specify whether the server should look up global reservations.
             "reservations-global": false,
 
@@ -102,10 +97,6 @@
                         "ip-addresses": [ "2001:db8:1::123" ]
                     },
                     "renew-timer": 10,
-                    // "reservation-mode": "all",
-                    // It is replaced by the "reservations-global",
-                    // "reservations-in-subnet", and "reservations-out-of-pool"
-                    // parameters.
                     // Specify whether the server should look up global reservations.
                     "reservations-global": false,
                     // Specify whether the server should look up in-subnet reservations.
@@ -130,10 +121,6 @@
                         "ip-addresses": [ "3000::1" ]
                     },
                     "renew-timer": 10,
-                    // "reservation-mode": "all",
-                    // It is replaced by the "reservations-global",
-                    // "reservations-in-subnet", and "reservations-out-of-pool"
-                    // parameters.
                     // Specify whether the server should look up global reservations.
                     "reservations-global": false,
                     // Specify whether the server should look up in-subnet reservations.