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

[#93,!63] Server selection is partially supported for options.

Browse Source 
Also, MySQL prepared statements are moved to a common header.
This commit is contained in:
Marcin Siodelski
2018-10-16 14:44:02 +02:00
parent 20858243fb
commit 15c6f45007
6 changed files with 817 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/hooks/dhcp/mysql_cb/Makefile.am
View File

@@ -27,6 +27,7 @@ noinst_LTLIBRARIES = libmysqlcb.la
libmysqlcb_la_SOURCES = mysql_cb_callouts.cc
libmysqlcb_la_SOURCES += mysql_cb_dhcp4.cc mysql_cb_dhcp4.h
libmysqlcb_la_SOURCES += mysql_cb_impl.cc mysql_cb_impl.h
libmysqlcb_la_SOURCES += mysql_query_macros_dhcp.h
libmysqlcb_la_SOURCES += version.cc
nodist_libmysqlcb_la_SOURCES = mysql_cb_messages.cc mysql_cb_messages.h

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

File diff suppressed because it is too large Load Diff

49
src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc
View File

@@ -15,7 +15,6 @@
#include <mysql.h>
#include <mysqld_error.h>
#include <cstdint>
#include <sstream>
#include <utility>
using namespace isc::cb;
@@ -68,36 +67,6 @@ MySqlConfigBackendImpl::~MySqlConfigBackendImpl() {
}
}
std::set<std::string>
MySqlConfigBackendImpl::getServerTags(const ServerSelector& server_selector) const {
std::set<std::string> tags;
switch (server_selector.getType()) {
case ServerSelector::Type::ALL:
tags.insert("all");
return (tags);
default:
return (server_selector.getTags());
}
// Unassigned server case.
return (tags);
}
std::string
MySqlConfigBackendImpl::getServerTagsAsText(const db::ServerSelector& server_selector) const {
std::ostringstream s;
auto server_tags = getServerTags(server_selector);
for (auto tag : server_tags) {
if (s.tellp() != 0) {
s << ", ";
}
s << tag;
}
return (s.str());
}
uint64_t
MySqlConfigBackendImpl::deleteFromTable(const int index) {
MySqlBindingCollection in_bindings;
@@ -114,19 +83,15 @@ MySqlConfigBackendImpl::deleteFromTable(const int index, const std::string& key)
uint64_t
MySqlConfigBackendImpl::deleteFromTable(const int index,
const ServerSelector& server_selector) {
uint64_t deleted_entries = 0;
const ServerSelector& server_selector,
const std::string& operation) {
auto tag = getServerTag(server_selector, operation);
auto tags = getServerTags(server_selector);
for (auto tag : tags) {
MySqlBindingCollection in_bindings = {
MySqlBinding::createString(tag)
};
MySqlBindingCollection in_bindings = {
MySqlBinding::createString(tag)
};
deleted_entries += conn_.updateDeleteQuery(index, in_bindings);
}
return (deleted_entries);
return (conn_.updateDeleteQuery(index, in_bindings));
}
void

86
src/hooks/dhcp/mysql_cb/mysql_cb_impl.h
View File

@@ -16,6 +16,7 @@
#include <mysql/mysql_binding.h>
#include <mysql/mysql_connection.h>
#include <set>
#include <sstream>
#include <string>
namespace isc {
@@ -41,13 +42,60 @@ public:
///
/// @param server_selector Server selector.
/// @return Set of server tags.
std::set<std::string> getServerTags(const db::ServerSelector& server_selector) const;
std::set<std::string> getServerTags(const db::ServerSelector& server_selector) const {
std::set<std::string> tags;
switch (server_selector.getType()) {
case db::ServerSelector::Type::ALL:
tags.insert("all");
return (tags);
default:
return (server_selector.getTags());
}
// Unassigned server case.
return (tags);
}
/// @brief Returns server tag associated with the particular selector.
///
/// This method expects that there is exactly one server tag associated with
/// the server selector.
///
/// @param server_selector Server selector.
/// @param operation Operation which results in calling this function. This is
/// used for error reporting purposes.
/// @return Server tag.
/// @throw InvalidOperation if the server selector is unassigned or if there
/// is more than one server tag associated with the selector.
std::string getServerTag(const db::ServerSelector& server_selector,
const std::string& operation) const {
auto tags = getServerTags(server_selector);
if (tags.size() != 1) {
isc_throw(InvalidOperation, "expected exactly one server tag to be specified"
" while " << operation << ". Got: "
<< getServerTagsAsText(server_selector));
}
return (*tags.begin());
}
/// @brief Returns server tags associated with the particular selector
/// as text.
///
/// This method is useful for logging purposes.
std::string getServerTagsAsText(const db::ServerSelector& server_selector) const;
std::string getServerTagsAsText(const db::ServerSelector& server_selector) const {
std::ostringstream s;
auto server_tags = getServerTags(server_selector);
for (auto tag : server_tags) {
if (s.tellp() != 0) {
s << ", ";
}
s << tag;
}
return (s.str());
}
/// @brief Sends query to delete rows from a table.
///
@@ -68,9 +116,12 @@ public:
///
/// @param index Index of the statement to be executed.
/// @param server_selector Server selector.
/// @param operation Operation which results in calling this function. This is
/// used for error reporting purposes.
/// @return Number of deleted rows.
uint64_t deleteFromTable(const int index,
const db::ServerSelector& server_selector);
const db::ServerSelector& server_selector,
const std::string& operation);
/// @brief Sends query to delete rows from a table.
///
@@ -79,33 +130,34 @@ public:
///
/// @param index Index of the statement to be executed.
/// @param server_selector Server selector.
/// @param operation Operation which results in calling this function. This is
/// used for error reporting purposes.
/// @param key Value to be used as input binding to the delete
/// statement. The default value is empty which indicates that the
/// key should not be used in the query.
/// @return Number of deleted rows.
/// @throw InvalidOperation if the server selector is unassigned or
/// if there are more than one server tags associated with the
/// server selector.
template<typename KeyType>
uint64_t deleteFromTable(const int index,
const db::ServerSelector& server_selector,
const std::string& operation,
KeyType key) {
uint64_t deleted_entries = 0;
auto tag = getServerTag(server_selector, operation);
auto tags = getServerTags(server_selector);
for (auto tag : tags) {
db::MySqlBindingCollection in_bindings = {
db::MySqlBinding::createString(tag)
};
db::MySqlBindingCollection in_bindings = {
db::MySqlBinding::createString(tag)
};
if (db::MySqlBindingTraits<KeyType>::column_type == MYSQL_TYPE_STRING) {
in_bindings.push_back(db::MySqlBinding::createString(key));
if (db::MySqlBindingTraits<KeyType>::column_type == MYSQL_TYPE_STRING) {
in_bindings.push_back(db::MySqlBinding::createString(key));
} else {
in_bindings.push_back(db::MySqlBinding::createInteger<KeyType>(key));
}
deleted_entries += conn_.updateDeleteQuery(index, in_bindings);
} else {
in_bindings.push_back(db::MySqlBinding::createInteger<KeyType>(key));
}
return (deleted_entries);
return (conn_.updateDeleteQuery(index, in_bindings));
}
/// @brief Sends query to the database to retrieve multiple option

420
src/hooks/dhcp/mysql_cb/mysql_query_macros_dhcp.h Normal file
View File

@@ -0,0 +1,420 @@
// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#ifndef MYSQL_QUERY_MACROS_DHCP_H
#define MYSQL_QUERY_MACROS_DHCP_H
/// @file mysql_query_macros_dhcp.h
/// Collection of common macros defining MySQL prepared statements used
/// to manage Kea DHCP configuration in the database.
///
/// Some of the macros are DHCPv4 specific, other are DHCPv6 specific.
/// Some macros are common for both DHCP server types. The first
/// parameter @c table_prefix should be set to @c dhcp4 or @c dhcp6,
/// depending which DHCP server type it relates to. Provided value
/// is used as a prefix for MySQL table names. For example, if the
/// prefix is set to @c dhcp4, the table name referred to in the
/// query may be dhcp4_subnet etc. The second argument in the variadic
/// macro is a part of the WHERE clause in the MySQL query. The fixed
/// part of the WHERE clause is included in the macro.
namespace isc {
namespace dhcp {
namespace {
#ifndef MYSQL_GET_GLOBAL_PARAMETER
#define MYSQL_GET_GLOBAL_PARAMETER(table_prefix, ...) \
"SELECT" \
" g.id," \
" g.name," \
" g.value," \
" g.modification_ts " \
"FROM " #table_prefix "_global_parameter AS g " \
"INNER JOIN " #table_prefix "_global_parameter_server AS a " \
" ON g.id = a.parameter_id " \
"INNER JOIN " #table_prefix "_server AS s " \
" ON (a.server_id = s.id) OR (a.server_id = 1) " \
"WHERE (s.tag = ? OR s.id = 1) " #__VA_ARGS__ \
" ORDER BY g.id"
#endif
#ifndef MYSQL_SUBNET_GET
#define MYSQL_GET_SUBNET4(...) \
"SELECT" \
" s.subnet_id," \
" s.subnet_prefix," \
" s.4o6_interface," \
" s.4o6_interface_id," \
" s.4o6_subnet," \
" s.boot_file_name," \
" s.client_class," \
" s.interface," \
" s.match_client_id," \
" s.modification_ts," \
" s.next_server," \
" s.rebind_timer," \
" s.relay," \
" s.renew_timer," \
" s.require_client_classes," \
" s.reservation_mode," \
" s.server_hostname," \
" s.shared_network_name," \
" s.user_context," \
" s.valid_lifetime," \
" p.id," \
" p.start_address," \
" p.end_address," \
" p.subnet_id," \
" p.modification_ts," \
" x.option_id," \
" x.code," \
" x.value," \
" x.formatted_value," \
" x.space," \
" x.persistent," \
" x.dhcp4_subnet_id," \
" x.scope_id," \
" x.user_context," \
" x.shared_network_name," \
" x.pool_id," \
" x.modification_ts," \
" o.option_id," \
" o.code," \
" o.value," \
" o.formatted_value," \
" o.space," \
" o.persistent," \
" o.dhcp4_subnet_id," \
" o.scope_id," \
" o.user_context," \
" o.shared_network_name," \
" o.pool_id," \
" o.modification_ts " \
"FROM dhcp4_subnet AS s " \
"INNER JOIN dhcp4_subnet_server AS a " \
" ON s.subnet_id = a.subnet_id " \
"INNER JOIN dhcp4_server AS srv " \
" ON (a.server_id = srv.id) OR (a.server_id = 1) " \
"LEFT JOIN dhcp4_pool AS p ON s.subnet_id = p.subnet_id " \
"LEFT JOIN dhcp4_options AS x ON x.scope_id = 5 AND p.id = x.pool_id " \
"LEFT JOIN dhcp4_options AS o ON o.scope_id = 1 AND s.subnet_id = o.dhcp4_subnet_id " \
"WHERE (srv.tag = ? OR srv.id = 1) " #__VA_ARGS__ \
" ORDER BY s.subnet_id, p.id, x.option_id, o.option_id"
#endif
#ifndef MYSQL_GET_SHARED_NETWORK4
#define MYSQL_GET_SHARED_NETWORK4(...) \
"SELECT" \
" n.id," \
" n.name," \
" n.client_class," \
" n.interface," \
" n.match_client_id," \
" n.modification_ts," \
" n.rebind_timer," \
" n.relay," \
" n.renew_timer," \
" n.require_client_classes," \
" n.reservation_mode," \
" n.user_context," \
" n.valid_lifetime," \
" o.option_id," \
" o.code," \
" o.value," \
" o.formatted_value," \
" o.space," \
" o.persistent," \
" o.dhcp4_subnet_id," \
" o.scope_id," \
" o.user_context," \
" o.shared_network_name," \
" o.pool_id," \
" o.modification_ts " \
"FROM dhcp4_shared_network AS n " \
"INNER JOIN dhcp4_shared_network_server AS a " \
" ON n.id = a.shared_network_id " \
"INNER JOIN dhcp4_server AS s " \
" ON (a.server_id = s.id) OR (a.server_id = 1) " \
"LEFT JOIN dhcp4_options AS o ON o.scope_id = 4 AND n.name = o.shared_network_name " \
"WHERE (s.tag = ? OR s.id = 1) " #__VA_ARGS__ \
" ORDER BY n.id, o.option_id"
#endif
#ifndef MYSQL_GET_OPTION_DEF
#define MYSQL_GET_OPTION_DEF(table_prefix, ...) \
"SELECT" \
" d.id," \
" d.code," \
" d.name," \
" d.space," \
" d.type," \
" d.modification_ts," \
" d.array," \
" d.encapsulate," \
" d.record_types," \
" d.user_context " \
"FROM " #table_prefix "_option_def AS d " \
"INNER JOIN " #table_prefix "_option_def_server AS a" \
" ON d.id = a.option_def_id " \
"INNER JOIN " #table_prefix "_server AS s " \
" ON (a.server_id = s.id) OR (a.server_id = 1) " \
"WHERE (s.tag = ? OR s.id = 1) " #__VA_ARGS__ \
" ORDER BY d.id"
#endif
#ifndef MYSQL_GET_OPTION
#define MYSQL_GET_OPTION(table_prefix, ...) \
"SELECT" \
" o.option_id," \
" o.code," \
" o.value," \
" o.formatted_value," \
" o.space," \
" o.persistent," \
" o.dhcp4_subnet_id," \
" o.scope_id," \
" o.user_context," \
" o.shared_network_name," \
" o.pool_id," \
" o.modification_ts " \
"FROM " #table_prefix "_options AS o " \
"INNER JOIN " #table_prefix "_options_server AS a" \
" ON o.option_id = a.option_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON a.server_id = s.id " \
"WHERE (s.tag = ? OR s.id = 1) " #__VA_ARGS__ \
" ORDER BY o.option_id"
#endif
#ifndef MYSQL_INSERT_GLOBAL_PARAMETER
#define MYSQL_INSERT_GLOBAL_PARAMETER(table_prefix) \
"INSERT INTO " #table_prefix "_global_parameter(" \
" name," \
" value," \
" modification_ts" \
") VALUES (?, ?, ?)"
#endif
#ifndef MYSQL_INSERT_GLOBAL_PARAMETER_SERVER
#define MYSQL_INSERT_GLOBAL_PARAMETER_SERVER(table_prefix) \
"INSERT INTO " #table_prefix "_global_parameter_server(" \
" parameter_id," \
" server_id," \
" modification_ts" \
") VALUES (?, (SELECT id FROM " #table_prefix "_server WHERE tag = ?), ?)"
#endif
#ifndef MYSQL_INSERT_SUBNET_SERVER
#define MYSQL_INSERT_SUBNET_SERVER(table_prefix) \
"INSERT INTO " #table_prefix "_subnet_server(" \
" subnet_id," \
" server_id," \
" modification_ts" \
") VALUES (?, (SELECT id FROM " #table_prefix "_server WHERE tag = ?), ?)"
#endif
#ifndef MYSQL_INSERT_POOL
#define MYSQL_INSERT_POOL(table_prefix) \
"INSERT INTO " #table_prefix "_pool(" \
" start_address," \
" end_address," \
" subnet_id," \
" modification_ts" \
") VALUES (?, ?, ?, ?)"
#endif
#ifndef MYSQL_INSERT_SHARED_NETWORK_SERVER
#define MYSQL_INSERT_SHARED_NETWORK_SERVER(table_prefix) \
"INSERT INTO " #table_prefix "_shared_network_server(" \
" shared_network_id," \
" server_id," \
" modification_ts" \
") VALUES (" \
" (SELECT id FROM " #table_prefix "_shared_network WHERE name = ?)," \
" (SELECT id FROM " #table_prefix "_server WHERE tag = ?), ?" \
")"
#endif
#ifndef MYSQL_INSERT_OPTION_DEF
#define MYSQL_INSERT_OPTION_DEF(table_prefix) \
"INSERT INTO " #table_prefix "_option_def (" \
" code," \
" name," \
" space," \
" type," \
" modification_ts," \
" array," \
" encapsulate," \
" record_types," \
" user_context" \
") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"
#endif
#ifndef MYSQL_INSERT_OPTION_DEF_SERVER
#define MYSQL_INSERT_OPTION_DEF_SERVER(table_prefix) \
"INSERT INTO " #table_prefix "_option_def_server(" \
" option_def_id," \
" server_id," \
" modification_ts" \
") VALUES (?, (SELECT id FROM " #table_prefix "_server WHERE tag = ?), ?)"
#endif
#ifndef MYSQL_INSERT_OPTION
#define MYSQL_INSERT_OPTION(table_prefix) \
"INSERT INTO " #table_prefix "_options (" \
" code," \
" value," \
" formatted_value," \
" space," \
" persistent," \
" dhcp_client_class," \
" " #table_prefix "_subnet_id," \
" scope_id," \
" user_context," \
" shared_network_name," \
" pool_id," \
" modification_ts" \
") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
#endif
#ifndef MYSQL_INSERT_OPTION_SERVER
#define MYSQL_INSERT_OPTION_SERVER(table_prefix) \
"INSERT INTO " #table_prefix "_options_server (" \
" option_id," \
" server_id," \
" modification_ts" \
") VALUES (?, (SELECT id FROM " #table_prefix "_server WHERE tag = ?), ?)"
#endif
#ifndef MYSQL_UPDATE_GLOBAL_PARAMETER
#define MYSQL_UPDATE_GLOBAL_PARAMETER(table_prefix) \
"UPDATE " #table_prefix "_global_parameter AS g " \
"INNER JOIN " #table_prefix "_global_parameter_server AS a" \
" ON g.id = a.parameter_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON a.server_id = s.id " \
"SET" \
" g.name = ?," \
" g.value = ?," \
" g.modification_ts = ? " \
"WHERE s.tag = ? AND g.name = ?"
#endif
#ifndef MYSQL_UPDATE_OPTION_DEF
#define MYSQL_UPDATE_OPTION_DEF(table_prefix) \
"UPDATE " #table_prefix "_option_def SET" \
" code = ?," \
" name = ?," \
" space = ?," \
" type = ?," \
" modification_ts = ?," \
" array = ?," \
" encapsulate = ?," \
" record_types = ?," \
" user_context = ? " \
"WHERE code = ? AND space = ?"
#endif
#ifndef MYSQL_UPDATE_OPTION
#define MYSQL_UPDATE_OPTION(table_prefix, ...) \
"UPDATE " #table_prefix "_options AS o " \
"INNER JOIN " #table_prefix "_options_server AS a" \
" ON o.option_id = a.option_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON a.server_id = s.id " \
"SET" \
" o.code = ?," \
" o.value = ?," \
" o.formatted_value = ?," \
" o.space = ?," \
" o.persistent = ?," \
" o.dhcp_client_class = ?," \
" o." #table_prefix "_subnet_id = ?," \
" o.scope_id = ?," \
" o.user_context = ?," \
" o.shared_network_name = ?," \
" o.pool_id = ?," \
" o.modification_ts = ? " \
"WHERE s.tag = ? " #__VA_ARGS__
#endif
#ifndef MYSQL_DELETE_GLOBAL_PARAMETER
#define MYSQL_DELETE_GLOBAL_PARAMETER(table_prefix, ...) \
"DELETE g FROM " #table_prefix "_global_parameter AS g " \
"INNER JOIN " #table_prefix "_global_parameter_server AS a " \
" ON g.id = a.parameter_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON (a.server_id = s.id) " \
"WHERE s.tag = ? " #__VA_ARGS__
#endif
#ifndef MYSQL_DELETE_SUBNET
#define MYSQL_DELETE_SUBNET(table_prefix, ...) \
"DELETE s FROM " #table_prefix "_subnet AS s " \
"INNER JOIN " #table_prefix "_subnet_server AS a " \
" ON s.subnet_id = a.subnet_id " \
"INNER JOIN " #table_prefix "_server AS srv" \
" ON a.server_id = srv.id " \
"WHERE srv.tag = ? " #__VA_ARGS__
#endif
#ifndef MYSQL_DELETE_POOLS
#define MYSQL_DELETE_POOLS(table_prefix) \
"DELETE FROM " #table_prefix "_pool " \
"WHERE subnet_id = ?"
#endif
#ifndef MYSQL_DELETE_SHARED_NETWORK
#define MYSQL_DELETE_SHARED_NETWORK(table_prefix, ...) \
"DELETE n FROM " #table_prefix "_shared_network AS n " \
"INNER JOIN " #table_prefix "_shared_network_server AS a" \
" ON n.id = a.shared_network_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON a.server_id = s.id " \
"WHERE s.tag = ? " #__VA_ARGS__
#endif
#ifndef MYSQL_DELETE_OPTION_DEF
#define MYSQL_DELETE_OPTION_DEF(table_prefix, ...) \
"DELETE d FROM " #table_prefix "_option_def AS d " \
"INNER JOIN " #table_prefix "_option_def_server AS a" \
" ON d.id = a.option_def_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON a.server_id = s.id " \
"WHERE s.tag = ? " #__VA_ARGS__
#endif
#ifndef MYSQL_DELETE_OPTION
#define MYSQL_DELETE_OPTION(table_prefix, ...) \
"DELETE o FROM " #table_prefix "_options AS o " \
"INNER JOIN " #table_prefix "_options_server AS a" \
" ON o.option_id = a.option_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON a.server_id = s.id " \
"WHERE s.tag = ? " #__VA_ARGS__
#endif
#ifndef MYSQL_DELETE_OPTION_POOL_RANGE
#define MYSQL_DELETE_OPTION_POOL_RANGE(table_prefix, ...) \
"DELETE o FROM " #table_prefix "_options AS o " \
"INNER JOIN " #table_prefix "_options_server AS a" \
" ON o.option_id = a.option_id " \
"INNER JOIN " #table_prefix "_server AS s" \
" ON a.server_id = s.id " \
"WHERE s.tag = ? " #__VA_ARGS__ \
" AND o.pool_id = " \
" (SELECT id FROM " #table_prefix "_pool" \
" WHERE start_address = ? AND end_address = ?)"
#endif
} // end of anonymous namespace
} // end of namespace isc::dhcp
} // end of namespace isc
#endif

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

@@ -888,10 +888,16 @@ TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteOption4) {
ASSERT_TRUE(returned_opt_boot_file_name);
EXPECT_TRUE(returned_opt_boot_file_name->equals(*opt_boot_file_name));
// Delete option from the database and make sure it is gone.
cbptr_->deleteOption4(ServerSelector::ALL(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_);
// Deleting an option with explicitly specified server tag should fail.
EXPECT_EQ(0, cbptr_->deleteOption4(ServerSelector::ONE("server1"),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
// Deleting option for all servers should succeed.
EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ALL(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
EXPECT_FALSE(cbptr_->getOption4(ServerSelector::ALL(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
@@ -911,6 +917,11 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getAllOptions4) {
OptionContainer returned_options = cbptr_->getAllOptions4(ServerSelector::ALL());
ASSERT_EQ(3, returned_options.size());
// Fetching global options with explicitly specified server tag should return
// the same result.
returned_options = cbptr_->getAllOptions4(ServerSelector::ONE("server1"));
ASSERT_EQ(3, returned_options.size());
// Get the container index used to search options by option code.
const OptionContainerTypeIndex& index = returned_options.get<1>();
@@ -952,6 +963,12 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedOptions4) {
timestamps_["today"]);
ASSERT_EQ(1, returned_options.size());
// Fetching modified options with explicitly specified server selector
// should return the same result.
returned_options = cbptr_->getModifiedOptions4(ServerSelector::ONE("server1"),
timestamps_["today"]);
ASSERT_EQ(1, returned_options.size());
// The returned option should be the one with the timestamp
// set to tomorrow.
const OptionContainerTypeIndex& index = returned_options.get<1>();
@@ -997,9 +1014,16 @@ TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteSubnetOption4) {
ASSERT_TRUE(returned_opt_boot_file_name.option_);
EXPECT_TRUE(returned_opt_boot_file_name.equals(*opt_boot_file_name));
cbptr_->deleteOption4(ServerSelector::ALL(), subnet->getID(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_);
// Deleting an option with explicitly specified server tag should fail.
EXPECT_EQ(0, cbptr_->deleteOption4(ServerSelector::ONE("server1"),
subnet->getID(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
// It should succeed for all servers.
EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ALL(), subnet->getID(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
subnet->getID());
@@ -1061,12 +1085,19 @@ TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeletePoolOption4) {
ASSERT_TRUE(returned_opt_boot_file_name.option_);
EXPECT_TRUE(returned_opt_boot_file_name.equals(*opt_boot_file_name));
// Delete option from the pool.
cbptr_->deleteOption4(ServerSelector::ALL(),
pool->getFirstAddress(),
pool->getLastAddress(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_);
// Deleting an option with explicitly specified server tag should fail.
EXPECT_EQ(0, cbptr_->deleteOption4(ServerSelector::ONE("server1"),
pool->getFirstAddress(),
pool->getLastAddress(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
// Delete option for all servers should succeed.
EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ALL(),
pool->getFirstAddress(),
pool->getLastAddress(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
// Fetch the subnet and the pool from the database again to make sure
// that the option is really gone.
@@ -1123,10 +1154,17 @@ TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteSharedNetworkOption4) {
ASSERT_TRUE(returned_opt_boot_file_name.option_);
EXPECT_TRUE(returned_opt_boot_file_name.equals(*opt_boot_file_name));
cbptr_->deleteOption4(ServerSelector::ALL(),
shared_network->getName(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_);
// Deleting an option with explicitly specified server tag should fail.
EXPECT_EQ(0, cbptr_->deleteOption4(ServerSelector::ONE("server1"),
shared_network->getName(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
// Deleting an option for all servers should succeed.
EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ALL(),
shared_network->getName(),
opt_boot_file_name->option_->getType(),
opt_boot_file_name->space_name_));
returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
shared_network->getName());
ASSERT_TRUE(returned_network);