[#1405] reverted test configs

4 files changed, 13 insertions, 81 deletions

diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json
index 563a6dd453..eb16357c2e 100644
--- a/doc/examples/kea6/all-keys-netconf.json
+++ b/doc/examples/kea6/all-keys-netconf.json
@@ -528,16 +528,7 @@
 
                 // Enumeration specifying server's mode of operation when it
                 // fetches host reservations.
-                // It is deprecated by the "reservation-modes" map.
-                // "reservation-mode": "all",
-
-                // Reservation modes specifying server's mode of operation when it
-                // fetches host reservations.
-                "reservation-modes": {
-                    "global": false,
-                    "in-subnet": true,
-                    "out-of-pool": true
-                },
+                "reservation-mode": "all",
 
                 // List of client classes which must be evaluated when this shared
                 // network is selected for client assignments.
@@ -685,16 +676,7 @@
 
                         // Enumeration specifying server's mode of operation when it
                         // fetches host reservations.
-                        // It is deprecated by the "reservation-modes" map.
-                        // "reservation-mode": "all",
-
-                        // Reservation modes specifying server's mode of operation when it
-                        // fetches host reservations.
-                        "reservation-modes": {
-                            "global": false,
-                            "in-subnet": true,
-                            "out-of-pool": true
-                        },
+                        "reservation-mode": "all",
 
                         // Subnet level compute T1 and T2 timers.
                         "calculate-tee-times": true,
@@ -781,7 +763,8 @@
 
         // Configuration control (currently not used, i.e. this syntax
         // is already defined but corresponding feature is not implemented).
-        "config-control": {
+        "config-control":
+        {
             // Only configuration databases entry is defined.
             "config-databases": [
                 {
@@ -801,7 +784,8 @@
         "server-tag": "my DHCPv6 server",
 
         // DHCP queue control parameters.
-        "dhcp-queue-control": {
+        "dhcp-queue-control":
+        {
             // Enable queue is mandatory.
             "enable-queue": true,
 
@@ -810,16 +794,7 @@
         },
 
         // Fetches host reservations.
-        // It is deprecated by the "reservation-modes" map.
-        // "reservation-mode": "all",
-
-        // Reservation modes specifying server's mode of operation when it
-        // fetches host reservations.
-        "reservation-modes": {
-            "global": false,
-            "in-subnet": true,
-            "out-of-pool": true
-        },
+        "reservation-mode": "all",
 
         // Data directory.
         "data-directory": "/tmp",
diff --git a/doc/examples/kea6/global-reservations.json b/doc/examples/kea6/global-reservations.json
index 6a11a40dde..b5674178c1 100644
--- a/doc/examples/kea6/global-reservations.json
+++ b/doc/examples/kea6/global-reservations.json
@@ -36,20 +36,11 @@
 // 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.
-// It is deprecated by the "reservation-modes" map.
-// "reservation-mode": "global",
-
-// Since Kea 1.9.1, a more flexible option of configuring the way Kea uses host
-// reservations is available through the 'reservation-modes' map.
-  "reservation-modes": {
-      "global": true,
-      "in-subnet": false,
-      "out-of-pool": false
-  },
+    "reservation-mode": "global",
 
 // Define several global host reservations.
     "reservations": [
diff --git a/doc/examples/kea6/reservations.json b/doc/examples/kea6/reservations.json
index decc673243..dad59d4f1e 100644
--- a/doc/examples/kea6/reservations.json
+++ b/doc/examples/kea6/reservations.json
@@ -48,16 +48,7 @@
       // 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.
-      // It is deprecated by the "reservation-modes" map.
-      // "reservation-mode": "all",
-
-      // Reservation modes specifying server's mode of operation when it
-      // fetches host reservations.
-      "reservation-modes": {
-          "global": false,
-          "in-subnet": true,
-          "out-of-pool": true
-      },
+      "reservation-mode": "all",
 
       "pools": [ { "pool": "2001:db8:1::/120" } ],
 
diff --git a/doc/examples/kea6/shared-network.json b/doc/examples/kea6/shared-network.json
index 8fc3464b78..a8a537e36f 100644
--- a/doc/examples/kea6/shared-network.json
+++ b/doc/examples/kea6/shared-network.json
@@ -69,16 +69,7 @@
                 "ip-address": "2001:db8::1"
             },
             "renew-timer": 100,
-            // It is deprecated by the "reservation-modes" map.
-            // "reservation-mode": "all",
-
-            // Reservation modes specifying server's mode of operation when it
-            // fetches host reservations.
-            "reservation-modes": {
-                "global": false,
-                "in-subnet": true,
-                "out-of-pool": true
-            },
+            "reservation-mode": "all",
 
             // List of subnets belonging to this particular shared-network
             // start here.
@@ -94,15 +85,7 @@
                         "ip-address": "2001:db8:1::123"
                     },
                     "renew-timer": 10,
-                    // It is deprecated by the "reservation-modes" map.
-                    // "reservation-mode": "all",
-                    // Reservation modes specifying server's mode of operation when it
-                    // fetches host reservations.
-                    "reservation-modes": {
-                        "global": false,
-                        "in-subnet": true,
-                        "out-of-pool": true
-                    },
+                    "reservation-mode": "all",
                     "subnet": "2001:db8:1::/64",
                     "pools": [ { "pool": "2001:db8:1:abcd::/64" } ],
                     "valid-lifetime": 40
@@ -118,15 +101,7 @@
                         "ip-address": "3000::1"
                     },
                     "renew-timer": 10,
-                    // It is deprecated by the "reservation-modes" map.
-                    // "reservation-mode": "all",
-                    // Reservation modes specifying server's mode of operation when it
-                    // fetches host reservations.
-                    "reservation-modes": {
-                        "global": false,
-                        "in-subnet": true,
-                        "out-of-pool": true
-                    },
+                    "reservation-mode": "all",
                     "subnet": "3000::/16",
                     "valid-lifetime": 40
                 }