From 5c0c5b0bd2d11f1a26cf496119b7876eea4fcbdd Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 12 Mar 2019 10:18:43 +0100 Subject: [PATCH] [512-fix-TestConfigBackendDHCPv4-deleteSharedNetworkSubnets4] Added a call to delAll() to detach subnets where deleting a shared network --- src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc | 4 ++++ src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc index d822eb37e8..1d959d235c 100644 --- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc +++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc @@ -385,6 +385,10 @@ uint64_t TestConfigBackendDHCPv4::deleteSharedNetwork4(const db::ServerSelector& /* server_selector */, const std::string& name) { auto& index = shared_networks_.get(); + auto network_it = index.find(name); + if (network_it != index.end()) { + (*network_it)->delAll(); + } return (index.erase(name)); } diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc index 33f9ff0fbb..e5b61da1cb 100644 --- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc +++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc @@ -404,6 +404,10 @@ uint64_t TestConfigBackendDHCPv6::deleteSharedNetwork6(const db::ServerSelector& /* server_selector */, const std::string& name) { auto& index = shared_networks_.get(); + auto network_it = index.find(name); + if (network_it != index.end()) { + (*network_it)->delAll(); + } return (index.erase(name)); } -- 2.47.2