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

[#1010] Modified AllocateEngine and parsers to store extended v6 lease info

Browse Source 
src/lib/dhcpsrv/alloc_engine.*
    AllocEngine::reuseExpiredLease()
    AllocEngine::createLease6()
    AllocEngine::extendLease6() - added call to AllocEngine::updateLase6ExtendedInfo()

    AllocEngine::updateLease4ExtendedInfo() - create Elements directly

    AllocEngine::updateLease6ExtendedInfo() - new method

src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc
    TEST_F(AllocEngine6ExtendedInfoTest, updateExtendedInfo6)
    TEST_F(AllocEngine6ExtendedInfoTest, storeExtendedInfoEnabled6)
    TEST_F(AllocEngine6ExtendedInfoTest, storeExtendedInfoDisabled6)
    TEST_F(AllocEngine6ExtendedInfoTest, reuseExpiredLease6)
    - new tests

src/lib/dhcpsrv/parsers/dhcp_parsers.cc
src/lib/dhcpsrv/parsers/shared_network_parser.cc
src/lib/dhcpsrv/parsers/base_network_parser.*
    Renamed BaseNetworkParser::parseCommonTimer() to parseCommon() and
    added handling of store-extended-info.

src/lib/dhcpsrv/parsers/simple_parser6.cc
    Added store-extended-info

src/lib/dhcpsrv/tests/cfg_shared_networks6_unittest.cc
src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
src/lib/dhcpsrv/tests/network_unittest.cc
src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc
    updated tests
This commit is contained in:
Thomas Markwalder
2020-03-31 16:17:43 -04:00
committed by Francis Dupont
parent 6b2e8eb4a7
commit 4d3cb9ab14
17 changed files with 655 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/dhcpsrv/parsers/base_network_parser.cc
View File

@@ -98,8 +98,8 @@ BaseNetworkParser::parseLifetime(const ConstElementPtr& scope,
}
void
BaseNetworkParser::parseCommonTimers(const ConstElementPtr& network_data,
NetworkPtr& network) {
BaseNetworkParser::parseCommon(const ConstElementPtr& network_data,
NetworkPtr& network) {
if (network_data->contains("renew-timer")) {
network->setT1(getInteger(network_data, "renew-timer"));
}
@@ -109,6 +109,11 @@ BaseNetworkParser::parseCommonTimers(const ConstElementPtr& network_data,
}
network->setValid(parseLifetime(network_data, "valid-lifetime"));
if (network_data->contains("store-extended-info")) {
network->setStoreExtendedInfo(getBoolean(network_data,
"store-extended-info"));
}
}
void