mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 05:27:55 +00:00
Code Issues Releases Wiki Activity

[738-kea4-crash-when-remote-network4-del-command-is-issued-with-subnets-action-delete] Addressed comments

Browse Source
This commit is contained in:
Francis Dupont 2019-07-18 11:22:42 +02:00
parent 7ad95788f5
commit dd599e7278
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
View File

@ -2941,7 +2941,7 @@ MySqlConfigBackendDHCPv4::deleteSharedNetworkSubnets4(const db::ServerSelector&
const std::string& shared_network_name) {
if (!server_selector.amAny()) {
isc_throw(InvalidOperation, "deleting all subnets from a shared "
"network is defined only using ANY server");
"network requires using ANY server selector");
}
LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4)
.arg(shared_network_name);

2
src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
View File

@ -3321,7 +3321,7 @@ MySqlConfigBackendDHCPv6::deleteSharedNetworkSubnets6(const db::ServerSelector&
const std::string& shared_network_name) {
if (!server_selector.amAny()) {
isc_throw(InvalidOperation, "deleting all subnets from a shared "
"network is defined only using ANY server");
"network requires using ANY server selector");
}
LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6)
.arg(shared_network_name);

13
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
View File

@ -2231,6 +2231,19 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getAllSharedNetworks4) {
EXPECT_EQ(0, cbptr_->deleteAllSharedNetworks4(ServerSelector::ONE("server1")));
// Delete first shared network with it subnets and verify it is gone.
// It requires ANY so verifies that all other choices throw.
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::UNASSIGNED(),
test_networks_[1]->getName()),
isc::InvalidOperation);
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ALL(),
test_networks_[1]->getName()),
isc::InvalidOperation);
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ONE("server1"),
test_networks_[1]->getName()),
isc::InvalidOperation);
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" }),
test_networks_[1]->getName()),
isc::InvalidOperation);
// Begin by its subnet.
EXPECT_EQ(1, cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ANY(),

13
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
View File

@ -2246,6 +2246,19 @@ TEST_F(MySqlConfigBackendDHCPv6Test, getAllSharedNetworks6) {
EXPECT_EQ(0, cbptr_->deleteAllSharedNetworks6(ServerSelector::ONE("server1")));
// Delete first shared network with it subnets and verify it is gone.
// It requires ANY so verifies that all other choices throw.
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets6(ServerSelector::UNASSIGNED(),
test_networks_[1]->getName()),
isc::InvalidOperation);
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets6(ServerSelector::ALL(),
test_networks_[1]->getName()),
isc::InvalidOperation);
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets6(ServerSelector::ONE("server1"),
test_networks_[1]->getName()),
isc::InvalidOperation);
EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets6(ServerSelector::MULTIPLE({ "server1", "server2" }),
test_networks_[1]->getName()),
isc::InvalidOperation);
// Begin by its subnet.
EXPECT_EQ(1, cbptr_->deleteSharedNetworkSubnets6(ServerSelector::ANY(),