Commit d5965863 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3409] Addressed review comments.

parent dc69d955
...@@ -561,6 +561,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) { ...@@ -561,6 +561,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator option_config = std::map<std::string, ConstElementPtr>::const_iterator option_config =
values_map.find("option-data"); values_map.find("option-data");
if (option_config != values_map.end()) { if (option_config != values_map.end()) {
config_pair.first = "option-data";
option_parser->build(option_config->second); option_parser->build(option_config->second);
option_parser->commit(); option_parser->commit();
} }
...@@ -569,6 +570,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) { ...@@ -569,6 +570,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator subnet_config = std::map<std::string, ConstElementPtr>::const_iterator subnet_config =
values_map.find("subnet4"); values_map.find("subnet4");
if (subnet_config != values_map.end()) { if (subnet_config != values_map.end()) {
config_pair.first = "subnet4";
subnet_parser->build(subnet_config->second); subnet_parser->build(subnet_config->second);
} }
......
...@@ -773,6 +773,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) { ...@@ -773,6 +773,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator option_config = std::map<std::string, ConstElementPtr>::const_iterator option_config =
values_map.find("option-data"); values_map.find("option-data");
if (option_config != values_map.end()) { if (option_config != values_map.end()) {
config_pair.first = "option-data";
option_parser->build(option_config->second); option_parser->build(option_config->second);
option_parser->commit(); option_parser->commit();
} }
...@@ -781,6 +782,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) { ...@@ -781,6 +782,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
std::map<std::string, ConstElementPtr>::const_iterator subnet_config = std::map<std::string, ConstElementPtr>::const_iterator subnet_config =
values_map.find("subnet6"); values_map.find("subnet6");
if (subnet_config != values_map.end()) { if (subnet_config != values_map.end()) {
config_pair.first = "subnet6";
subnet_parser->build(subnet_config->second); subnet_parser->build(subnet_config->second);
} }
......
...@@ -15,10 +15,11 @@ if HAVE_GTEST ...@@ -15,10 +15,11 @@ if HAVE_GTEST
noinst_LTLIBRARIES = libdhcpsrvtest.la noinst_LTLIBRARIES = libdhcpsrvtest.la
libdhcpsrvtest_la_SOURCES = config_result_check.cc config_result_check.h libdhcpsrvtest_la_SOURCES = config_result_check.cc config_result_check.h
libdhcpsrvtest_la_CXXFLAGS = $(AM_CXXFLAGS) libdhcpsrvtest_la_CXXFLAGS = $(AM_CXXFLAGS)
libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS) libdhcpsrvtest_la_CPPFLAGS = $(AM_CPPFLAGS)
libdhcpsrvtest_la_LDFLAGS = $(AM_LDFLAGS) libdhcpsrvtest_la_LDFLAGS = $(AM_LDFLAGS)
libdhcpsrvtest_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libdhcpsrvtest_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la
libdhcpsrvtest_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
endif endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment