• Thomas Markwalder's avatar
    [#399,!215] kea-dhcp4 now merges in config backend shared netwokrs · 6dc4c06c
    Thomas Markwalder authored
    src/lib/dhcpsrv/cfg_shared_networks.*
        CfgSharedNetworks4::merge() - new method to merge
        shared network configs
    
    src/lib/dhcpsrv/cfg_subnets4.*
        CfgSubnets4::merge() - reworked to reflect new rules
    
    src/lib/dhcpsrv/srv_config.cc
        SrvConfig::merge() - now merges shared networks
    
    src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
        checkMergedSubnet() - convenience function for
        verifying subnet content
    
        TEST(CfgSubnets4Test, mergeSubnets) - revamped to
        reflect new network assigment rules
    
    src/bin/dhcp4/tests/config_backend_unittest.cc
        TEST_F(Dhcp4CBTest, mergeSharedNetworks)  - enabled test
    6dc4c06c
cfg_subnets4.cc 16.9 KB