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

[#490,!284] Enable dynamic inheritance for networks in config file.

Browse Source
This commit is contained in:
Marcin Siodelski
2019-03-27 11:55:10 +01:00
parent 345bffe123
commit 8a21f443a6
6 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/dhcp4/json_config_parser.cc
View File

@@ -532,13 +532,14 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
continue;
}
// Timers are not used in the global scope. Their values are derived
// to specific subnets (see SimpleParser6::deriveParameters).
// decline-probation-period, dhcp4o6-port, echo-client-id,
// user-context are handled in global_parser.parse() which
// sets global parameters.
// match-client-id and authoritative are derived to subnet scope
// level.
// As of Kea 1.6.0 we have two ways of inheriting the global parameters.
// The old method is used in JSON configuration parsers when the global
// parameters are derived into the subnets and shared networks and are
// being treated as explicitly specified. The new way used by the config
// backend is the dynamic inheritance whereby each subnet and shared
// network uses a callback function to return global parameter if it
// is not specified at lower level. This callback uses configured globals.
// Let's store all globals there so as they can be accessed.
if ( (config_pair.first == "renew-timer") ||
(config_pair.first == "rebind-timer") ||
(config_pair.first == "valid-lifetime") ||
@@ -556,6 +557,9 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
(config_pair.first == "calculate-tee-times") ||
(config_pair.first == "t1-percent") ||
(config_pair.first == "t2-percent")) {
CfgMgr::instance().getStagingCfg()->addConfiguredGlobal(config_pair.first,
config_pair.second);
continue;
}

15
src/bin/dhcp6/json_config_parser.cc
View File

@@ -656,11 +656,14 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
continue;
}
// Timers are not used in the global scope. Their values are derived
// to specific subnets (see SimpleParser6::deriveParameters).
// decline-probation-period, dhcp4o6-port and user-context
// are handled in the global_parser.parse() which sets
// global parameters.
// As of Kea 1.6.0 we have two ways of inheriting the global parameters.
// The old method is used in JSON configuration parsers when the global
// parameters are derived into the subnets and shared networks and are
// being treated as explicitly specified. The new way used by the config
// backend is the dynamic inheritance whereby each subnet and shared
// network uses a callback function to return global parameter if it
// is not specified at lower level. This callback uses configured globals.
// Let's store all globals there so as they can be accessed.
if ( (config_pair.first == "renew-timer") ||
(config_pair.first == "rebind-timer") ||
(config_pair.first == "preferred-lifetime") ||
@@ -670,6 +673,8 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
(config_pair.first == "user-context") ||
(config_pair.first == "server-tag") ||
(config_pair.first == "reservation-mode")) {
CfgMgr::instance().getStagingCfg()->addConfiguredGlobal(config_pair.first,
config_pair.second);
continue;
}

4
src/lib/dhcpsrv/cb_ctl_dhcp4.cc
View File

