-
Thomas Markwalder authored
Server fetches config, populates external SrvConfig and invokes merge. libdhcpsrv still lacks merging of globals,opt defs,options, and shared networks. src/bin/dhcp4/json_config_parser.* configureDhcp4Server() - restored call to databaseConfigFetch() databaseConfigFetch(const SrvConfigPtr& srv_cfg) - completed implementation, now fetches external config and invokes merge addGlobalsToConfig() handleExplicitGlobal() handleImplicitGlobal() - new functions for populating external config globals with backend globals src/bin/dhcp4/tests config_backend_unittest.cc - new file that tests config fetch and merge src/lib/cc/stamped_value.* StampedValue::toElement(Element::types elem_type) - new method for creating Elements from StampedValues src/lib/cc/tests/stamped_value_unittest.cc TEST(StampedValueTest, toElement) - new test src/lib/dhcpsrv/testutils/test_config_backend.h TestConfigBackend() - fixed host_ assignment
dc74694d