[#1405] addressed comments

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 37d36a146f51201ddf30a703d44b43b0fb9bac63..4bf6bd1c98ffc8a4852d790f0eb7f2565ed9b2bb 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -4580,7 +4580,7 @@ following decision diagram:
             |                |                  |     V
             +----------------+                  +--> "all"
 
-An example configuration that disables reservation looks as follows:
+An example configuration that disables reservations looks as follows:
 
 ::
 
@@ -4626,7 +4626,7 @@ Since Kea 1.9.1, the ``reservation-mode`` is deprecated by the
 ``reservations-out-of-pool``, ``reservations-in-subnet`` and
 ``reservations-global`` flags.
 The flags can be activated independently and can produce various combinations,
-some of them being unsuported by the deprecated ``reservation-mode``.
+some of them being unsupported by the deprecated ``reservation-mode``.
 
 The correspondence of old values are:
 
@@ -4693,7 +4693,7 @@ To activate both ``global`` and ``all``, the following combination can be used:
 The parameter can be specified at global, subnet, and shared-network
 levels.
 
-An example configuration that disables reservation looks as follows:
+An example configuration that disables reservations looks as follows:
 
 ::
 
@@ -6727,11 +6727,11 @@ used by all servers connecting to the configuration database.
    +-----------------------------+----------------------------+-------------+-------------+-------------+
    | reservation-mode            | yes                        | yes         | yes         | n/a         |
    +-----------------------------+----------------------------+-------------+-------------+-------------+
-   | reservations-out-of-pool    | yes                        | yes         | yes         | n/a         |
+   | reservations-global         | yes                        | yes         | yes         | n/a         |
    +-----------------------------+----------------------------+-------------+-------------+-------------+
    | reservations-in-subnet      | yes                        | yes         | yes         | n/a         |
    +-----------------------------+----------------------------+-------------+-------------+-------------+
-   | reservations-global         | yes                        | yes         | yes         | n/a         |
+   | reservations-out-of-pool    | yes                        | yes         | yes         | n/a         |
    +-----------------------------+----------------------------+-------------+-------------+-------------+
    | t1-percent                  | yes                        | yes         | yes         | n/a         |
    +-----------------------------+----------------------------+-------------+-------------+-------------+

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 2b47025566fdd91ec814c70a2c3e28a9d01538d7..c5f7f3db5e04a7f54163b931a433979ba8d9c23d 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -4025,7 +4025,7 @@ following decision diagram:
             |                |                  |     V
             +----------------+                  +--> "all"
 
-An example configuration that disables reservation looks as follows:
+An example configuration that disables reservations looks as follows:
 
 ::
 
@@ -4071,7 +4071,7 @@ Since Kea 1.9.1, the ``reservation-mode`` is deprecated by the
 ``reservations-out-of-pool``, ``reservations-in-subnet`` and
 ``reservations-global`` flags.
 The flags can be activated independently and can produce various combinations,
-some of them being unsuported by the deprecated ``reservation-mode``.
+some of them being unsupported by the deprecated ``reservation-mode``.
 
 The correspondence of old values are:
 
@@ -4138,7 +4138,7 @@ To activate both ``global`` and ``all``, the following combination can be used:
 The parameter can be specified at global, subnet, and shared-network
 levels.
 
-An example configuration that disables reservation looks as follows:
+An example configuration that disables reservations looks as follows:
 
 ::
 
@@ -6729,11 +6729,11 @@ the global DHCPv6 options (``option-data``) are modified using
    +-----------------------------+----------------------------+-----------+-----------+-----------+------------+
    | reservation-mode            | yes                        | yes       | yes       | n/a       | n/a        |
    +-----------------------------+----------------------------+-----------+-----------+-----------+------------+
-   | reservations-out-of-pool    | yes                        | yes       | yes       | n/a       | n/a        |
+   | reservations-global         | yes                        | yes       | yes       | n/a       | n/a        |
    +-----------------------------+----------------------------+-----------+-----------+-----------+------------+
    | reservations-in-subnet      | yes                        | yes       | yes       | n/a       | n/a        |
    +-----------------------------+----------------------------+-----------+-----------+-----------+------------+
-   | reservations-global         | yes                        | yes       | yes       | n/a       | n/a        |
+   | reservations-out-of-pool    | yes                        | yes       | yes       | n/a       | n/a        |
    +-----------------------------+----------------------------+-----------+-----------+-----------+------------+
    | t1-percent                  | yes                        | yes       | yes       | n/a       | n/a        |
    +-----------------------------+----------------------------+-----------+-----------+-----------+------------+

diff --git a/src/bin/dhcp4/parser_context.cc b/src/bin/dhcp4/parser_context.cc
index 91b4ea17c684ec53ee050326e01ec6729f828602..fcbb91fbb449dd69f0be96f13572bbbb04fdf7c6 100644 (file)
--- a/src/bin/dhcp4/parser_context.cc
+++ b/src/bin/dhcp4/parser_context.cc
@@ -184,8 +184,6 @@ Parser4Context::contextName()
         return ("subnet4");
     case RESERVATION_MODE:
         return ("reservation-mode");
-    case RESERVATION_MODES:
-        return ("reservation-modes");
     case OPTION_DEF:
         return ("option-def");
     case OPTION_DATA:

diff --git a/src/bin/dhcp4/parser_context.h b/src/bin/dhcp4/parser_context.h
index b4c7ca951b8c6eafb8a3be3c3d8f65f3222cff26..8813c8cfcc69a55c917556a8926d849c34d5a392 100644 (file)
--- a/src/bin/dhcp4/parser_context.h
+++ b/src/bin/dhcp4/parser_context.h
@@ -87,9 +87,6 @@ public:
         /// This will parse the input as dhcp-ddns. (D2 client config)
         PARSER_DHCP_DDNS,
 
-        /// This will parse the input as reservation-modes.
-        PARSER_RESERVATION_MODES,
-
         /// This will parse the input as config-control.
         PARSER_CONFIG_CONTROL,
     } ParserType;
