From 472f15da68fe8a33fb1a3a9ee6f67072c4af3f49 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Sat, 13 Oct 2018 13:21:47 +0200 Subject: [PATCH] [#93,!63] Resolve conflicts after rebase. --- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc | 10 +++++----- .../dhcp/mysql_cb/tests/mysql_cb_dhcp4_mgr_unittest.cc | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index df4f0408cf..12ce0aaea3 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -156,7 +156,7 @@ public: /// /// @return Pointer to the retrieved value or null if such parameter /// doesn't exist. - StampedValuePtr getGlobalParameter4(const ServerSelector& /* server_selector */, + StampedValuePtr getGlobalParameter4(const ServerSelector& server_selector, const std::string& name) { StampedValueCollection parameters; @@ -178,7 +178,7 @@ public: /// @param server_selector Server selector. /// @param name Name of the global parameter. /// @param value Value of the global parameter. - void createUpdateGlobalParameter4(const db::ServerSelector& /* server_selector */, + void createUpdateGlobalParameter4(const db::ServerSelector& server_selector, const StampedValuePtr& value) { MySqlTransaction transaction(conn_); @@ -2697,7 +2697,7 @@ MySqlConfigBackendDHCPv4::getGlobalParameter4(const ServerSelector& server_selec } StampedValueCollection -MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& /* server_selector */) const { +MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& server_selector) const { StampedValueCollection parameters; auto tags = impl_->getServerTags(server_selector); @@ -2711,7 +2711,7 @@ MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& /* serve StampedValueCollection MySqlConfigBackendDHCPv4:: -getModifiedGlobalParameters4(const db::ServerSelector& /* server_selector */, +getModifiedGlobalParameters4(const db::ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const { StampedValueCollection parameters; @@ -2859,7 +2859,7 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, } uint64_t -MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& /*server_selector*/, +MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& server_selector, const std::string& name) { return (impl_->deleteFromTable(MySqlConfigBackendDHCPv4Impl::DELETE_GLOBAL_PARAMETER4, server_selector, name)); diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_mgr_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_mgr_unittest.cc index efbf713367..8aa67e809a 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_mgr_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_mgr_unittest.cc @@ -63,11 +63,11 @@ TEST_F(MySqlConfigBackendDHCPv4MgrTest, factoryRegistration) { // Should be able to create a global parameter. StampedValuePtr server_tag = StampedValue::create("server-tag", "whale"); - ASSERT_NO_THROW(mgr.getPool()->createUpdateGlobalParameter4(mysql, ServerSelector::UNASSIGNED(), + ASSERT_NO_THROW(mgr.getPool()->createUpdateGlobalParameter4(mysql, ServerSelector::ALL(), server_tag)); // Verify parameter can be fetched. server_tag.reset(); - ASSERT_NO_THROW(server_tag = mgr.getPool()->getGlobalParameter4(mysql, ServerSelector::UNASSIGNED(), + ASSERT_NO_THROW(server_tag = mgr.getPool()->getGlobalParameter4(mysql, ServerSelector::ALL(), "server-tag")); ASSERT_TRUE(server_tag); EXPECT_EQ("server-tag", server_tag->getName()); @@ -80,7 +80,7 @@ TEST_F(MySqlConfigBackendDHCPv4MgrTest, factoryRegistration) { ASSERT_THROW(mgr.addBackend(validMySQLConnectionString()), InvalidType); // Attempting to read the global parameter should fail. - ASSERT_THROW(mgr.getPool()->getGlobalParameter4(mysql, ServerSelector::UNASSIGNED(), "server-tag"), + ASSERT_THROW(mgr.getPool()->getGlobalParameter4(mysql, ServerSelector::ALL(), "server-tag"), NoSuchDatabase); } -- 2.47.2