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

[4204] Remove runtime option defs if "option-def" is not in config.

Browse Source
This commit is contained in:
Marcin Siodelski
2015-11-25 16:44:46 +01:00
parent e9bcac1d00
commit 3f53001245
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,6 +515,9 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
// Revert any runtime option definitions configured so far and not committed. // Revert any runtime option definitions configured so far and not committed.
LibDHCP::revertRuntimeOptionDefs(); LibDHCP::revertRuntimeOptionDefs();
// Let's set empty container in case a user hasn't specified any configuration
// for option definitions. This is equivalent to commiting empty container.
LibDHCP::setRuntimeOptionDefs(OptionDefSpaceContainer());
// Some of the values specified in the configuration depend on // Some of the values specified in the configuration depend on
// other values. Typically, the values in the subnet4 structure // other values. Typically, the values in the subnet4 structure

15
src/bin/dhcp4/tests/config_parser_unittest.cc
View File

@@ -1346,6 +1346,11 @@ TEST_F(Dhcp4ParserTest, optionDefIpv4Address) {
ASSERT_TRUE(status); ASSERT_TRUE(status);
checkResult(status, 0); checkResult(status, 0);
// We need to commit option definitions because later in this test we
// will be checking if they get removed when "option-def" parameter
// is removed from a configuration.
LibDHCP::commitRuntimeOptionDefs();
// The option definition should now be available in the CfgMgr. // The option definition should now be available in the CfgMgr.
def = CfgMgr::instance().getStagingCfg()->getCfgOptionDef()->get("isc", 100); def = CfgMgr::instance().getStagingCfg()->getCfgOptionDef()->get("isc", 100);
ASSERT_TRUE(def); ASSERT_TRUE(def);
@@ -1365,6 +1370,16 @@ TEST_F(Dhcp4ParserTest, optionDefIpv4Address) {
// be equal. // be equal.
EXPECT_TRUE(def_libdhcp != def); EXPECT_TRUE(def_libdhcp != def);
EXPECT_TRUE(*def_libdhcp == *def); EXPECT_TRUE(*def_libdhcp == *def);
// Let's apply empty configuration. This removes the option definitions
// configuration and should result in removal of the option 100 from the
// libdhcp++.
config = "{ }";
json = Element::fromJSON(config);
ASSERT_NO_THROW(status = configureDhcp4Server(*srv_, json));
checkResult(status, 0);
EXPECT_FALSE(LibDHCP::getRuntimeOptionDef("isc", 100));
} }
// The goal of this test is to check whether an option definition // The goal of this test is to check whether an option definition

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

@@ -754,6 +754,9 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
// Revert any runtime option definitions configured so far and not committed. // Revert any runtime option definitions configured so far and not committed.
LibDHCP::revertRuntimeOptionDefs(); LibDHCP::revertRuntimeOptionDefs();
// Let's set empty container in case a user hasn't specified any configuration
// for option definitions. This is equivalent to commiting empty container.
LibDHCP::setRuntimeOptionDefs(OptionDefSpaceContainer());
// Some of the values specified in the configuration depend on // Some of the values specified in the configuration depend on
// other values. Typically, the values in the subnet6 structure // other values. Typically, the values in the subnet6 structure

16
src/bin/dhcp6/tests/config_parser_unittest.cc
View File

@@ -1583,6 +1583,12 @@ TEST_F(Dhcp6ParserTest, optionDefIpv6Address) {
ConstElementPtr status; ConstElementPtr status;
EXPECT_NO_THROW(status = configureDhcp6Server(srv_, json)); EXPECT_NO_THROW(status = configureDhcp6Server(srv_, json));
ASSERT_TRUE(status); ASSERT_TRUE(status);
checkResult(status, 0);
// We need to commit option definitions because later in this test we
// will be checking if they get removed when "option-def" parameter
// is removed from a configuration.
LibDHCP::commitRuntimeOptionDefs();
// The option definition should now be available in the CfgMgr. // The option definition should now be available in the CfgMgr.
def = CfgMgr::instance().getStagingCfg()->getCfgOptionDef()->get("isc", 100); def = CfgMgr::instance().getStagingCfg()->getCfgOptionDef()->get("isc", 100);
@@ -1602,6 +1608,16 @@ TEST_F(Dhcp6ParserTest, optionDefIpv6Address) {
// be equal. // be equal.
EXPECT_TRUE(def_libdhcp != def); EXPECT_TRUE(def_libdhcp != def);
EXPECT_TRUE(*def_libdhcp == *def); EXPECT_TRUE(*def_libdhcp == *def);
// Let's apply empty configuration. This removes the option definitions
// configuration and should result in removal of the option 100 from the
// libdhcp++.
config = "{ }";
json = Element::fromJSON(config);
ASSERT_NO_THROW(status = configureDhcp6Server(srv_, json));
checkResult(status, 0);
EXPECT_FALSE(LibDHCP::getRuntimeOptionDef("isc", 100));
} }
// The goal of this test is to check whether an option definition // The goal of this test is to check whether an option definition