mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 06:55:16 +00:00
Code Issues Releases Wiki Activity

[#1405] fixed unittests

Browse Source
This commit is contained in:
Razvan Becheriu
2020-10-09 23:33:30 +03:00
parent 5d1fac920a
commit b4540aafa5
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/cc/simple_parser.cc
View File

@@ -224,6 +224,26 @@ size_t SimpleParser::setDefaults(ElementPtr scope,
x.reset(new DoubleElement(dbl_value, pos)); x.reset(new DoubleElement(dbl_value, pos));
break; break;
} }
case Element::map: {
auto data = Element::fromJSON(def_value.value_);
if (data->getType() != Element::map) {
isc_throw(BadValue,
"Internal error. Incorrect map value type for "
<< def_value.name_ << " : " << def_value.value_);
}
x = data;
break;
}
case Element::list: {
auto data = Element::fromJSON(def_value.value_);
if (data->getType() != Element::list) {
isc_throw(BadValue,
"Internal error. Incorrect list value type for "
<< def_value.name_ << " : " << def_value.value_);
}
x = data;
break;
}
default: default:
// No default values for null, list or map // No default values for null, list or map
isc_throw(DhcpConfigError, isc_throw(DhcpConfigError,

4
src/lib/dhcpsrv/parsers/simple_parser4.cc
View File

@@ -70,7 +70,6 @@ const SimpleKeywords SimpleParser4::GLOBAL4_PARAMETERS = {
{ "reservations", Element::list }, { "reservations", Element::list },
{ "config-control", Element::map }, { "config-control", Element::map },
{ "server-tag", Element::string }, { "server-tag", Element::string },
{ "reservation-mode", Element::string },
{ "reservation-modes", Element::map }, { "reservation-modes", Element::map },
{ "calculate-tee-times", Element::boolean }, { "calculate-tee-times", Element::boolean },
{ "t1-percent", Element::real }, { "t1-percent", Element::real },
@@ -111,7 +110,6 @@ const SimpleDefaults SimpleParser4::GLOBAL4_DEFAULTS = {
{ "server-hostname", Element::string, "" }, { "server-hostname", Element::string, "" },
{ "boot-file-name", Element::string, "" }, { "boot-file-name", Element::string, "" },
{ "server-tag", Element::string, "" }, { "server-tag", Element::string, "" },
{ "reservation-mode", Element::string, "all" },
{ "reservation-modes", Element::map, "{\"in-subnet\": true, \"out-of-pool\": true}" }, { "reservation-modes", Element::map, "{\"in-subnet\": true, \"out-of-pool\": true}" },
{ "calculate-tee-times", Element::boolean, "false" }, { "calculate-tee-times", Element::boolean, "false" },
{ "t1-percent", Element::real, ".50" }, { "t1-percent", Element::real, ".50" },
@@ -208,7 +206,6 @@ const SimpleKeywords SimpleParser4::SUBNET4_PARAMETERS = {
{ "client-class", Element::string }, { "client-class", Element::string },
{ "require-client-classes", Element::list }, { "require-client-classes", Element::list },
{ "reservations", Element::list }, { "reservations", Element::list },
{ "reservation-mode", Element::string },
{ "reservation-modes", Element::map, }, { "reservation-modes", Element::map, },
{ "relay", Element::map }, { "relay", Element::map },
{ "match-client-id", Element::boolean }, { "match-client-id", Element::boolean },
@@ -326,7 +323,6 @@ const SimpleKeywords SimpleParser4::SHARED_NETWORK4_PARAMETERS = {
{ "server-hostname", Element::string }, { "server-hostname", Element::string },
{ "boot-file-name", Element::string }, { "boot-file-name", Element::string },
{ "relay", Element::map }, { "relay", Element::map },
{ "reservation-mode", Element::string },
{ "reservation-modes", Element::map }, { "reservation-modes", Element::map },
{ "client-class", Element::string }, { "client-class", Element::string },
{ "require-client-classes", Element::list }, { "require-client-classes", Element::list },

4
src/lib/dhcpsrv/parsers/simple_parser6.cc
View File

@@ -71,7 +71,6 @@ const SimpleKeywords SimpleParser6::GLOBAL6_PARAMETERS = {
{ "reservations", Element::list }, { "reservations", Element::list },
{ "config-control", Element::map }, { "config-control", Element::map },
{ "server-tag", Element::string }, { "server-tag", Element::string },
{ "reservation-mode", Element::string },
{ "reservation-modes", Element::map }, { "reservation-modes", Element::map },
{ "calculate-tee-times", Element::boolean }, { "calculate-tee-times", Element::boolean },
{ "t1-percent", Element::real }, { "t1-percent", Element::real },
@@ -107,7 +106,6 @@ const SimpleDefaults SimpleParser6::GLOBAL6_DEFAULTS = {
{ "decline-probation-period", Element::integer, "86400" }, // 24h { "decline-probation-period", Element::integer, "86400" }, // 24h
{ "dhcp4o6-port", Element::integer, "0" }, { "dhcp4o6-port", Element::integer, "0" },
{ "server-tag", Element::string, "" }, { "server-tag", Element::string, "" },
{ "reservation-mode", Element::string, "all" },
{ "reservation-modes", Element::map, "{\"in-subnet\": true, \"out-of-pool\": true}" }, { "reservation-modes", Element::map, "{\"in-subnet\": true, \"out-of-pool\": true}" },
{ "calculate-tee-times", Element::boolean, "true" }, { "calculate-tee-times", Element::boolean, "true" },
{ "t1-percent", Element::real, ".50" }, { "t1-percent", Element::real, ".50" },
@@ -210,7 +208,6 @@ const SimpleKeywords SimpleParser6::SUBNET6_PARAMETERS = {
{ "client-class", Element::string }, { "client-class", Element::string },
{ "require-client-classes", Element::list }, { "require-client-classes", Element::list },
{ "reservations", Element::list }, { "reservations", Element::list },
{ "reservation-mode", Element::string },
{ "reservation-modes", Element::map }, { "reservation-modes", Element::map },
{ "relay", Element::map }, { "relay", Element::map },
{ "user-context", Element::map }, { "user-context", Element::map },
@@ -335,7 +332,6 @@ const SimpleKeywords SimpleParser6::SHARED_NETWORK6_PARAMETERS = {
{ "rebind-timer", Element::integer }, { "rebind-timer", Element::integer },
{ "option-data", Element::list }, { "option-data", Element::list },
{ "relay", Element::map }, { "relay", Element::map },
{ "reservation-mode", Element::string },
{ "reservation-modes", Element::map }, { "reservation-modes", Element::map },
{ "client-class", Element::string }, { "client-class", Element::string },
{ "require-client-classes", Element::list }, { "require-client-classes", Element::list },