@@ -317,9 +314,6 @@ public:
         /// Used while parsing Dhcp4/config-control
         CONFIG_CONTROL,
 
-        /// Used while parsing Dhcp4/reservation-modes
-        RESERVATION_MODES,
-
         /// Used while parsing config-control/config-databases
         CONFIG_DATABASE
 

diff --git a/src/bin/dhcp6/parser_context.cc b/src/bin/dhcp6/parser_context.cc
index 03727fa26018a03ac725d5994414e2100bb356f5..d5b204c86f580d8848f5f170926ae5881eae2d08 100644 (file)
--- a/src/bin/dhcp6/parser_context.cc
+++ b/src/bin/dhcp6/parser_context.cc
@@ -181,8 +181,6 @@ Parser6Context::contextName()
         return ("subnet6");
     case RESERVATION_MODE:
         return ("reservation-mode");
-    case RESERVATION_MODES:
-        return ("reservation-modes");
     case OPTION_DEF:
         return ("option-def");
     case OPTION_DATA:

diff --git a/src/bin/dhcp6/parser_context.h b/src/bin/dhcp6/parser_context.h
index cdc2da532968df3f9b7cf20ce2bb2f999737e03a..e95b12949eaf36e750549acbf6a5c34215b1985b 100644 (file)
--- a/src/bin/dhcp6/parser_context.h
+++ b/src/bin/dhcp6/parser_context.h
@@ -90,9 +90,6 @@ public:
         /// This will parse the input as dhcp-ddns. (D2 client config)
         PARSER_DHCP_DDNS,
 
-        /// This will parse the input as reservation-modes.
-        PARSER_RESERVATION_MODES,
-
         /// This will parse the input as config-control.
         PARSER_CONFIG_CONTROL,
     } ParserType;
@@ -323,9 +320,6 @@ public:
         /// Used while parsing Dhcp6/config-control
         CONFIG_CONTROL,
 
-        /// Used while parsing Dhcp6/reservation-modes
-        RESERVATION_MODES,
-
         /// Used while parsing config-control/config-databases
         CONFIG_DATABASE
 

diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index cb762fda0da98ba8b58f81c1f8342a5feb26706b..2d91186cc1b13f76ec9b9dcc3d423a4c885859b5 100644 (file)
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -2978,7 +2978,7 @@ addressReserved(const IOAddress& address, const AllocEngine::ClientContext4& ctx
         for (auto host : hosts) {
             for (auto id : ctx.host_identifiers_) {
                 // If we find the matching host we know that this address is reserved
-                // for us and we can return immediatelly.
+                // for us and we can return immediately.
                 if (id.first == host->getIdentifierType() &&
                     id.second == host->getIdentifier()) {
                     return (false);

diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.h b/src/lib/dhcpsrv/parsers/base_network_parser.h
index e4791e102e93632adb1b5d8b055ba757bae6596c..992736a84a8a7372ec27f7ef06b0621a1314ce13 100644 (file)
--- a/src/lib/dhcpsrv/parsers/base_network_parser.h
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.h
@@ -80,8 +80,9 @@ protected:
 
     /// @brief Parses host reservation mode.
     ///
-    /// @note Configuring 'reservation-mode' is deprecated. The new map
-    /// 'reservation-modes' should be used.
+    /// @note Configuring 'reservation-mode' is deprecated. The new
+    /// 'reservations-out-of-pool', 'reservations-in-subnet' and
+    /// 'reservations-global' parameters should be used.
     ///
     /// @param network_data Data element holding shared network
     /// configuration to be parsed.