kea_dhcp4_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+kea_dhcp4_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
#include <sstream>
using namespace isc::data;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::hooks;
using namespace isc::config;
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/command_interpreter.h>
-#include <dhcpsrv/database_connection.h>
+#include <database/database_connection.h>
#include <dhcpsrv/timer_mgr.h>
#include <dhcp4/dhcp4_srv.h>
/// @param db_reconnect_ctl pointer to the ReconnectCtl containing the
/// configured reconnect parameters
///
- void dbReconnect(ReconnectCtlPtr db_reconnect_ctl);
+ void dbReconnect(db::ReconnectCtlPtr db_reconnect_ctl);
/// @brief Callback DB backends should invoke upon loss of connectivity
///
/// configured reconnect parameters
///
/// @return false if reconnect is not configured, true otherwise
- bool dbLostCallback(ReconnectCtlPtr db_reconnect_ctl);
+ bool dbLostCallback(db::ReconnectCtlPtr db_reconnect_ctl);
/// @brief Static pointer to the sole instance of the DHCP server.
///
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+dhcp4_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+kea_dhcp6_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
#include <dhcp/libdhcp++.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/cfg_db_access.h>
-#include <dhcpsrv/database_connection.h>
#include <dhcp6/ctrl_dhcp6_srv.h>
#include <dhcp6/dhcp6to4_ipc.h>
#include <dhcp6/dhcp6_log.h>
#include <sstream>
using namespace isc::config;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::data;
using namespace isc::hooks;
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/command_interpreter.h>
-#include <dhcpsrv/database_connection.h>
+#include <database/database_connection.h>
#include <dhcpsrv/timer_mgr.h>
#include <dhcp6/dhcp6_srv.h>
/// @param db_reconnect_ctl pointer to the ReconnectCtl containing the
/// configured reconnect parameters
///
- void dbReconnect(ReconnectCtlPtr db_reconnect_ctl);
+ void dbReconnect(db::ReconnectCtlPtr db_reconnect_ctl);
/// @brief Callback DB backends should invoke upon loss of connectivity
///
///
/// @param db_reconnect_ctl pointer to the ReconnectCtl containing the
/// configured reconnect parameters
- bool dbLostCallback(ReconnectCtlPtr db_reconnect_ctl);
+ bool dbLostCallback(db::ReconnectCtlPtr db_reconnect_ctl);
/// @brief Static pointer to the sole instance of the DHCP server.
///
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
--- /dev/null
+/db_messages.cc
+/db_messages.h
+/s-messages
AM_CXXFLAGS = $(KEA_CXXFLAGS)
+# Define rule to build logging source files from message file
+db_messages.h db_messages.cc: s-messages
+
+s-messages: db_messages.mes
+ $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/database/db_messages.mes
+ touch $@
+
+# Tell automake that the message files are built as part of the build process
+# (so that they are built before the main library is built).
+BUILT_SOURCES = db_messages.h db_messages.cc
+
+# Ensure that the message file is included in the distribution
+EXTRA_DIST = db_messages.mes
+
+# Get rid of generated message files on a clean
+CLEANFILES = *.gcno *.gcda http_messages.h http_messages.cc s-messages
+
lib_LTLIBRARIES = libkea-database.la
libkea_database_la_SOURCES = database_connection.cc database_connection.h
libkea_database_la_SOURCES += db_exceptions.h
libkea_database_la_SOURCES += db_log.cc db_log.h
+nodist_libkea_database_la_SOURCES = db_messages.cc db_messages.h
+
libkea_database_la_LIBADD = $(top_builddir)/src/lib/log/libkea-log.la
libkea_database_la_LIBADD += $(top_builddir)/src/lib/log/interprocess/libkea-log_interprocess.la
libkea_database_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
# The message file should be in the distribution.
#EXTRA_DIST = config_backend.dox
-CLEANFILES = *.gcno *.gcda
-
# Specify the headers for copying into the installation directory tree.
#libkea_cb_includedir = $(pkgincludedir)/config
#libkea_cb_include_HEADERS =
--- /dev/null
+// 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/.
+
+#include <config.h>
+#include <database/database_log.h>
+
+namespace isc {
+namespace db {
+
+isc::log::Logger database_logger("database");
+
+} // end of namespace db
+} // end of namespace isc
--- /dev/null
+// 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 DATABASE_LOG_H
+#define DATABASE_LOG_H
+
+namespace isc {
+namespace db {
+
+/// @brief Common database library logger.
+extern isc::log::Logger database_logger;
+
+} // end of namespace isc::db
+} // end of namespace isc
+
+#endif // DATABASE_LOG_H
#include <exceptions/exceptions.h>
#include <database/db_log.h>
+#include <database/db_messages.h>
using namespace isc::log;
namespace isc {
namespace db {
-DbLoggerStack db_logger_stack;
+/// @brief Map of translated messages.
+const DbLogger::MessageMap db_message_map = {
+ { DB_INVALID_ACCESS, DATABASE_INVALID_ACCESS },
+
+ { PGSQL_DEALLOC_ERROR, DATABASE_PGSQL_DEALLOC_ERROR },
+ { PGSQL_FATAL_ERROR, DATABASE_PGSQL_FATAL_ERROR },
+ { PGSQL_START_TRANSACTION, DATABASE_PGSQL_START_TRANSACTION },
+ { PGSQL_COMMIT, DATABASE_PGSQL_COMMIT },
+ { PGSQL_ROLLBACK, DATABASE_PGSQL_ROLLBACK },
+
+ { MYSQL_FATAL_ERROR, DATABASE_MYSQL_FATAL_ERROR },
+ { MYSQL_START_TRANSACTION, DATABASE_MYSQL_START_TRANSACTION },
+ { MYSQL_COMMIT, DATABASE_MYSQL_COMMIT },
+ { MYSQL_ROLLBACK, DATABASE_MYSQL_ROLLBACK },
+
+ { CQL_DEALLOC_ERROR, DATABASE_CQL_DEALLOC_ERROR },
+ { CQL_CONNECTION_BEGIN_TRANSACTION,
+ DATABASE_CQL_CONNECTION_BEGIN_TRANSACTION },
+ { CQL_CONNECTION_COMMIT, DATABASE_CQL_CONNECTION_COMMIT },
+ { CQL_CONNECTION_ROLLBACK, DATABASE_CQL_CONNECTION_ROLLBACK }
+};
+
+
+isc::log::Logger database_logger("database");
+
+DbLogger db_logger_translator(database_logger, db_message_map);
+
+DbLoggerStack db_logger_stack = { db_logger_translator };
+
const MessageID&
DbLogger::translateMessage(const DbMessageID& id) const {
///@}
+/// @brief Common database library logger.
+extern isc::log::Logger database_logger;
+
+
///@{
/// @brief Database messages
///
/// @brief Macros
#define DB_LOG_DEBUG(LEVEL, MESSAGE) \
- checkDbLoggerStack(); \
+ isc::db::checkDbLoggerStack(); \
if (!db_logger_stack.back().logger_.isDebugEnabled((LEVEL))) { \
} else \
- db_logger_stack.back().logger_.debug((LEVEL), \
- db_logger_stack.back().translateMessage((MESSAGE)))
+ isc::db::db_logger_stack.back().logger_.debug((LEVEL), \
+ isc::db::db_logger_stack.back().translateMessage((MESSAGE)))
#define DB_LOG_INFO(MESSAGE) \
- checkDbLoggerStack(); \
- if (!db_logger_stack.back().logger_.isInfoEnabled()) { \
+ isc::db::checkDbLoggerStack(); \
+ if (!isc::db::db_logger_stack.back().logger_.isInfoEnabled()) { \
} else \
- db_logger_stack.back().logger_.info( \
- db_logger_stack.back().translateMessage((MESSAGE)))
+ isc::db::db_logger_stack.back().logger_.info( \
+ isc::db::db_logger_stack.back().translateMessage((MESSAGE)))
#define DB_LOG_WARN(MESSAGE) \
- checkDbLoggerStack(); \
- if (!db_logger_stack.back().logger_.isWarnEnabled()) { \
+ isc::db::checkDbLoggerStack(); \
+ if (!isc::db::db_logger_stack.back().logger_.isWarnEnabled()) { \
} else \
- db_logger_stack.back().logger_.warn( \
- db_logger_stack.back().translateMessage((MESSAGE)))
+ isc::db::db_logger_stack.back().logger_.warn( \
+ isc::db::db_logger_stack.back().translateMessage((MESSAGE)))
#define DB_LOG_ERROR(MESSAGE) \
- checkDbLoggerStack(); \
- if (!db_logger_stack.back().logger_.isErrorEnabled()) { \
+ isc::db::checkDbLoggerStack(); \
+ if (!isc::db::db_logger_stack.back().logger_.isErrorEnabled()) { \
} else \
- db_logger_stack.back().logger_.error( \
- db_logger_stack.back().translateMessage((MESSAGE)))
+ isc::db::db_logger_stack.back().logger_.error( \
+ isc::db::db_logger_stack.back().translateMessage((MESSAGE)))
#define DB_LOG_FATAL(MESSAGE) \
- checkDbLoggerStack(); \
- if (!db_logger_stack.back().logger_.isFatalEnabled()) { \
+ isc::db::checkDbLoggerStack(); \
+ if (!isc::db::db_logger_stack.back().logger_.isFatalEnabled()) { \
} else \
- db_logger_stack.back().logger_.fatal( \
- db_logger_stack.back().translateMessage((MESSAGE)))
+ isc::db::db_logger_stack.back().logger_.fatal( \
+ isc::db::db_logger_stack.back().translateMessage((MESSAGE)))
///@}
+/// @brief DHCP server database message map
+extern const db::DbLogger::MessageMap db_message_map;
+
+/// @brief Database logger translator.
+extern db::DbLogger db_logger_translator;
+
} // namespace db
} // namespace isc
--- /dev/null
+# Copyright (C) 2012-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/.
+
+$NAMESPACE isc::db
+
+% DATABASE_CQL_CONNECTION_BEGIN_TRANSACTION begin transaction on current connection.
+The server has issued a begin transaction call.
+
+% DATABASE_CQL_CONNECTION_COMMIT committing to Cassandra database on current connection.
+A commit call been issued on the server. For Cassandra, this is a no-op.
+
+% DATABASE_CQL_CONNECTION_ROLLBACK rolling back Cassandra database on current connection.
+The code has issued a rollback call. For Cassandra, this is a no-op.
+
+% DATABASE_CQL_DEALLOC_ERROR An error occurred while closing the CQL connection: %1
+This is an error message issued when a DHCP server (either V4 or V6) experienced
+and error freeing CQL database resources as part of closing its connection to
+the Cassandra database. The connection is closed as part of normal server
+shutdown. This error is most likely a programmatic issue that is highly
+unlikely to occur or negatively impact server operation.
+
+% DATABASE_INVALID_ACCESS invalid database access string: %1
+This is logged when an attempt has been made to parse a database access string
+and the attempt ended in error. The access string in question - which
+should be of the form 'keyword=value keyword=value...' is included in
+the message.
+
+% DATABASE_MYSQL_COMMIT committing to MySQL database
+The code has issued a commit call. All outstanding transactions will be
+committed to the database. Note that depending on the MySQL settings,
+the committal may not include a write to disk.
+
+% DATABASE_MYSQL_FATAL_ERROR Unrecoverable MySQL error occurred: %1 for <%2>, reason: %3 (error code: %4).
+An error message indicating that communication with the MySQL database server
+has been lost. If automatic recovery has been enabled, then the server will
+attempt to recover connectivity. If not the server wil exit with a
+non-zero exit code. The cause of such an error is most likely a network issue
+or the MySQL server has gone down.
+
+% DATABASE_MYSQL_ROLLBACK rolling back MySQL database
+The code has issued a rollback call. All outstanding transaction will
+be rolled back and not committed to the database.
+
+% DATABASE_MYSQL_START_TRANSACTION starting new MySQL transaction
+A debug message issued when a new MySQL transaction is being started.
+This message is typically not issued when inserting data into a
+single table because the server doesn't explicitly start
+transactions in this case. This message is issued when data is
+inserted into multiple tables with multiple INSERT statements
+and there may be a need to rollback the whole transaction if
+any of these INSERT statements fail.
+
+% DATABASE_PGSQL_COMMIT committing to PostgreSQL database
+The code has issued a commit call. All outstanding transactions will be
+committed to the database. Note that depending on the PostgreSQL settings,
+the committal may not include a write to disk.
+
+% DATABASE_PGSQL_DEALLOC_ERROR An error occurred deallocating SQL statements while closing the PostgreSQL lease database: %1
+This is an error message issued when a DHCP server (either V4 or V6) experienced
+and error freeing database SQL resources as part of closing its connection to
+the PostgreSQL database. The connection is closed as part of normal server
+shutdown. This error is most likely a programmatic issue that is highly
+unlikely to occur or negatively impact server operation.
+
+% DATABASE_PGSQL_FATAL_ERROR Unrecoverable PostgreSQL error occurred: Statement: <%1>, reason: %2 (error code: %3).
+An error message indicating that communication with the PostgreSQL database server
+has been lost. If automatic recovery has been enabled, then the server will
+attempt to recover the connectivity. If not the server wil exit with a
+non-zero exit code. The cause of such an error is most likely a network issue
+or the PostgreSQL server has gone down.
+
+% DATABASE_PGSQL_ROLLBACK rolling back PostgreSQL database
+The code has issued a rollback call. All outstanding transaction will
+be rolled back and not committed to the database.
+
+% DATABASE_PGSQL_START_TRANSACTION starting a new PostgreSQL transaction
+A debug message issued when a new PostgreSQL transaction is being started.
+This message is typically not issued when inserting data into a
+single table because the server doesn't explicitly start
+transactions in this case. This message is issued when data is
+inserted into multiple tables with multiple INSERT statements
+and there may be a need to rollback the whole transaction if
+any of these INSERT statements fail.
libkea_dhcpsrv_la_SOURCES += db_type.h
libkea_dhcpsrv_la_SOURCES += dhcp4o6_ipc.cc dhcp4o6_ipc.h
libkea_dhcpsrv_la_SOURCES += dhcpsrv_log.cc dhcpsrv_log.h
-libkea_dhcpsrv_la_SOURCES += dhcpsrv_db_log.cc dhcpsrv_db_log.h
libkea_dhcpsrv_la_SOURCES += host.cc host.h
libkea_dhcpsrv_la_SOURCES += host_container.h
libkea_dhcpsrv_la_SOURCES += host_data_source_factory.cc host_data_source_factory.h
d2_client_cfg.h \
d2_client_mgr.h \
daemon.h \
- database_connection.h \
- db_exceptions.h \
- db_log.h \
db_type.h \
dhcp4o6_ipc.h \
- dhcpsrv_db_log.h \
- dhcpsrv_log.h \
host.h \
host_container.h \
host_data_source_factory.h \
#define CFG_DBACCESS_H
#include <cc/cfg_to_element.h>
-#include <dhcpsrv/database_connection.h>
+#include <database/database_connection.h>
#include <boost/shared_ptr.hpp>
#include <string>
+// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2015-2018 Deutsche Telekom AG.
//
// Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
#include <config.h>
+#include <database/db_exceptions.h>
+#include <database/db_log.h>
#include <dhcpsrv/cql_connection.h>
#include <dhcpsrv/cql_exchange.h>
-#include <dhcpsrv/db_exceptions.h>
-#include <dhcpsrv/db_log.h>
#include <string>
+using namespace isc::db;
+
namespace isc {
namespace dhcp {
#ifndef CQL_CONNECTION_H
#define CQL_CONNECTION_H
-#include <dhcpsrv/database_connection.h>
+#include <database/database_connection.h>
#include <cassandra.h>
/// to the Cassandra database and preparing of compiled statements. Its fields
/// are public because they are used (both set and retrieved) in classes that
/// use instances of CqlConnection.
-class CqlConnection : public DatabaseConnection {
+class CqlConnection : public db::DatabaseConnection {
public:
/// @brief Constructor
///
/// by the CQL backend.
/// @param statements statements to be prepared
///
- /// @throw isc::dhcp::DbOperationError if an operation on the open database
+ /// @throw isc::db::DbOperationError if an operation on the open database
/// has failed
/// @throw isc::InvalidParameter if there is an invalid access in the
/// vector. This represents an internal error within the code.
+// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2016-2017 Deutsche Telekom AG.
//
// Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
#include <config.h>
+#include <database/db_exceptions.h>
#include <dhcpsrv/cql_connection.h>
#include <dhcpsrv/cql_exchange.h>
-#include <dhcpsrv/db_exceptions.h>
#include <dhcpsrv/sql_common.h>
#include <boost/multi_index/hashed_index.hpp>
#include <utility>
#include <vector>
+using namespace isc::db;
+
namespace isc {
namespace dhcp {
#include <config.h>
+#include <database/db_exceptions.h>
#include <dhcpsrv/cql_host_data_source.h>
-
#include <dhcp/duid.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
#include <dhcpsrv/cfg_option.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/cql_exchange.h>
-#include <dhcpsrv/db_exceptions.h>
#include <dhcpsrv/dhcpsrv_log.h>
#include <util/buffer.h>
#include <util/hash.h>
#include <string> // for std::string
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::util;
using namespace isc::data;
+// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2016-2018 Deutsche Telekom AG.
//
// Author: Andrei Pavel <andrei.pavel@qualitance.com>
/// @param parameters a data structure relating keywords and values
/// concerned with the database.
///
- /// @throw isc::dhcp::NoDatabaseName Mandatory database name not given
- /// @throw isc::dhcp::DbOpenError Error opening the database or if the
+ /// @throw isc::db::NoDatabaseName Mandatory database name not given
+ /// @throw isc::db::DbOpenError Error opening the database or if the
/// schema version is invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- explicit CqlHostDataSource(const DatabaseConnection::ParameterMap& parameters);
+ explicit CqlHostDataSource(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Virtual destructor.
///
/// integers. "first" is the major version number, "second" is the
/// minor version number.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database
+ /// @throw isc::db::DbOperationError An operation on the open database
/// has failed.
virtual VersionPair getVersion() const;
#include <asiolink/io_address.h>
using namespace isc::data;
+using namespace isc::db;
using isc::asiolink::IOAddress;
namespace isc {
+// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2015-2018 Deutsche Telekom AG.
//
// Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
/// @param parameters a data structure relating keywords and values
/// concerned with the database.
///
- /// @throw isc::dhcp::NoDatabaseName Mandatory database name not given
- /// @throw isc::dhcp::DbOpenError Error opening the database or the schema
+ /// @throw isc::db::NoDatabaseName Mandatory database name not given
+ /// @throw isc::db::DbOpenError Error opening the database or the schema
/// version is invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- explicit CqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters);
+ explicit CqlLeaseMgr(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Destructor (closes database)
virtual ~CqlLeaseMgr();
/// @result true if the lease was added, false if not (because a lease
/// with the same address was already there).
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool addLease(const Lease4Ptr& lease) override;
/// @result true if the lease was added, false if not (because a lease
/// with the same address was already there).
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool addLease(const Lease6Ptr& lease) override;
///
/// @return smart pointer to the lease (or NULL if a lease is not found)
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr
getLease4(const isc::asiolink::IOAddress& addr) const override;
///
/// @return lease collection
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Collection
getLease4(const isc::dhcp::HWAddr& hwaddr) const override;
///
/// @return a pointer to the lease (or NULL if a lease is not found)
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const isc::dhcp::HWAddr& hwaddr,
SubnetID subnet_id) const override;
///
/// @return lease collection
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Collection getLease4(const ClientId& clientid) const override;
///
/// @return a pointer to the lease (or NULL if a lease is not found)
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const ClientId& clientid,
SubnetID subnet_id) const override;
///
/// @throw isc::BadValue record retrieved from database had an invalid
/// lease type field.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Ptr
getLease6(Lease::Type type,
///
/// @throw isc::BadValue record retrieved from database had an invalid
/// lease type field.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Collection getLeases6(Lease::Type type,
const DUID& duid,
///
/// @throw isc::BadValue record retrieved from database had an invalid
/// lease type field.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Collection getLeases6(Lease::Type type,
const DUID& duid,
/// @brief Returns all IPv6 leases.
///
/// @return Lease collection (may be empty if no IPv6 lease found).
- virtual Lease6Collection getLeases6(const DUID& duid) const;
+ virtual Lease6Collection getLeases6(const DUID& duid) const override;
/// @brief Returns range of IPv6 leases using paging.
///
///
/// @param lease4 The lease to be updated.
///
- /// @throw isc::dhcp::NoSuchLease Attempt to update a lease that did not
+ /// @throw isc::db::NoSuchLease Attempt to update a lease that did not
/// exist.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual void updateLease4(const Lease4Ptr& lease4) override;
///
/// @param lease6 The lease to be updated.
///
- /// @throw isc::dhcp::NoSuchLease Attempt to update a lease that did not
+ /// @throw isc::db::NoSuchLease Attempt to update a lease that did not
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual void updateLease6(const Lease6Ptr& lease6) override;
///
/// @return true if deletion was successful, false if no such lease exists
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool deleteLease(const isc::asiolink::IOAddress& addr) override;
/// @return Version number as a pair of unsigned integers. "first" is the
/// major version number, "second" the minor number.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual VersionPair getVersion() const override;
+++ /dev/null
-// Copyright (C) 2015-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/.
-
-#include <config.h>
-
-#include <dhcpsrv/database_connection.h>
-#include <dhcpsrv/db_exceptions.h>
-#include <dhcpsrv/db_log.h>
-#include <exceptions/exceptions.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-#include <vector>
-
-using namespace std;
-
-namespace isc {
-namespace dhcp {
-
-const time_t DatabaseConnection::MAX_DB_TIME = 2147483647;
-
-std::string
-DatabaseConnection::getParameter(const std::string& name) const {
- ParameterMap::const_iterator param = parameters_.find(name);
- if (param == parameters_.end()) {
- isc_throw(BadValue, "Parameter " << name << " not found");
- }
- return (param->second);
-}
-
-DatabaseConnection::ParameterMap
-DatabaseConnection::parse(const std::string& dbaccess) {
- DatabaseConnection::ParameterMap mapped_tokens;
-
- if (!dbaccess.empty()) {
- vector<string> tokens;
-
- // We need to pass a string to is_any_of, not just char*. Otherwise
- // there are cryptic warnings on Debian6 running g++ 4.4 in
- // /usr/include/c++/4.4/bits/stl_algo.h:2178 "array subscript is above
- // array bounds"
- boost::split(tokens, dbaccess, boost::is_any_of(string("\t ")));
- BOOST_FOREACH(std::string token, tokens) {
- size_t pos = token.find("=");
- if (pos != string::npos) {
- string name = token.substr(0, pos);
- string value = token.substr(pos + 1);
- mapped_tokens.insert(make_pair(name, value));
- } else {
- DB_LOG_ERROR(DB_INVALID_ACCESS).arg(dbaccess);
- isc_throw(InvalidParameter, "Cannot parse " << token
- << ", expected format is name=value");
- }
- }
- }
-
- return (mapped_tokens);
-}
-
-std::string
-DatabaseConnection::redactedAccessString(const ParameterMap& parameters) {
- // Reconstruct the access string: start of with an empty string, then
- // work through all the parameters in the original string and add them.
- std::string access;
- for (DatabaseConnection::ParameterMap::const_iterator i = parameters.begin();
- i != parameters.end(); ++i) {
-
- // Separate second and subsequent tokens are preceded by a space.
- if (!access.empty()) {
- access += " ";
- }
-
- // Append name of parameter...
- access += i->first;
- access += "=";
-
- // ... and the value, except in the case of the password, where a
- // redacted value is appended.
- if (i->first == std::string("password")) {
- access += "*****";
- } else {
- access += i->second;
- }
- }
-
- return (access);
-}
-
-bool
-DatabaseConnection::configuredReadOnly() const {
- std::string readonly_value = "false";
- try {
- readonly_value = getParameter("readonly");
- boost::algorithm::to_lower(readonly_value);
- } catch (...) {
- // Parameter "readonly" hasn't been specified so we simply use
- // the default value of "false".
- }
-
- if ((readonly_value != "false") && (readonly_value != "true")) {
- isc_throw(DbInvalidReadOnly, "invalid value '" << readonly_value
- << "' specified for boolean parameter 'readonly'");
- }
-
- return (readonly_value == "true");
-}
-
-ReconnectCtlPtr
-DatabaseConnection::makeReconnectCtl() const {
- ReconnectCtlPtr retry;
- string type = "unknown";
- unsigned int retries = 0;
- unsigned int interval = 0;
-
- // Assumes that parsing ensurse only valid values are present
- try {
- type = getParameter("type");
- } catch (...) {
- // Wasn't specified so we'll use default of "unknown".
- }
-
- std::string parm_str;
- try {
- parm_str = getParameter("max-reconnect-tries");
- retries = boost::lexical_cast<unsigned int>(parm_str);
- } catch (...) {
- // Wasn't specified so we'll use default of 0;
- }
-
- try {
- parm_str = getParameter("reconnect-wait-time");
- interval = boost::lexical_cast<unsigned int>(parm_str);
- } catch (...) {
- // Wasn't specified so we'll use default of 0;
- }
-
- retry.reset(new ReconnectCtl(type, retries, interval));
- return (retry);
-}
-
-bool
-DatabaseConnection::invokeDbLostCallback() const {
- if (DatabaseConnection::db_lost_callback) {
- // Invoke the callback, passing in a new instance of ReconnectCtl
- return (DatabaseConnection::db_lost_callback)(makeReconnectCtl());
- }
-
- return (false);
-}
-
-
-DatabaseConnection::DbLostCallback
-DatabaseConnection::db_lost_callback = 0;
-
-};
-};
+++ /dev/null
-// Copyright (C) 2015-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 DATABASE_CONNECTION_H
-#define DATABASE_CONNECTION_H
-
-#include <boost/noncopyable.hpp>
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <exceptions/exceptions.h>
-#include <map>
-#include <string>
-
-namespace isc {
-namespace dhcp {
-
-/// @brief Exception thrown if name of database is not specified
-class NoDatabaseName : public Exception {
-public:
- NoDatabaseName(const char* file, size_t line, const char* what) :
- isc::Exception(file, line, what) {}
-};
-
-/// @brief Exception thrown on failure to open database
-class DbOpenError : public Exception {
-public:
- DbOpenError(const char* file, size_t line, const char* what) :
- isc::Exception(file, line, what) {}
-};
-
-/// @brief Exception thrown on failure to execute a database function
-class DbOperationError : public Exception {
-public:
- DbOperationError(const char* file, size_t line, const char* what) :
- isc::Exception(file, line, what) {}
-};
-
-/// @brief Invalid type exception
-///
-/// Thrown when the factory doesn't recognize the type of the backend.
-class InvalidType : public Exception {
-public:
- InvalidType(const char* file, size_t line, const char* what) :
- isc::Exception(file, line, what) {}
-};
-
-/// @brief Invalid Timeout
-///
-/// Thrown when the timeout specified for the database connection is invalid.
-class DbInvalidTimeout : public Exception {
-public:
- DbInvalidTimeout(const char* file, size_t line, const char* what) :
- isc::Exception(file, line, what) {}
-};
-
-/// @brief Invalid 'readonly' value specification.
-///
-/// Thrown when the value of the 'readonly' boolean parameter is invalid.
-class DbInvalidReadOnly : public Exception {
-public:
- DbInvalidReadOnly(const char* file, size_t line, const char* what) :
- isc::Exception(file, line, what) {}
-};
-
-/// @brief Warehouses DB reconnect control values
-///
-/// When a DatabaseConnection loses connectivity to its backend, it
-/// creates an instance of this class based on its configuration parameters and
-/// passes the instance into connection's DB lost callback. This allows
-/// the layer(s) above the connection to know how to proceed.
-///
-class ReconnectCtl {
-public:
- /// @brief Constructor
- /// @param backend_type type of the caller backend.
- /// @param max_retries maximum number of reconnect attempts to make
- /// @param retry_interval amount of time to between reconnect attempts
- ReconnectCtl(const std::string& backend_type, unsigned int max_retries,
- unsigned int retry_interval)
- : backend_type_(backend_type), max_retries_(max_retries),
- retries_left_(max_retries), retry_interval_(retry_interval) {}
-
- /// @brief Returns the type of the caller backend.
- std::string backendType() const {
- return (backend_type_);
- }
-
- /// @brief Decrements the number of retries remaining
- ///
- /// Each call decrements the number of retries by one until zero is reached.
- /// @return true the number of retries remaining is greater than zero.
- bool checkRetries() {
- return (retries_left_ ? --retries_left_ : false);
- }
-
- /// @brief Returns the maximum number for retries allowed
- unsigned int maxRetries() {
- return (max_retries_);
- }
-
- /// @brief Returns the number for retries remaining
- unsigned int retriesLeft() {
- return (retries_left_);
- }
-
- /// @brief Returns the amount of time to wait between reconnect attempts
- unsigned int retryInterval() {
- return (retry_interval_);
- }
-
-private:
- /// @brief Caller backend type.
- const std::string backend_type_;
-
- /// @brief Maximum number of retry attempts to make
- unsigned int max_retries_;
-
- /// @brief Number of attempts remaining
- unsigned int retries_left_;
-
- /// @brief The amount of time to wait between reconnect attempts
- unsigned int retry_interval_;
-};
-
-/// @brief Pointer to an instance of ReconnectCtl
-typedef boost::shared_ptr<ReconnectCtl> ReconnectCtlPtr;
-
-/// @brief Common database connection class.
-///
-/// This class provides functions that are common for establishing
-/// connection with different types of databases; enables operations
-/// on access parameters strings. In particular, it provides a way
-/// to parse parameters in key=value format. This class is expected
-/// to be a base class for all @ref LeaseMgr and possibly
-/// @ref BaseHostDataSource derived classes.
-class DatabaseConnection : public boost::noncopyable {
-public:
-
- /// @brief Defines maximum value for time that can be reliably stored.
- ///
- /// @todo: Is this common for MySQL and Postgres? Maybe we should have
- /// specific values for each backend?
- ///
- /// If I'm still alive I'll be too old to care. You fix it.
- static const time_t MAX_DB_TIME;
-
- /// @brief Database configuration parameter map
- typedef std::map<std::string, std::string> ParameterMap;
-
- /// @brief Constructor
- ///
- /// @param parameters A data structure relating keywords and values
- /// concerned with the database.
- DatabaseConnection(const ParameterMap& parameters)
- :parameters_(parameters) {
- }
-
- /// @brief Destructor
- virtual ~DatabaseConnection(){};
-
- /// @brief Instantiates a ReconnectCtl based on the connection's
- /// reconnect parameters
- /// @return pointer to the new ReconnectCtl object
- virtual ReconnectCtlPtr makeReconnectCtl() const;
-
- /// @brief Returns value of a connection parameter.
- ///
- /// @param name Name of the parameter which value should be returned.
- /// @return Value of one of the connection parameters.
- /// @throw BadValue if parameter is not found
- std::string getParameter(const std::string& name) const;
-
- /// @brief Parse database access string
- ///
- /// Parses the string of "keyword=value" pairs and separates them
- /// out into the map.
- ///
- /// @param dbaccess Database access string.
- ///
- /// @return @ref ParameterMap of keyword/value pairs.
- static ParameterMap parse(const std::string& dbaccess);
-
- /// @brief Redact database access string
- ///
- /// Takes the database parameters and returns a database access string
- /// passwords replaced by asterisks. This string is used in log messages.
- ///
- /// @param parameters Database access parameters (output of "parse").
- ///
- /// @return Redacted database access string.
- static std::string redactedAccessString(const ParameterMap& parameters);
-
- /// @brief Convenience method checking if database should be opened with
- /// read only access.
- ///
- /// @return true if "readonly" parameter is specified and set to true;
- /// false if "readonly" parameter is not specified or it is specified
- /// and set to false.
- bool configuredReadOnly() const;
-
- /// @brief Defines a callback prototype for propogating events upward
- typedef boost::function<bool (ReconnectCtlPtr db_retry)> DbLostCallback;
-
- /// @brief Invokes the connection's lost connectivity callback
- ///
- /// This function may be called by derivations when the connectivity
- /// to their data server is lost. If connectivity callback was specified,
- /// this function will instantiate a ReconnectCtl and pass it to the
- /// callback.
- ///
- /// @return Returns the result of the callback or false if there is no
- /// callback.
- bool invokeDbLostCallback() const;
-
- /// @brief Optional call back function to invoke if a successfully
- /// open connection subsequently fails
- static DbLostCallback db_lost_callback;
-
-private:
-
- /// @brief List of parameters passed in dbconfig
- ///
- /// That will be mostly used for storing database name, username,
- /// password and other parameters required for DB access. It is not
- /// intended to keep any DHCP-related parameters.
- ParameterMap parameters_;
-
-};
-
-}; // end of isc::dhcp namespace
-}; // end of isc namespace
-
-#endif // DATABASE_CONNECTION_H
+++ /dev/null
-// 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/.
-
-/// Defines the logger used by the NSAS
-
-#include <config.h>
-
-#include <dhcpsrv/dhcpsrv_db_log.h>
-#include <dhcpsrv/dhcpsrv_log.h>
-
-using namespace isc::db;
-
-namespace isc {
-namespace dhcp {
-
-const DbLogger::MessageMap dhcpsrv_db_message_map = {
- { DB_INVALID_ACCESS, DHCPSRV_INVALID_ACCESS },
-
- { PGSQL_DEALLOC_ERROR, DHCPSRV_PGSQL_DEALLOC_ERROR },
- { PGSQL_FATAL_ERROR, DHCPSRV_PGSQL_FATAL_ERROR },
- { PGSQL_START_TRANSACTION, DHCPSRV_PGSQL_START_TRANSACTION },
- { PGSQL_COMMIT, DHCPSRV_PGSQL_COMMIT },
- { PGSQL_ROLLBACK, DHCPSRV_PGSQL_ROLLBACK },
-
- { MYSQL_FATAL_ERROR, DHCPSRV_MYSQL_FATAL_ERROR },
- { MYSQL_START_TRANSACTION, DHCPSRV_MYSQL_START_TRANSACTION },
- { MYSQL_COMMIT, DHCPSRV_MYSQL_COMMIT },
- { MYSQL_ROLLBACK, DHCPSRV_MYSQL_ROLLBACK },
-
- { CQL_DEALLOC_ERROR, DHCPSRV_CQL_DEALLOC_ERROR },
- { CQL_CONNECTION_BEGIN_TRANSACTION,
- DHCPSRV_CQL_CONNECTION_BEGIN_TRANSACTION },
- { CQL_CONNECTION_COMMIT, DHCPSRV_CQL_CONNECTION_COMMIT },
- { CQL_CONNECTION_ROLLBACK, DHCPSRV_CQL_CONNECTION_ROLLBACK }
-};
-
-DbLogger dhcpsrv_db_logger(dhcpsrv_logger, dhcpsrv_db_message_map);
-
-// Do this initialization here!
-//DbLoggerStack db_logger_stack = { dhcpsrv_db_logger };
-
-
-} // namespace dhcp
-} // namespace isc
+++ /dev/null
-// 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 DHCPSRV_DB_LOG_H
-#define DHCPSRV_DB_LOG_H
-
-#include <database/db_log.h>
-
-namespace isc {
-namespace dhcp {
-
-/// @brief DHCP server database message map
-extern const db::DbLogger::MessageMap dhcpsrv_db_message_map;
-
-/// @brief DHCP server database Logger
-///
-/// It is the default database logger.
-extern db::DbLogger dhcpsrv_db_logger;
-
-} // namespace dhcp
-} // namespace isc
-
-#endif // DHCPSRV_DB_LOG_H
#include <sstream>
#include <utility>
+using namespace isc::db;
using namespace std;
namespace isc {
#ifndef HOST_DATA_SOURCE_FACTORY_H
#define HOST_DATA_SOURCE_FACTORY_H
+#include <database/database_connection.h>
#include <dhcpsrv/base_host_data_source.h>
-#include <dhcpsrv/database_connection.h>
#include <exceptions/exceptions.h>
#include <boost/scoped_ptr.hpp>
#include <boost/function.hpp>
///
/// A factory takes a parameter map and returns a pointer to a host
/// data source. In case of failure it must throw and not return NULL.
- typedef boost::function<HostDataSourcePtr (const DatabaseConnection::ParameterMap&)> Factory;
+ typedef boost::function<HostDataSourcePtr (const db::DatabaseConnection::ParameterMap&)> Factory;
/// @brief Register a host data source factory
///
#ifndef HOST_MGR_H
#define HOST_MGR_H
+#include <database/database_connection.h>
#include <dhcpsrv/base_host_data_source.h>
#include <dhcpsrv/cache_host_data_source.h>
-#include <dhcpsrv/database_connection.h>
#include <dhcpsrv/host.h>
#include <dhcpsrv/subnet_id.h>
#include <boost/noncopyable.hpp>
#include <time.h>
+using namespace isc::db;
using namespace std;
namespace isc {
///
/// @return true if deletion was successful, false if no such lease exists
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool deleteLease(const isc::asiolink::IOAddress& addr) = 0;
#include <sstream>
#include <utility>
+using namespace isc::db;
using namespace std;
namespace isc {
#ifndef LEASE_MGR_FACTORY_H
#define LEASE_MGR_FACTORY_H
+#include <database/database_connection.h>
#include <dhcpsrv/lease_mgr.h>
-#include <dhcpsrv/database_connection.h>
#include <exceptions/exceptions.h>
#include <boost/scoped_ptr.hpp>
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
+#include <database/database_connection.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/dhcpsrv_log.h>
#include <dhcpsrv/lease_file_loader.h>
#include <dhcpsrv/memfile_lease_mgr.h>
#include <dhcpsrv/timer_mgr.h>
-#include <dhcpsrv/database_connection.h>
#include <exceptions/exceptions.h>
#include <util/pid_file.h>
#include <util/process_spawn.h>
} // end of anonymous namespace
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::util;
namespace isc {
#define MEMFILE_LEASE_MGR_H
#include <asiolink/interval_timer.h>
+#include <database/database_connection.h>
#include <dhcp/hwaddr.h>
#include <dhcpsrv/csv_lease_file4.h>
#include <dhcpsrv/csv_lease_file6.h>
#include <dhcpsrv/memfile_lease_storage.h>
-#include <dhcpsrv/database_connection.h>
#include <dhcpsrv/lease_mgr.h>
#include <util/process_spawn.h>
///
/// @param parameters A data structure relating keywords and values
/// concerned with the database.
- Memfile_LeaseMgr(const DatabaseConnection::ParameterMap& parameters);
+ Memfile_LeaseMgr(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Destructor (closes file)
virtual ~Memfile_LeaseMgr();
///
/// DatabaseConnection object is used only for storing, accessing and
/// printing parameter map.
- DatabaseConnection conn_;
+ db::DatabaseConnection conn_;
//@}
};
#include <limits>
using namespace isc;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace std;
/// to be valid, else an exception will be thrown.
/// @param text Text of the SQL statement to be prepared.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
/// @throw isc::InvalidParameter 'index' is not valid for the vector.
void prepareStatement(uint32_t index, const char* text);
/// @param end_statement Pointer to the statement marking end of the
/// range of statements to be compiled. This last statement is not compiled.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
/// @throw isc::InvalidParameter 'index' is not valid for the vector. This
/// represents an internal error within the code.
/// @tparam Enumeration representing index of a statement to which an
/// error pertains.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
template<typename StatementIndex>
void checkError(const int status, const StatementIndex& index,
case CR_SERVER_LOST:
case CR_OUT_OF_MEMORY:
case CR_CONNECTION_ERROR:
- DB_LOG_ERROR(MYSQL_FATAL_ERROR)
+ DB_LOG_ERROR(db::MYSQL_FATAL_ERROR)
.arg(what)
.arg(text_statements_[static_cast<int>(index)])
.arg(mysql_error(mysql_))
// We still need to throw so caller can error out of the current
// processing.
- isc_throw(DbOperationError,
+ isc_throw(db::DbOperationError,
"fatal database errror or connectivity lost");
default:
// Connection is ok, so it must be an SQL error
- isc_throw(DbOperationError, what << " for <"
+ isc_throw(db::DbOperationError, what << " for <"
<< text_statements_[static_cast<int>(index)]
<< ">, reason: "
<< mysql_error(mysql_) << " (error code "
#include <config.h>
+#include <database/db_exceptions.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
#include <dhcp/option_definition.h>
#include <dhcp/option_space.h>
#include <dhcpsrv/cfg_option.h>
-#include <dhcpsrv/db_exceptions.h>
#include <dhcpsrv/dhcpsrv_log.h>
#include <dhcpsrv/mysql_host_data_source.h>
-#include <dhcpsrv/db_exceptions.h>
#include <util/buffer.h>
#include <util/optional_value.h>
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::util;
using namespace isc::data;
/// @param bind Vector of MYSQL_BIND objects to be used when making the
/// query.
///
- /// @throw isc::dhcp::DuplicateEntry Database throws duplicate entry error
+ /// @throw isc::db::DuplicateEntry Database throws duplicate entry error
void addStatement(MySqlHostDataSourceImpl::StatementIndex stindex,
std::vector<MYSQL_BIND>& bind);
/// concerned with the database.
///
/// @throw isc::dhcp::NoDatabaseName Mandatory database name not given
- /// @throw isc::dhcp::DbOpenError Error opening the database or the
+ /// @throw isc::db::DbOpenError Error opening the database or the
/// schema version is invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- MySqlHostDataSource(const DatabaseConnection::ParameterMap& parameters);
+ MySqlHostDataSource(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Virtual destructor.
///
/// integers. "first" is the major version number, "second" the
/// minor number.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database
+ /// @throw isc::db::DbOperationError An operation on the open database
/// has failed.
virtual std::pair<uint32_t, uint32_t> getVersion() const;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::data;
using namespace std;
/// concerned with the database.
///
/// @throw isc::dhcp::NoDatabaseName Mandatory database name not given
- /// @throw isc::dhcp::DbOpenError Error opening the database or the schema
+ /// @throw isc::db::DbOpenError Error opening the database or the schema
/// version is incorrect.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- MySqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters);
+ MySqlLeaseMgr(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Destructor (closes database)
virtual ~MySqlLeaseMgr();
/// @result true if the lease was added, false if not (because a lease
/// with the same address was already there).
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool addLease(const Lease4Ptr& lease);
/// @result true if the lease was added, false if not (because a lease
/// with the same address was already there).
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool addLease(const Lease6Ptr& lease);
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const isc::asiolink::IOAddress& addr) const;
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Collection getLease4(const isc::dhcp::HWAddr& hwaddr) const;
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const isc::dhcp::HWAddr& hwaddr,
SubnetID subnet_id) const;
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Collection getLease4(const ClientId& clientid) const;
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const ClientId& clientid,
SubnetID subnet_id) const;
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Ptr getLease6(Lease::Type type,
const isc::asiolink::IOAddress& addr) const;
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Collection getLeases6(Lease::Type type, const DUID& duid,
uint32_t iaid) const;
/// @throw isc::dhcp::DataTruncation Data was truncated on retrieval to
/// fit into the space allocated for the result. This indicates a
/// programming error.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Collection getLeases6(Lease::Type type, const DUID& duid,
uint32_t iaid, SubnetID subnet_id) const;
///
/// @param lease4 The lease to be updated.
///
- /// @throw isc::dhcp::NoSuchLease Attempt to update a lease that did not
+ /// @throw isc::db::NoSuchLease Attempt to update a lease that did not
/// exist.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual void updateLease4(const Lease4Ptr& lease4);
///
/// @param lease6 The lease to be updated.
///
- /// @throw isc::dhcp::NoSuchLease Attempt to update a lease that did not
+ /// @throw isc::db::NoSuchLease Attempt to update a lease that did not
/// exist.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual void updateLease6(const Lease6Ptr& lease6);
///
/// @return true if deletion was successful, false if no such lease exists
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool deleteLease(const isc::asiolink::IOAddress& addr);
/// @return Version number as a pair of unsigned integers. "first" is the
/// major version number, "second" the minor number.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual std::pair<uint32_t, uint32_t> getVersion() const;
/// @return true if the lease was added, false if it was not added because
/// a lease with that address already exists in the database.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
bool addLeaseCommon(StatementIndex stindex, std::vector<MYSQL_BIND>& bind);
/// be thrown.
///
/// @throw isc::dhcp::BadValue Data retrieved from the database was invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- /// @throw isc::dhcp::MultipleRecords Multiple records were retrieved
+ /// @throw isc::db::MultipleRecords Multiple records were retrieved
/// from the database where only one was expected.
template <typename Exchange, typename LeaseCollection>
void getLeaseCollection(StatementIndex stindex, MYSQL_BIND* bind,
/// new data is appended to the end.
///
/// @throw isc::dhcp::BadValue Data retrieved from the database was invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- /// @throw isc::dhcp::MultipleRecords Multiple records were retrieved
+ /// @throw isc::db::MultipleRecords Multiple records were retrieved
/// from the database where only one was expected.
void getLeaseCollection(StatementIndex stindex, MYSQL_BIND* bind,
Lease4Collection& result) const {
/// data in the collection is erased first.
///
/// @throw isc::dhcp::BadValue Data retrieved from the database was invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- /// @throw isc::dhcp::MultipleRecords Multiple records were retrieved
+ /// @throw isc::db::MultipleRecords Multiple records were retrieved
/// from the database where only one was expected.
void getLeaseCollection(StatementIndex stindex, MYSQL_BIND* bind,
Lease6Collection& result) const {
///
/// @throw NoSuchLease Could not update a lease because no lease matches
/// the address given.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
template <typename LeasePtr>
void updateLeaseCommon(StatementIndex stindex, MYSQL_BIND* bind,
///
/// @return Number of deleted leases.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
uint64_t deleteLeaseCommon(StatementIndex stindex, MYSQL_BIND* bind);
/// @param index Index of statement that caused the error
/// @param what High-level description of the error
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
void checkError(int status, StatementIndex index,
const char* what) const;
#include <config.h>
-#include <dhcpsrv/db_log.h>
+#include <database/db_log.h>
#include <dhcpsrv/pgsql_connection.h>
// PostgreSQL errors should be tested based on the SQL state code. Each state
#define PGSQL_STATECODE_LEN 5
#include <utils/errcodes.h>
+using namespace isc::db;
using namespace std;
namespace isc {
void
PgSqlResult::rowCheck(int row) const {
if (row < 0 || row >= rows_) {
- isc_throw (DbOperationError, "row: " << row
+ isc_throw (db::DbOperationError, "row: " << row
<< ", out of range: 0.." << rows_);
}
}
/// to the database and preparing compiled statements. Its fields are
/// public, because they are used (both set and retrieved) in classes
/// that use instances of PgSqlConnection.
-class PgSqlConnection : public DatabaseConnection {
+class PgSqlConnection : public db::DatabaseConnection {
public:
/// @brief Define the PgSql error state for a duplicate key error.
static const char DUPLICATE_KEY[];
-// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-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
#include <sstream>
#include <vector>
+using namespace isc::db;
+
namespace isc {
namespace dhcp {
-// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-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
try {
value = boost::lexical_cast<T>(data);
} catch (const std::exception& ex) {
- isc_throw(DbOperationError, "Invalid data:[" << data
+ isc_throw(db::DbOperationError, "Invalid data:[" << data
<< "] for row: " << row << " col: " << col << ","
<< getColumnLabel(r, col) << " : " << ex.what());
}
#include <config.h>
+#include <database/db_exceptions.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option.h>
#include <dhcp/option_definition.h>
#include <dhcp/option_space.h>
-#include <dhcpsrv/db_exceptions.h>
#include <dhcpsrv/cfg_option.h>
#include <dhcpsrv/dhcpsrv_log.h>
#include <dhcpsrv/pgsql_host_data_source.h>
-#include <dhcpsrv/db_exceptions.h>
#include <util/buffer.h>
#include <util/optional_value.h>
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::util;
using namespace isc::data;
/// @return 0 if return_last_id is false, otherwise it returns the
/// the value in the result set in the first col of the first row.
///
- /// @throw isc::dhcp::DuplicateEntry Database throws duplicate entry error
+ /// @throw isc::db::DuplicateEntry Database throws duplicate entry error
uint64_t addStatement(PgSqlHostDataSourceImpl::StatementIndex stindex,
PsqlBindArrayPtr& bind,
const bool return_last_id = false);
/// integers. "first" is the major version number, "second" the
/// minor number.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database
+ /// @throw isc::db::DbOperationError An operation on the open database
/// has failed.
std::pair<uint32_t, uint32_t> getVersion() const;
/// @param parameters A data structure relating keywords and values
/// concerned with the database.
///
- /// @throw isc::dhcp::NoDatabaseName Mandatory database name not given
- /// @throw isc::dhcp::DbOpenError Error opening the database
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::NoDatabaseName Mandatory database name not given
+ /// @throw isc::db::DbOpenError Error opening the database
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- PgSqlHostDataSource(const DatabaseConnection::ParameterMap& parameters);
+ PgSqlHostDataSource(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Virtual destructor.
/// Frees database resources and closes the database connection through
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::data;
using namespace std;
/// concerned with the database.
///
/// @throw isc::dhcp::NoDatabaseName Mandatory database name not given
- /// @throw isc::dhcp::DbOpenError Error opening the database
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOpenError Error opening the database
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- PgSqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters);
+ PgSqlLeaseMgr(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Destructor (closes database)
virtual ~PgSqlLeaseMgr();
/// @result true if the lease was added, false if not (because a lease
/// with the same address was already there).
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool addLease(const Lease4Ptr& lease);
/// @result true if the lease was added, false if not (because a lease
/// with the same address was already there).
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool addLease(const Lease6Ptr& lease);
///
/// @return smart pointer to the lease (or NULL if a lease is not found)
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const isc::asiolink::IOAddress& addr) const;
///
/// @return lease collection
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Collection getLease4(const isc::dhcp::HWAddr& hwaddr) const;
///
/// @return a pointer to the lease (or NULL if a lease is not found)
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const isc::dhcp::HWAddr& hwaddr,
SubnetID subnet_id) const;
///
/// @return lease collection
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Collection getLease4(const ClientId& clientid) const;
///
/// @return a pointer to the lease (or NULL if a lease is not found)
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease4Ptr getLease4(const ClientId& clientid,
SubnetID subnet_id) const;
///
/// @throw isc::BadValue record retrieved from database had an invalid
/// lease type field.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Ptr getLease6(Lease::Type type,
const isc::asiolink::IOAddress& addr) const;
///
/// @throw isc::BadValue record retrieved from database had an invalid
/// lease type field.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Collection getLeases6(Lease::Type type, const DUID& duid,
uint32_t iaid) const;
///
/// @throw isc::BadValue record retrieved from database had an invalid
/// lease type field.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual Lease6Collection getLeases6(Lease::Type type, const DUID& duid,
uint32_t iaid, SubnetID subnet_id) const;
///
/// @param lease4 The lease to be updated.
///
- /// @throw isc::dhcp::NoSuchLease Attempt to update a lease that did not
+ /// @throw isc::db::NoSuchLease Attempt to update a lease that did not
/// exist.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual void updateLease4(const Lease4Ptr& lease4);
///
/// @param lease6 The lease to be updated.
///
- /// @throw isc::dhcp::NoSuchLease Attempt to update a lease that did not
+ /// @throw isc::db::NoSuchLease Attempt to update a lease that did not
/// exist.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual void updateLease6(const Lease6Ptr& lease6);
///
/// @return true if deletion was successful, false if no such lease exists
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual bool deleteLease(const isc::asiolink::IOAddress& addr);
/// @return Version number as a pair of unsigned integers. "first" is the
/// major version number, "second" the minor number.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
virtual std::pair<uint32_t, uint32_t> getVersion() const;
/// @return true if the lease was added, false if it was not added because
/// a lease with that address already exists in the database.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
bool addLeaseCommon(StatementIndex stindex, PsqlBindArray& bind_array);
/// be thrown.
///
/// @throw isc::dhcp::BadValue Data retrieved from the database was invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- /// @throw isc::dhcp::MultipleRecords Multiple records were retrieved
+ /// @throw isc::db::MultipleRecords Multiple records were retrieved
/// from the database where only one was expected.
template <typename Exchange, typename LeaseCollection>
void getLeaseCollection(StatementIndex stindex, PsqlBindArray& bind_array,
/// new data is appended to the end.
///
/// @throw isc::dhcp::BadValue Data retrieved from the database was invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- /// @throw isc::dhcp::MultipleRecords Multiple records were retrieved
+ /// @throw isc::db::MultipleRecords Multiple records were retrieved
/// from the database where only one was expected.
void getLeaseCollection(StatementIndex stindex, PsqlBindArray& bind_array,
Lease4Collection& result) const {
/// data in the collection is erased first.
///
/// @throw isc::dhcp::BadValue Data retrieved from the database was invalid.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
- /// @throw isc::dhcp::MultipleRecords Multiple records were retrieved
+ /// @throw isc::db::MultipleRecords Multiple records were retrieved
/// from the database where only one was expected.
void getLeaseCollection(StatementIndex stindex, PsqlBindArray& bind_array,
Lease6Collection& result) const {
///
/// @throw NoSuchLease Could not update a lease because no lease matches
/// the address given.
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
template <typename LeasePtr>
void updateLeaseCommon(StatementIndex stindex, PsqlBindArray& bind_array,
///
/// @return Number of deleted leases.
///
- /// @throw isc::dhcp::DbOperationError An operation on the open database has
+ /// @throw isc::db::DbOperationError An operation on the open database has
/// failed.
uint64_t deleteLeaseCommon(StatementIndex stindex,
PsqlBindArray& bind_array);
libdhcpsrv_unittests_SOURCES += d2_client_unittest.cc
libdhcpsrv_unittests_SOURCES += d2_udp_unittest.cc
libdhcpsrv_unittests_SOURCES += daemon_unittest.cc
-libdhcpsrv_unittests_SOURCES += database_connection_unittest.cc
libdhcpsrv_unittests_SOURCES += dbaccess_parser_unittest.cc
libdhcpsrv_unittests_SOURCES += dhcp4o6_ipc_unittest.cc
libdhcpsrv_unittests_SOURCES += duid_config_parser_unittest.cc
libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
+libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
/// @return Lease6 pointer (or NULL if collection was empty)
Lease6Ptr expectOneLease(const Lease6Collection& col) {
if (col.size() > 1) {
- isc_throw(MultipleRecords, "More than one lease found in collection");
+ isc_throw(db::MultipleRecords, "More than one lease found in collection");
}
if (col.empty()) {
return (Lease6Ptr());
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace isc::data;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace std;
using namespace std;
using namespace isc;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace isc::data;
#include <config.h>
#include <asiolink/io_address.h>
-#include <exceptions/exceptions.h>
+#include <database/database_connection.h>
+#include <database/db_exceptions.h>
#include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/database_connection.h>
-#include <dhcpsrv/db_exceptions.h>
#include <dhcpsrv/lease_mgr_factory.h>
#include <dhcpsrv/tests/generic_lease_mgr_unittest.h>
#include <dhcpsrv/tests/test_utils.h>
+#include <exceptions/exceptions.h>
#include <stats/stats_mgr.h>
#include <boost/foreach.hpp>
using namespace std;
using namespace isc::asiolink;
using namespace isc::data;
+using namespace isc::db;
namespace isc {
namespace dhcp {
// Database should not let us add one that is too big
// (The 42 is a random value put in each byte of the address.)
leases[1]->hwaddr_->hwaddr_.resize(HWAddr::MAX_HWADDR_LEN + 100, 42);
- EXPECT_THROW(lmptr_->addLease(leases[1]), isc::dhcp::DbOperationError);
+ EXPECT_THROW(lmptr_->addLease(leases[1]), isc::db::DbOperationError);
}
void
/// @todo: Simply use HWAddr directly once 2589 is implemented
EXPECT_THROW(returned = lmptr_->getLease4(*leases[1]->hwaddr_,
leases[1]->subnet_id_),
- isc::dhcp::MultipleRecords);
+ isc::db::MultipleRecords);
}
// Database should not let us add one that is too big
// (The 42 is a random value put in each byte of the address.)
leases[1]->hwaddr_->hwaddr_.resize(HWAddr::MAX_HWADDR_LEN + 100, 42);
- EXPECT_THROW(lmptr_->addLease(leases[1]), isc::dhcp::DbOperationError);
+ EXPECT_THROW(lmptr_->addLease(leases[1]), isc::db::DbOperationError);
}
void
// Try to update the lease with the too long hostname.
leases[1]->hostname_.assign(256, 'a');
- EXPECT_THROW(lmptr_->updateLease4(leases[1]), isc::dhcp::DbOperationError);
+ EXPECT_THROW(lmptr_->updateLease4(leases[1]), isc::db::DbOperationError);
// Try updating a lease not in the database.
lmptr_->deleteLease(ioaddress4_[2]);
- EXPECT_THROW(lmptr_->updateLease4(leases[2]), isc::dhcp::NoSuchLease);
+ EXPECT_THROW(lmptr_->updateLease4(leases[2]), isc::db::NoSuchLease);
}
void
// Try to update the lease with the too long hostname.
leases[1]->hostname_.assign(256, 'a');
- EXPECT_THROW(lmptr_->updateLease6(leases[1]), isc::dhcp::DbOperationError);
+ EXPECT_THROW(lmptr_->updateLease6(leases[1]), isc::db::DbOperationError);
// Try updating a lease not in the database.
- EXPECT_THROW(lmptr_->updateLease6(leases[2]), isc::dhcp::NoSuchLease);
+ EXPECT_THROW(lmptr_->updateLease6(leases[2]), isc::db::NoSuchLease);
}
void
class LeaseMgrDbLostCallbackTest : public ::testing::Test {
public:
LeaseMgrDbLostCallbackTest() {
- DatabaseConnection::db_lost_callback = 0;
+ db::DatabaseConnection::db_lost_callback = 0;
}
virtual ~LeaseMgrDbLostCallbackTest() {
- DatabaseConnection::db_lost_callback = 0;
+ db::DatabaseConnection::db_lost_callback = 0;
}
/// @brief Prepares the class for a test.
void testDbLostCallback();
/// @brief Callback function registered with the host manager
- bool db_lost_callback(ReconnectCtlPtr /* not_used */) {
+ bool db_lost_callback(db::ReconnectCtlPtr /* not_used */) {
return (callback_called_ = true);
}
using namespace std;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace std;
using namespace isc;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
#include <vector>
using namespace isc;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::asiolink;
using namespace std;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace std;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace isc::util;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace isc::data;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace std;
-// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-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
#include <vector>
using namespace isc;
+using namespace isc::db;
using namespace isc::dhcp;
namespace {
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace isc::data;
using namespace isc;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::dhcp;
using namespace isc::dhcp::test;
using namespace std;
libdhcpsrvtest_la_LDFLAGS += $(CQL_LIBS)
endif
-libdhcpsrvtest_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la
+libdhcpsrvtest_la_LIBADD = $(top_builddir)/src/lib/database/libkea-database.la
+libdhcpsrvtest_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
libdhcpsrvtest_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
endif
#include <config.h>
+#include <database/database_connection.h>
+#include <database/db_exceptions.h>
#include <dhcp/dhcp6.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option4_addrlst.h>
#include <dhcp/option_int.h>
#include <dhcp/option_string.h>
#include <dhcp/option_vendor.h>
-#include <dhcpsrv/database_connection.h>
-#include <dhcpsrv/db_exceptions.h>
#include <dhcpsrv/host_mgr.h>
#include <dhcpsrv/host_data_source_factory.h>
#include <dhcpsrv/testutils/generic_host_data_source_unittest.h>
using namespace std;
using namespace isc::asiolink;
+using namespace isc::db;
using namespace isc::util;
using namespace isc::data;
#include <dhcpsrv/testutils/memory_host_data_source.h>
+using namespace isc::db;
using namespace std;
namespace isc {
/// @param parameters
/// @return A pointer to a base host data source instance.
HostDataSourcePtr
-memFactory(const DatabaseConnection::ParameterMap& /*parameters*/);
+memFactory(const db::DatabaseConnection::ParameterMap& /*parameters*/);
} // namespace isc::dhcp::test
} // namespace isc::dhcp
projects / thirdparty / kea.git / commitdiff
