From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 13 Jun 2019 17:36:35 +0000 (+0200)
Subject: [#642,!373] Check that it is possible to delete global param for server tag
X-Git-Tag: Kea-1.6.0-beta2~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b491c08506f6d3a2afc6ba590ead551246fbe53;p=thirdparty%2Fkea.git

[#642,!373] Check that it is possible to delete global param for server tag
---

diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
index fc1a808b7d..fda518dfee 100644
--- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
+++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
@@ -736,11 +736,25 @@ TEST_F(MySqlConfigBackendDHCPv4Test, globalParameters4WithServerTags) {
     EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
     EXPECT_EQ("all", returned_global->getServerTag());
 
+    // Attempt to delete global parameter for server1.
+    uint64_t deleted_num = 0;
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server1"),
+                                                                 "global"));
+    // No parameters should be deleted. In particular, the parameter for the logical
+    // server 'all' should not be deleted.
+    EXPECT_EQ(0, deleted_num);
+
+    // Deleting the existing value for server2 should succeed.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server2"),
+                                                                 "global"));
+    EXPECT_EQ(1, deleted_num);
+
     // Delete all servers, except 'all'.
-    EXPECT_NO_THROW(cbptr_->deleteAllServers4());
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteAllServers4());
     EXPECT_NO_THROW(
         returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::ALL())
     );
+    EXPECT_EQ(1, deleted_num);
     ASSERT_EQ(1, returned_globals.size());
     returned_global = *returned_globals.begin();
     // The common value for all servers should still be available because 'all'
diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
index e845a471bb..30e6331f82 100644
--- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
+++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
@@ -776,11 +776,25 @@ TEST_F(MySqlConfigBackendDHCPv6Test, globalParameters6WithServerTags) {
     EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
     EXPECT_EQ("all", returned_global->getServerTag());
 
+    // Attempt to delete global parameter for server1.
+    uint64_t deleted_num = 0;
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter6(ServerSelector::ONE("server1"),
+                                                                 "global"));
+    // No parameters should be deleted. In particular, the parameter for the logical
+    // server 'all' should not be deleted.
+    EXPECT_EQ(0, deleted_num);
+
+    // Deleting the existing value for server2 should succeed.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter6(ServerSelector::ONE("server2"),
+                                                                 "global"));
+    EXPECT_EQ(1, deleted_num);
+
     // Delete all servers, except 'all'.
     EXPECT_NO_THROW(cbptr_->deleteAllServers6());
     EXPECT_NO_THROW(
         returned_globals = cbptr_->getAllGlobalParameters6(ServerSelector::ALL())
     );
+    EXPECT_EQ(1, deleted_num);
     ASSERT_EQ(1, returned_globals.size());
     returned_global = *returned_globals.begin();
     // The common value for all servers should still be available because 'all'