[#1418] Checkpoint: more renames

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index 3f5d7e24147f7976e11fa6c3b8baa7ba647518f5..3b4b78a38c5a35e353ce04612f214a9012a81247 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -484,7 +484,7 @@ global_param: valid_lifetime
             | t1_percent
             | t2_percent
             | cache_threshold
-            | cache_max
+            | cache_max_age
             | loggers
             | hostname_char_set
             | hostname_char_replacement

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 05165bdb690878f71559a57d2efe284e1b653428..26627bf1ab2b3dfd6cee1edd9a5793b1185e2d09 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -612,7 +612,7 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
                  (config_pair.first == "t1-percent") ||
                  (config_pair.first == "t2-percent") ||
                  (config_pair.first == "cache-threshold") ||
-                 (config_pair.first == "cache-max") ||
+                 (config_pair.first == "cache-max-age") ||
                  (config_pair.first == "loggers") ||
                  (config_pair.first == "hostname-char-set") ||
                  (config_pair.first == "hostname-char-replacement") ||

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index a8c9eb627b178665780b6cfa6febe433e35c61c5..90bc929cb31d382d106da10137c20a97f84e4826 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -745,7 +745,7 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
                  (config_pair.first == "t1-percent") ||
                  (config_pair.first == "t2-percent") ||
                  (config_pair.first == "cache-threshold") ||
-                 (config_pair.first == "cache-max") ||
+                 (config_pair.first == "cache-max-age") ||
                  (config_pair.first == "loggers") ||
                  (config_pair.first == "hostname-char-set") ||
                  (config_pair.first == "hostname-char-replacement") ||

diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.cc b/src/lib/dhcpsrv/parsers/base_network_parser.cc
index dc16287fc7dcbf9f31c5c8e05d97b6d3477ae81f..20c0ee988eb23a8066b60a255b5b5e838ddbeb76 100644 (file)
--- a/src/lib/dhcpsrv/parsers/base_network_parser.cc
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.cc
@@ -192,8 +192,8 @@ BaseNetworkParser::parseCacheParams(const ConstElementPtr& network_data,
         network->setCacheThreshold(cache_threshold);
     }
 
-    if (network_data->contains("cache-max")) {
-        network->setCacheMax(getInteger(network_data, "cache-max"));
+    if (network_data->contains("cache-max-age")) {
+        network->setCacheMaxAge(getInteger(network_data, "cache-max-age"));
     }
 }
 

diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.h b/src/lib/dhcpsrv/parsers/base_network_parser.h
index a8427d5f55a1f4da22545d9d9b03ddf541e62792..fd2cdba6a5db5d8e17e14dfb4283a97c6a5905ad 100644 (file)
--- a/src/lib/dhcpsrv/parsers/base_network_parser.h
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.h
@@ -66,7 +66,7 @@ protected:
     ///
     /// The parsed parameters are:
     /// - cache-threshold,
-    /// - cache-max.
+    /// - cache-max-age.
     ///
     /// @param network_data Data element holding network configuration
     /// to be parsed.

diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc
index dcaa8ad8a28a1560f09ec422df4a4a09ef9f3b6a..f4f13e92cf5423905897a64b54e0b259d9b55694 100644 (file)
--- a/src/lib/dhcpsrv/parsers/simple_parser4.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc
@@ -88,7 +88,7 @@ const SimpleKeywords SimpleParser4::GLOBAL4_PARAMETERS = {
     { "statistic-default-sample-age",   Element::integer },
     { "multi-threading",                Element::map },
     { "cache-threshold",                Element::real },
-    { "cache-max",                      Element::integer }
+    { "cache-max-age",                  Element::integer }
 };
 
 /// @brief This table defines default global values for DHCPv4
@@ -226,7 +226,7 @@ const SimpleKeywords SimpleParser4::SUBNET4_PARAMETERS = {
     { "store-extended-info",            Element::boolean },
     { "metadata",                       Element::map },
     { "cache-threshold",                Element::real },
-    { "cache-max",                      Element::integer }
+    { "cache-max-age",                  Element::integer }
 };
 
 /// @brief This table defines default values for each IPv4 subnet.
@@ -279,7 +279,7 @@ const ParamsList SimpleParser4::INHERIT_TO_SUBNET4 = {
     "t2-percent",
     "store-extended-info",
     "cache-threshold",
-    "cache-max"
+    "cache-max-age"
 };
 
 /// @brief This table defines all pool parameters.
@@ -337,7 +337,7 @@ const SimpleKeywords SimpleParser4::SHARED_NETWORK4_PARAMETERS = {
     { "store-extended-info",            Element::boolean },
     { "metadata",                       Element::map },
     { "cache-threshold",                Element::real },
-    { "cache-max",                      Element::integer }
+    { "cache-max-age",                  Element::integer }
 };
 
 /// @brief This table defines default values for each IPv4 shared network.

diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc
index 625b9ee019b6b54178c7123362820944aa53cc88..e58cdae7706d57bda090c820663b31e8804d0833 100644 (file)
--- a/src/lib/dhcpsrv/parsers/simple_parser6.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc
@@ -89,7 +89,7 @@ const SimpleKeywords SimpleParser6::GLOBAL6_PARAMETERS = {
     { "statistic-default-sample-age",   Element::integer },
     { "multi-threading",                Element::map },
     { "cache-threshold",                Element::real },
-    { "cache-max",                      Element::integer }
+    { "cache-max-age",                  Element::integer }
 };
 
 /// @brief This table defines default global values for DHCPv6
@@ -220,7 +220,7 @@ const SimpleKeywords SimpleParser6::SUBNET6_PARAMETERS = {
     { "store-extended-info",            Element::boolean },
     { "metadata",                       Element::map },
     { "cache-threshold",                Element::real },
-    { "cache-max",                      Element::integer }
+    { "cache-max-age",                  Element::integer }
 };
 
 /// @brief This table defines default values for each IPv6 subnet.
@@ -273,7 +273,7 @@ const ParamsList SimpleParser6::INHERIT_TO_SUBNET6 = {
     "t2-percent",
     "store-extended-info",
     "cache-threshold",
-    "cache-max"
+    "cache-max-age"
 };
 
 /// @brief This table defines all pool parameters.
@@ -350,7 +350,7 @@ const SimpleKeywords SimpleParser6::SHARED_NETWORK6_PARAMETERS = {
     { "store-extended-info",            Element::boolean },
     { "metadata",                       Element::map },
     { "cache-threshold",                Element::real },
-    { "cache-max",                      Element::integer }
+    { "cache-max-age",                  Element::integer }
 };
 
 /// @brief This table defines default values for each IPv6 subnet.