From 2fbc4fc0e3abc08c6b912d0c70ac538b71f9562a Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 2 Oct 2020 17:10:31 +0200 Subject: [PATCH] [#1418] Checkpoint: more renames --- src/bin/dhcp4/dhcp4_parser.yy | 2 +- src/bin/dhcp4/json_config_parser.cc | 2 +- src/bin/dhcp6/json_config_parser.cc | 2 +- src/lib/dhcpsrv/parsers/base_network_parser.cc | 4 ++-- src/lib/dhcpsrv/parsers/base_network_parser.h | 2 +- src/lib/dhcpsrv/parsers/simple_parser4.cc | 8 ++++---- src/lib/dhcpsrv/parsers/simple_parser6.cc | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy index 3f5d7e2414..3b4b78a38c 100644 --- 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 05165bdb69..26627bf1ab 100644 --- 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 a8c9eb627b..90bc929cb3 100644 --- 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 dc16287fc7..20c0ee988e 100644 --- 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 a8427d5f55..fd2cdba6a5 100644 --- 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 dcaa8ad8a2..f4f13e92cf 100644 --- 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 625b9ee019..e58cdae770 100644 --- 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.