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

[#2947] Extra updates

Browse Source
This commit is contained in:
Francis Dupont
2023-06-28 17:20:30 +02:00
parent a3c87ba5f4
commit e16ade899f
6 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View File

@@ -296,7 +296,7 @@ ControlledDhcpv4Srv::commandConfigGetHandler(const string&,
ConstElementPtr ConstElementPtr
ControlledDhcpv4Srv::commandConfigHashGetHandler(const string&, ControlledDhcpv4Srv::commandConfigHashGetHandler(const string&,
ConstElementPtr /*args*/) { ConstElementPtr /*args*/) {
ElementPtr config = CfgMgr::instance().getCurrentCfg()->toElement(); ConstElementPtr config = CfgMgr::instance().getCurrentCfg()->toElement();
string hash = BaseCommandMgr::getHash(config); string hash = BaseCommandMgr::getHash(config);

4
src/bin/dhcp4/tests/hooks_unittest.cc
View File

@@ -3273,8 +3273,8 @@ TEST_F(LoadUnloadDhcpv4SrvTest, Dhcpv4SrvConfigured) {
parseAnswer(status_code, answer); parseAnswer(status_code, answer);
if (parameters.empty()) { if (parameters.empty()) {
EXPECT_EQ(0, status_code); EXPECT_EQ(0, status_code);
EXPECT_EQ(answer->str(), "{ \"arguments\": { \"hash\": \"FA868B7A5983A80A83A7E9EFD8E" EXPECT_EQ(answer->str(), "{ \"arguments\": { \"hash\": \"C725E95F74A5BD2DC085B2F8A2877257"
"3DA4CC78B57A44817AEB9EF9DD6E4B9B0B116\" }, \"result\": 0, \"text\": " "1BE04E99F127D3D78439264071A315B1\" }, \"result\": 0, \"text\": "
"\"Configuration successful.\" }"); "\"Configuration successful.\" }");
} else { } else {
EXPECT_EQ(1, status_code); EXPECT_EQ(1, status_code);

2
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

@@ -299,7 +299,7 @@ ControlledDhcpv6Srv::commandConfigGetHandler(const string&,
ConstElementPtr ConstElementPtr
ControlledDhcpv6Srv::commandConfigHashGetHandler(const string&, ControlledDhcpv6Srv::commandConfigHashGetHandler(const string&,
ConstElementPtr /*args*/) { ConstElementPtr /*args*/) {
ElementPtr config = CfgMgr::instance().getCurrentCfg()->toElement(); ConstElementPtr config = CfgMgr::instance().getCurrentCfg()->toElement();
string hash = BaseCommandMgr::getHash(config); string hash = BaseCommandMgr::getHash(config);
ElementPtr params = Element::createMap(); ElementPtr params = Element::createMap();

4
src/bin/dhcp6/tests/hooks_unittest.cc
View File

@@ -5675,8 +5675,8 @@ TEST_F(LoadUnloadDhcpv6SrvTest, Dhcpv6SrvConfigured) {
if (parameters.empty()) { if (parameters.empty()) {
EXPECT_EQ(0, status_code); EXPECT_EQ(0, status_code);
EXPECT_EQ(answer->str(), "{ \"arguments\": { \"hash\": \"AF30DC19D03AB71CB5AB6A77C0B8D" EXPECT_EQ(answer->str(), "{ \"arguments\": { \"hash\": \"A6695A043B32703BA06D981929076F1C"
"2B4D8C5F5A939D7457DF723CBFB09F80744\" }, \"result\": 0, \"text\": " "94DEC0CF414E45AF146CEF5B50DB3EAA\" }, \"result\": 0, \"text\": "
"\"Configuration successful.\" }"); "\"Configuration successful.\" }");
} else { } else {
EXPECT_EQ(1, status_code); EXPECT_EQ(1, status_code);

6
src/lib/config/base_command_mgr.cc
View File

@@ -193,6 +193,11 @@ BaseCommandMgr::listCommandsHandler(const std::string& /* name */,
std::string std::string
BaseCommandMgr::getHash(const isc::data::ConstElementPtr& config) { BaseCommandMgr::getHash(const isc::data::ConstElementPtr& config) {
// Sanity.
if (!config) {
isc_throw(Unexpected, "BaseCommandMgr::getHash called with null");
}
// First, get the string representation. // First, get the string representation.
std::string config_txt = config->str(); std::string config_txt = config->str();
isc::util::OutputBuffer hash_data(0); isc::util::OutputBuffer hash_data(0);
@@ -213,6 +218,5 @@ BaseCommandMgr::getHash(const isc::data::ConstElementPtr& config) {
return (isc::util::encode::encodeHex(hash)); return (isc::util::encode::encodeHex(hash));
} }
} // namespace isc::config } // namespace isc::config
} // namespace isc } // namespace isc

9
src/lib/process/d_controller.cc
View File

@@ -462,7 +462,7 @@ DControllerBase::configGetHandler(const std::string&,
ConstElementPtr ConstElementPtr
DControllerBase::configHashGetHandler(const std::string&, DControllerBase::configHashGetHandler(const std::string&,
ConstElementPtr /*args*/) { ConstElementPtr /*args*/) {
ElementPtr config = process_->getCfgMgr()->getContext()->toElement(); ConstElementPtr config = process_->getCfgMgr()->getContext()->toElement();
std::string hash = BaseCommandMgr::getHash(config); std::string hash = BaseCommandMgr::getHash(config);
ElementPtr params = Element::createMap(); ElementPtr params = Element::createMap();
params->set("hash", Element::create(hash)); params->set("hash", Element::create(hash));
@@ -650,6 +650,13 @@ DControllerBase::configSetHandler(const std::string&, ConstElementPtr args) {
ConstElementPtr answer = updateConfig(module_config); ConstElementPtr answer = updateConfig(module_config);
int rcode = 0; int rcode = 0;
parseAnswer(rcode, answer); parseAnswer(rcode, answer);
// When succeeded append the SHA256 hash of the config that
// was just set to the response.
if (rcode == CONTROL_RESULT_SUCCESS) {
// @todo
}
// In all cases the right logging configuration is in the context. // In all cases the right logging configuration is in the context.
process_->getCfgMgr()->getContext()->applyLoggingCfg(); process_->getCfgMgr()->getContext()->applyLoggingCfg();
return (answer); return (answer);