From: Francis Dupont <fdupont@isc.org>
Date: Tue, 12 Mar 2019 09:18:43 +0000 (+0100)
Subject: [512-fix-TestConfigBackendDHCPv4-deleteSharedNetworkSubnets4] Added a call to delAll... 
X-Git-Tag: Kea-1.6.0-beta~393
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2F512-fix-TestConfigBackendDHCPv4-deleteSharedNetworkSubnets4;p=thirdparty%2Fkea.git

[512-fix-TestConfigBackendDHCPv4-deleteSharedNetworkSubnets4] Added a call to delAll() to detach subnets where deleting a shared network
---

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<SharedNetworkNameIndexTag>();
+    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<SharedNetworkNameIndexTag>();
+    auto network_it = index.find(name);
+    if (network_it != index.end()) {
+        (*network_it)->delAll();
+    }
     return (index.erase(name));
 }