@@ -59,7 +59,7 @@ CBControlDHCPv4::databaseConfigApply(const db::BackendSelector& backend_selector
for (auto network = networks.begin(); network != networks.end(); ++network) {
// In order to take advantage of the dynamic inheritance of global
// parameters to a shared network we need to set a callback function
// for each network which can be used to fetch global parameters.
// for each network to allow for fetching global parameters.
(*network)->setFetchGlobalsFn([] () -> ConstElementPtr {
return (CfgMgr::instance().getCurrentCfg()->getConfiguredGlobals());
});
@@ -75,7 +75,7 @@ CBControlDHCPv4::databaseConfigApply(const db::BackendSelector& backend_selector
for (auto subnet = subnets.begin(); subnet != subnets.end(); ++subnet) {
// In order to take advantage of the dynamic inheritance of global
// parameters to a subnet we need to set a callback function for each
// subnet which can be used to fetch global parameters.
// subnet to allow for fetching global parameters.
(*subnet)->setFetchGlobalsFn([] () -> ConstElementPtr {
return (CfgMgr::instance().getCurrentCfg()->getConfiguredGlobals());
});

7
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
View File

@@ -615,6 +615,13 @@ SubnetConfigParser::createSubnet(ConstElementPtr params) {
subnet_->setContext(user_context);
}
// In order to take advantage of the dynamic inheritance of global
// parameters to a subnet we need to set a callback function for each
// subnet to allow for fetching global parameters.
subnet_->setFetchGlobalsFn([]() -> ConstElementPtr {
return (CfgMgr::instance().getCurrentCfg()->getConfiguredGlobals());
});
}
//****************************** Subnet4ConfigParser *************************

15
src/lib/dhcpsrv/parsers/shared_network_parser.cc
View File

@@ -8,6 +8,7 @@
#include <asiolink/io_address.h>
#include <cc/data.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/cfg_option.h>
#include <dhcpsrv/parsers/dhcp_parsers.h>
#include <dhcpsrv/parsers/option_data_parser.h>
@@ -171,6 +172,13 @@ SharedNetwork4Parser::parse(const data::ConstElementPtr& shared_network_data) {
<< shared_network_data->getPosition() << ")");
}
// In order to take advantage of the dynamic inheritance of global
// parameters to a shared network we need to set a callback function
// for each shared network to allow for fetching global parameters.
shared_network->setFetchGlobalsFn([]() -> ConstElementPtr {
return (CfgMgr::instance().getCurrentCfg()->getConfiguredGlobals());
});
return (shared_network);
}
@@ -270,6 +278,13 @@ SharedNetwork6Parser::parse(const data::ConstElementPtr& shared_network_data) {
<< shared_network_data->getPosition() << ")");
}
// In order to take advantage of the dynamic inheritance of global
// parameters to a shared network we need to set a callback function
// for each shared network which can be used to fetch global parameters.
shared_network->setFetchGlobalsFn([]() -> ConstElementPtr {
return (CfgMgr::instance().getCurrentCfg()->getConfiguredGlobals());
});
return (shared_network);
}

8
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
View File

@@ -2371,6 +2371,8 @@ TEST_F(ParseConfigTest, defaultSubnet4) {
auto subnet = CfgMgr::instance().getStagingCfg()->getCfgSubnets4()->getSubnet(123);
ASSERT_TRUE(subnet);
EXPECT_TRUE(subnet->hasFetchGlobalsFn());
EXPECT_TRUE(subnet->getIface().unspecified());
EXPECT_TRUE(subnet->getIface().empty());
@@ -2440,6 +2442,8 @@ TEST_F(ParseConfigTest, defaultSubnet6) {
auto subnet = CfgMgr::instance().getStagingCfg()->getCfgSubnets6()->getSubnet(123);
ASSERT_TRUE(subnet);
EXPECT_TRUE(subnet->hasFetchGlobalsFn());
EXPECT_TRUE(subnet->getIface().unspecified());
EXPECT_TRUE(subnet->getIface().empty());
@@ -2492,6 +2496,8 @@ TEST_F(ParseConfigTest, defaultSharedNetwork4) {
CfgMgr::instance().getStagingCfg()->getCfgSharedNetworks4()->getByName("frog");
ASSERT_TRUE(network);
EXPECT_TRUE(network->hasFetchGlobalsFn());
EXPECT_TRUE(network->getIface().unspecified());
EXPECT_TRUE(network->getIface().empty());
@@ -2544,6 +2550,8 @@ TEST_F(ParseConfigTest, defaultSharedNetwork6) {
CfgMgr::instance().getStagingCfg()->getCfgSharedNetworks6()->getByName("frog");
ASSERT_TRUE(network);
EXPECT_TRUE(network->hasFetchGlobalsFn());
EXPECT_TRUE(network->getIface().unspecified());
EXPECT_TRUE(network->getIface().empty());