From 3d7cf83cea69d57e8312e25963a02a522aa74b5c Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Thu, 9 May 2019 12:30:27 +0300 Subject: [PATCH] added log messages --- src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc | 7 +- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc | 108 +++++-- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h | 1 + src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc | 138 ++++++--- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h | 1 + src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc | 190 +++++++++++- src/hooks/dhcp/mysql_cb/mysql_cb_messages.h | 96 +++++- src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes | 284 ++++++++++++++++++ src/lib/dhcpsrv/dhcpsrv_messages.mes | 8 +- 9 files changed, 764 insertions(+), 69 deletions(-) diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc index f1eac40b8e..11b11df726 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc @@ -13,7 +13,10 @@ #include #include +using namespace isc::cb; +using namespace isc::dhcp; using namespace isc::hooks; +using namespace isc::log; extern "C" { @@ -23,7 +26,7 @@ extern "C" { /// @return 0 when initialization is successful, 1 otherwise int load(LibraryHandle& /* handle */) { - + LOG_INFO(mysql_cb_logger, MYSQL_CB_INIT_OK); // Register MySQL CB factories with CB Managers isc::dhcp::MySqlConfigBackendDHCPv4::registerBackendType(); isc::dhcp::MySqlConfigBackendDHCPv6::registerBackendType(); @@ -35,7 +38,7 @@ int load(LibraryHandle& /* handle */) { /// /// @return 0 if deregistration was successful, 1 otherwise int unload() { - + LOG_INFO(mysql_cb_logger, MYSQL_CB_DEINIT_OK); // Unregister the factories and remove MySQL backends isc::dhcp::MySqlConfigBackendDHCPv4::unregisterBackendType(); isc::dhcp::MySqlConfigBackendDHCPv6::unregisterBackendType(); diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index af2be2fdfb..577222a09c 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -4,6 +4,8 @@ // 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 + #include #include #include @@ -36,6 +38,7 @@ using namespace isc::cb; using namespace isc::db; using namespace isc::data; using namespace isc::asiolink; +using namespace isc::log; using namespace isc::util; namespace isc { @@ -1463,7 +1466,6 @@ public: MySqlBinding::createTimestamp(option->getModificationTime()) }; - boost::scoped_ptr transaction; // Only start new transaction if specified to do so. This function may // be called from within an existing transaction in which case we @@ -2270,8 +2272,7 @@ TaggedStatementArray tagged_statements = { { }; // end anonymous namespace -MySqlConfigBackendDHCPv4Impl:: -MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv4Impl::MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters) : MySqlConfigBackendImpl(parameters) { // Prepare query statements. Those are will be only used to retrieve // information from the database, so they can be used even if the @@ -2281,25 +2282,29 @@ MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters) // tagged_statements.begin() + WRITE_STMTS_BEGIN); } -MySqlConfigBackendDHCPv4:: -MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv4::MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters) : impl_(new MySqlConfigBackendDHCPv4Impl(parameters)) { } Subnet4Ptr MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector, const std::string& subnet_prefix) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET4_BY_PREFIX) + .arg(subnet_prefix); return (impl_->getSubnet4(server_selector, subnet_prefix)); } Subnet4Ptr MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector, const SubnetID& subnet_id) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID) + .arg(subnet_id); return (impl_->getSubnet4(server_selector, subnet_id)); } Subnet4Collection MySqlConfigBackendDHCPv4::getAllSubnets4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SUBNETS4); Subnet4Collection subnets; impl_->getAllSubnets4(server_selector, subnets); return (subnets); @@ -2308,6 +2313,7 @@ MySqlConfigBackendDHCPv4::getAllSubnets4(const ServerSelector& server_selector) Subnet4Collection MySqlConfigBackendDHCPv4::getModifiedSubnets4(const ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SUBNETS4); Subnet4Collection subnets; impl_->getModifiedSubnets4(server_selector, modification_time, subnets); return (subnets); @@ -2316,6 +2322,8 @@ MySqlConfigBackendDHCPv4::getModifiedSubnets4(const ServerSelector& server_selec Subnet4Collection MySqlConfigBackendDHCPv4::getSharedNetworkSubnets4(const ServerSelector& server_selector, const std::string& shared_network_name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4) + .arg(shared_network_name); Subnet4Collection subnets; impl_->getSharedNetworkSubnets4(server_selector, shared_network_name, subnets); return (subnets); @@ -2324,20 +2332,23 @@ MySqlConfigBackendDHCPv4::getSharedNetworkSubnets4(const ServerSelector& server_ SharedNetwork4Ptr MySqlConfigBackendDHCPv4::getSharedNetwork4(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK4) + .arg(name); return (impl_->getSharedNetwork4(server_selector, name)); } SharedNetwork4Collection MySqlConfigBackendDHCPv4::getAllSharedNetworks4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SHARED_NETWORKS4); SharedNetwork4Collection shared_networks; impl_->getAllSharedNetworks4(server_selector, shared_networks); return (shared_networks); } SharedNetwork4Collection -MySqlConfigBackendDHCPv4:: -getModifiedSharedNetworks4(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getModifiedSharedNetworks4(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4); SharedNetwork4Collection shared_networks; impl_->getModifiedSharedNetworks4(server_selector, modification_time, shared_networks); return (shared_networks); @@ -2347,12 +2358,15 @@ OptionDefinitionPtr MySqlConfigBackendDHCPv4::getOptionDef4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION_DEF4) + .arg(code).arg(space); return (impl_->getOptionDef(MySqlConfigBackendDHCPv4Impl::GET_OPTION_DEF4_CODE_SPACE, server_selector, code, space)); } OptionDefContainer MySqlConfigBackendDHCPv4::getAllOptionDefs4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTION_DEFS4); OptionDefContainer option_defs; impl_->getAllOptionDefs(MySqlConfigBackendDHCPv4Impl::GET_ALL_OPTION_DEFS4, server_selector, option_defs); @@ -2360,9 +2374,9 @@ MySqlConfigBackendDHCPv4::getAllOptionDefs4(const ServerSelector& server_selecto } OptionDefContainer -MySqlConfigBackendDHCPv4:: -getModifiedOptionDefs4(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getModifiedOptionDefs4(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTION_DEFS4); OptionDefContainer option_defs; impl_->getModifiedOptionDefs(MySqlConfigBackendDHCPv4Impl::GET_MODIFIED_OPTION_DEFS4, server_selector, modification_time, option_defs); @@ -2373,20 +2387,23 @@ OptionDescriptorPtr MySqlConfigBackendDHCPv4::getOption4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION4) + .arg(code).arg(space); return (impl_->getOption(MySqlConfigBackendDHCPv4Impl::GET_OPTION4_CODE_SPACE, Option::V4, server_selector, code, space)); } OptionContainer MySqlConfigBackendDHCPv4::getAllOptions4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTIONS4); return (impl_->getAllOptions(MySqlConfigBackendDHCPv4Impl::GET_ALL_OPTIONS4, Option::V4, server_selector)); } OptionContainer -MySqlConfigBackendDHCPv4:: -getModifiedOptions4(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getModifiedOptions4(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTIONS4); return (impl_->getModifiedOptions(MySqlConfigBackendDHCPv4Impl::GET_MODIFIED_OPTIONS4, Option::V4, server_selector, modification_time)); } @@ -2394,13 +2411,15 @@ getModifiedOptions4(const ServerSelector& server_selector, StampedValuePtr MySqlConfigBackendDHCPv4::getGlobalParameter4(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_GLOBAL_PARAMETER4) + .arg(name); return (impl_->getGlobalParameter4(server_selector, name)); } StampedValueCollection MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { MySqlBinding::createString(tag) }; @@ -2411,11 +2430,10 @@ MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& server_s } StampedValueCollection -MySqlConfigBackendDHCPv4:: -getModifiedGlobalParameters4(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getModifiedGlobalParameters4(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { @@ -2425,42 +2443,47 @@ getModifiedGlobalParameters4(const db::ServerSelector& server_selector, impl_->getGlobalParameters(MySqlConfigBackendDHCPv4Impl::GET_MODIFIED_GLOBAL_PARAMETERS4, in_bindings, parameters); } - return (parameters); } AuditEntryCollection -MySqlConfigBackendDHCPv4:: -getRecentAuditEntries(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getRecentAuditEntries(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4); AuditEntryCollection audit_entries; impl_->getRecentAuditEntries(MySqlConfigBackendDHCPv4Impl::GET_AUDIT_ENTRIES4_TIME, server_selector, modification_time, audit_entries); - return (audit_entries); } void MySqlConfigBackendDHCPv4::createUpdateSubnet4(const ServerSelector& server_selector, const Subnet4Ptr& subnet) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SUBNET4) + .arg(subnet); impl_->createUpdateSubnet4(server_selector, subnet); } void MySqlConfigBackendDHCPv4::createUpdateSharedNetwork4(const ServerSelector& server_selector, const SharedNetwork4Ptr& shared_network) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4) + .arg(shared_network->getName()); impl_->createUpdateSharedNetwork4(server_selector, shared_network); } void MySqlConfigBackendDHCPv4::createUpdateOptionDef4(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION_DEF4) + .arg(option_def->getName()).arg(option_def->getCode()); impl_->createUpdateOptionDef4(server_selector, option_def); } void MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selector, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION4); impl_->createUpdateOption4(server_selector, option); } @@ -2468,6 +2491,8 @@ void MySqlConfigBackendDHCPv4::createUpdateOption4(const db::ServerSelector& server_selector, const std::string& shared_network_name, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4) + .arg(shared_network_name); impl_->createUpdateOption4(server_selector, shared_network_name, option, false); } @@ -2475,6 +2500,8 @@ void MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selector, const SubnetID& subnet_id, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4) + .arg(subnet_id); impl_->createUpdateOption4(server_selector, subnet_id, option, false); } @@ -2483,6 +2510,8 @@ MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selec const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()); impl_->createUpdateOption4(server_selector, pool_start_address, pool_end_address, option); } @@ -2490,12 +2519,16 @@ MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selec void MySqlConfigBackendDHCPv4::createUpdateGlobalParameter4(const ServerSelector& server_selector, const StampedValuePtr& value) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4) + .arg(value->getName()); impl_->createUpdateGlobalParameter4(server_selector, value); } uint64_t MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, const std::string& subnet_prefix) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_PREFIX_SUBNET4) + .arg(subnet_prefix); return(impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_SUBNET4_PREFIX, server_selector, "deleting a subnet by prefix", "subnet deleted", true, @@ -2505,11 +2538,14 @@ MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, uint64_t MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, const SubnetID& subnet_id) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4) + .arg(subnet_id); return (impl_->deleteSubnet4(server_selector, subnet_id)); } uint64_t MySqlConfigBackendDHCPv4::deleteAllSubnets4(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SUBNETS4); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SUBNETS4, server_selector, "deleting all subnets", "deleted all subnets", true)); @@ -2518,6 +2554,8 @@ MySqlConfigBackendDHCPv4::deleteAllSubnets4(const ServerSelector& server_selecto uint64_t MySqlConfigBackendDHCPv4::deleteSharedNetworkSubnets4(const db::ServerSelector& server_selector, const std::string& shared_network_name) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4) + .arg(shared_network_name); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SUBNETS4_SHARED_NETWORK_NAME, server_selector, "deleting all subnets for a shared network", @@ -2528,6 +2566,8 @@ MySqlConfigBackendDHCPv4::deleteSharedNetworkSubnets4(const db::ServerSelector& uint64_t MySqlConfigBackendDHCPv4::deleteSharedNetwork4(const ServerSelector& server_selector, const std::string& name) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK4) + .arg(name); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_SHARED_NETWORK4_NAME, server_selector, "deleting a shared network", "shared network deleted", true, @@ -2536,6 +2576,7 @@ MySqlConfigBackendDHCPv4::deleteSharedNetwork4(const ServerSelector& server_sele uint64_t MySqlConfigBackendDHCPv4::deleteAllSharedNetworks4(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SHARED_NETWORKS4, server_selector, "deleting all shared networks", "deleted all shared networks", true)); @@ -2545,11 +2586,14 @@ uint64_t MySqlConfigBackendDHCPv4::deleteOptionDef4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF4) + .arg(code).arg(space); return (impl_->deleteOptionDef4(server_selector, code, space)); } uint64_t MySqlConfigBackendDHCPv4::deleteAllOptionDefs4(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_OPTION_DEFS4); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_OPTION_DEFS4, server_selector, "deleting all option definitions", "deleted all option definitions", true)); @@ -2559,6 +2603,8 @@ uint64_t MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION4) + .arg(code).arg(space); return (impl_->deleteOption4(server_selector, code, space)); } @@ -2567,6 +2613,8 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const std::string& shared_network_name, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4) + .arg(shared_network_name).arg(code).arg(space); return (impl_->deleteOption4(server_selector, shared_network_name, code, space)); } @@ -2576,6 +2624,8 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const SubnetID& subnet_id, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4) + .arg(subnet_id).arg(code).arg(space); return (impl_->deleteOption4(server_selector, subnet_id, code, space)); } @@ -2585,6 +2635,8 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const asiolink::IOAddress& pool_end_address, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_OPTION4) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()).arg(code).arg(space); return (impl_->deleteOption4(server_selector, pool_start_address, pool_end_address, code, space)); } @@ -2592,6 +2644,8 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, uint64_t MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& server_selector, const std::string& name) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_GLOBAL_PARAMETER4) + .arg(name); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_GLOBAL_PARAMETER4, server_selector, "deleting global parameter", "global parameter deleted", false, @@ -2600,6 +2654,7 @@ MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& server_se uint64_t MySqlConfigBackendDHCPv4::deleteAllGlobalParameters4(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_GLOBAL_PARAMETERS4, server_selector, "deleting all global parameters", "all global parameters deleted", true)); @@ -2607,21 +2662,25 @@ MySqlConfigBackendDHCPv4::deleteAllGlobalParameters4(const ServerSelector& serve std::string MySqlConfigBackendDHCPv4::getType() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_TYPE4); return (impl_->getType()); } std::string MySqlConfigBackendDHCPv4::getHost() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_HOST4); return (impl_->getHost()); } uint16_t MySqlConfigBackendDHCPv4::getPort() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_PORT4); return (impl_->getPort()); } bool MySqlConfigBackendDHCPv4::registerBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_REGISTER_BACKEND_TYPE4); return ( dhcp::ConfigBackendDHCPv4Mgr::instance().registerBackendFactory("mysql", [](const db::DatabaseConnection::ParameterMap& params) -> dhcp::ConfigBackendDHCPv4Ptr { @@ -2632,6 +2691,7 @@ MySqlConfigBackendDHCPv4::registerBackendType() { void MySqlConfigBackendDHCPv4::unregisterBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_UNREGISTER_BACKEND_TYPE4); dhcp::ConfigBackendDHCPv4Mgr::instance().unregisterBackendFactory("mysql"); } diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h index df2b7dbe25..821d2be5ad 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace isc { diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index 629b98b59a..a712fb13b3 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -1,9 +1,11 @@ -// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2019 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 + #include #include #include @@ -37,6 +39,7 @@ using namespace isc::cb; using namespace isc::db; using namespace isc::data; using namespace isc::asiolink; +using namespace isc::log; using namespace isc::util; namespace isc { @@ -1616,7 +1619,6 @@ public: MySqlBinding::createNull() }; - boost::scoped_ptr transaction; // Only start new transaction if specified to do so. This function may // be called from within an existing transaction in which case we @@ -1626,10 +1628,10 @@ public: } OptionDescriptorPtr existing_option = - getOption(GET_OPTION6_SUBNET_ID_CODE_SPACE, Option::V6, - server_selector, subnet_id, - option->option_->getType(), - option->space_name_); + getOption(GET_OPTION6_SUBNET_ID_CODE_SPACE, Option::V6, + server_selector, subnet_id, + option->option_->getType(), + option->space_name_); // Create scoped audit revision. As long as this instance exists // no new audit revisions are created in any subsequent calls. @@ -2559,8 +2561,7 @@ TaggedStatementArray tagged_statements = { { }; // end anonymous namespace -MySqlConfigBackendDHCPv6Impl:: -MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv6Impl::MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters) : MySqlConfigBackendImpl(parameters) { // Prepare query statements. Those are will be only used to retrieve // information from the database, so they can be used even if the @@ -2570,25 +2571,29 @@ MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters) // tagged_statements.begin() + WRITE_STMTS_BEGIN); } -MySqlConfigBackendDHCPv6:: -MySqlConfigBackendDHCPv6(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv6::MySqlConfigBackendDHCPv6(const DatabaseConnection::ParameterMap& parameters) : impl_(new MySqlConfigBackendDHCPv6Impl(parameters)) { } Subnet6Ptr MySqlConfigBackendDHCPv6::getSubnet6(const ServerSelector& server_selector, const std::string& subnet_prefix) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET6_BY_PREFIX) + .arg(subnet_prefix); return (impl_->getSubnet6(server_selector, subnet_prefix)); } Subnet6Ptr MySqlConfigBackendDHCPv6::getSubnet6(const ServerSelector& server_selector, const SubnetID& subnet_id) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID) + .arg(subnet_id); return (impl_->getSubnet6(server_selector, subnet_id)); } Subnet6Collection MySqlConfigBackendDHCPv6::getAllSubnets6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SUBNETS6); Subnet6Collection subnets; impl_->getAllSubnets6(server_selector, subnets); return (subnets); @@ -2597,6 +2602,7 @@ MySqlConfigBackendDHCPv6::getAllSubnets6(const ServerSelector& server_selector) Subnet6Collection MySqlConfigBackendDHCPv6::getModifiedSubnets6(const ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SUBNETS6); Subnet6Collection subnets; impl_->getModifiedSubnets6(server_selector, modification_time, subnets); return (subnets); @@ -2605,6 +2611,8 @@ MySqlConfigBackendDHCPv6::getModifiedSubnets6(const ServerSelector& server_selec Subnet6Collection MySqlConfigBackendDHCPv6::getSharedNetworkSubnets6(const ServerSelector& server_selector, const std::string& shared_network_name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6) + .arg(shared_network_name); Subnet6Collection subnets; impl_->getSharedNetworkSubnets6(server_selector, shared_network_name, subnets); return (subnets); @@ -2613,20 +2621,23 @@ MySqlConfigBackendDHCPv6::getSharedNetworkSubnets6(const ServerSelector& server_ SharedNetwork6Ptr MySqlConfigBackendDHCPv6::getSharedNetwork6(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK6) + .arg(name); return (impl_->getSharedNetwork6(server_selector, name)); } SharedNetwork6Collection MySqlConfigBackendDHCPv6::getAllSharedNetworks6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SHARED_NETWORKS6); SharedNetwork6Collection shared_networks; impl_->getAllSharedNetworks6(server_selector, shared_networks); return (shared_networks); } SharedNetwork6Collection -MySqlConfigBackendDHCPv6:: -getModifiedSharedNetworks6(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getModifiedSharedNetworks6(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6); SharedNetwork6Collection shared_networks; impl_->getModifiedSharedNetworks6(server_selector, modification_time, shared_networks); return (shared_networks); @@ -2636,12 +2647,15 @@ OptionDefinitionPtr MySqlConfigBackendDHCPv6::getOptionDef6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { - return (impl_->getOptionDef(MySqlConfigBackendDHCPv6Impl::GET_OPTION_DEF6_CODE_SPACE, - server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION_DEF6) + .arg(code).arg(space); + return (impl_->getOptionDef(MySqlConfigBackendDHCPv6Impl::GET_OPTION_DEF6_CODE_SPACE, + server_selector, code, space)); } OptionDefContainer MySqlConfigBackendDHCPv6::getAllOptionDefs6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTION_DEFS6); OptionDefContainer option_defs; impl_->getAllOptionDefs(MySqlConfigBackendDHCPv6Impl::GET_ALL_OPTION_DEFS6, server_selector, option_defs); @@ -2649,9 +2663,9 @@ MySqlConfigBackendDHCPv6::getAllOptionDefs6(const ServerSelector& server_selecto } OptionDefContainer -MySqlConfigBackendDHCPv6:: -getModifiedOptionDefs6(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getModifiedOptionDefs6(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTION_DEFS6); OptionDefContainer option_defs; impl_->getModifiedOptionDefs(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_OPTION_DEFS6, server_selector, modification_time, option_defs); @@ -2662,34 +2676,39 @@ OptionDescriptorPtr MySqlConfigBackendDHCPv6::getOption6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { - return (impl_->getOption(MySqlConfigBackendDHCPv6Impl::GET_OPTION6_CODE_SPACE, - Option::V6, server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION6) + .arg(code).arg(space); + return (impl_->getOption(MySqlConfigBackendDHCPv6Impl::GET_OPTION6_CODE_SPACE, + Option::V6, server_selector, code, space)); } OptionContainer MySqlConfigBackendDHCPv6::getAllOptions6(const ServerSelector& server_selector) const { - return (impl_->getAllOptions(MySqlConfigBackendDHCPv6Impl::GET_ALL_OPTIONS6, - Option::V6, server_selector)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTIONS6); + return (impl_->getAllOptions(MySqlConfigBackendDHCPv6Impl::GET_ALL_OPTIONS6, + Option::V6, server_selector)); } OptionContainer -MySqlConfigBackendDHCPv6:: -getModifiedOptions6(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { - return (impl_->getModifiedOptions(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_OPTIONS6, - Option::V6, server_selector, modification_time)); +MySqlConfigBackendDHCPv6::getModifiedOptions6(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTIONS6); + return (impl_->getModifiedOptions(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_OPTIONS6, + Option::V6, server_selector, modification_time)); } StampedValuePtr MySqlConfigBackendDHCPv6::getGlobalParameter6(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_GLOBAL_PARAMETER6) + .arg(name); return (impl_->getGlobalParameter6(server_selector, name)); } StampedValueCollection MySqlConfigBackendDHCPv6::getAllGlobalParameters6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { MySqlBinding::createString(tag) }; @@ -2700,11 +2719,10 @@ MySqlConfigBackendDHCPv6::getAllGlobalParameters6(const ServerSelector& server_s } StampedValueCollection -MySqlConfigBackendDHCPv6:: -getModifiedGlobalParameters6(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getModifiedGlobalParameters6(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { @@ -2714,42 +2732,47 @@ getModifiedGlobalParameters6(const db::ServerSelector& server_selector, impl_->getGlobalParameters(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_GLOBAL_PARAMETERS6, in_bindings, parameters); } - return (parameters); } AuditEntryCollection -MySqlConfigBackendDHCPv6:: -getRecentAuditEntries(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getRecentAuditEntries(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6); AuditEntryCollection audit_entries; impl_->getRecentAuditEntries(MySqlConfigBackendDHCPv6Impl::GET_AUDIT_ENTRIES6_TIME, server_selector, modification_time, audit_entries); - return (audit_entries); } void MySqlConfigBackendDHCPv6::createUpdateSubnet6(const ServerSelector& server_selector, const Subnet6Ptr& subnet) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SUBNET6) + .arg(subnet); impl_->createUpdateSubnet6(server_selector, subnet); } void MySqlConfigBackendDHCPv6::createUpdateSharedNetwork6(const ServerSelector& server_selector, const SharedNetwork6Ptr& shared_network) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6) + .arg(shared_network->getName()); impl_->createUpdateSharedNetwork6(server_selector, shared_network); } void MySqlConfigBackendDHCPv6::createUpdateOptionDef6(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION_DEF6) + .arg(option_def->getName()).arg(option_def->getCode()); impl_->createUpdateOptionDef6(server_selector, option_def); } void MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selector, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION6); impl_->createUpdateOption6(server_selector, option); } @@ -2757,6 +2780,8 @@ void MySqlConfigBackendDHCPv6::createUpdateOption6(const db::ServerSelector& server_selector, const std::string& shared_network_name, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6) + .arg(shared_network_name); impl_->createUpdateOption6(server_selector, shared_network_name, option, false); } @@ -2764,6 +2789,8 @@ void MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selector, const SubnetID& subnet_id, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6) + .arg(subnet_id); impl_->createUpdateOption6(server_selector, subnet_id, option, false); } @@ -2772,6 +2799,8 @@ MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selec const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()); impl_->createUpdateOption6(server_selector, pool_start_address, pool_end_address, option); } @@ -2781,6 +2810,8 @@ MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selec const asiolink::IOAddress& pd_pool_prefix, const uint8_t pd_pool_prefix_length, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6) + .arg(pd_pool_prefix.toText()).arg(pd_pool_prefix_length); impl_->createUpdateOption6(server_selector, pd_pool_prefix, pd_pool_prefix_length, option); } @@ -2788,12 +2819,16 @@ MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selec void MySqlConfigBackendDHCPv6::createUpdateGlobalParameter6(const ServerSelector& server_selector, const StampedValuePtr& value) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6) + .arg(value->getName()); impl_->createUpdateGlobalParameter6(server_selector, value); } uint64_t MySqlConfigBackendDHCPv6::deleteSubnet6(const ServerSelector& server_selector, const std::string& subnet_prefix) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_PREFIX_SUBNET6) + .arg(subnet_prefix); return(impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_SUBNET6_PREFIX, server_selector, "deleting a subnet by prefix", "subnet deleted", true, @@ -2803,11 +2838,14 @@ MySqlConfigBackendDHCPv6::deleteSubnet6(const ServerSelector& server_selector, uint64_t MySqlConfigBackendDHCPv6::deleteSubnet6(const ServerSelector& server_selector, const SubnetID& subnet_id) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6) + .arg(subnet_id); return (impl_->deleteSubnet6(server_selector, subnet_id)); } uint64_t MySqlConfigBackendDHCPv6::deleteAllSubnets6(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SUBNETS6); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SUBNETS6, server_selector, "deleting all subnets", "deleted all subnets", true)); @@ -2816,6 +2854,8 @@ MySqlConfigBackendDHCPv6::deleteAllSubnets6(const ServerSelector& server_selecto uint64_t MySqlConfigBackendDHCPv6::deleteSharedNetworkSubnets6(const db::ServerSelector& server_selector, const std::string& shared_network_name) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6) + .arg(shared_network_name); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SUBNETS6_SHARED_NETWORK_NAME, server_selector, "deleting all subnets for a shared network", @@ -2826,6 +2866,8 @@ MySqlConfigBackendDHCPv6::deleteSharedNetworkSubnets6(const db::ServerSelector& uint64_t MySqlConfigBackendDHCPv6::deleteSharedNetwork6(const ServerSelector& server_selector, const std::string& name) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK6) + .arg(name); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_SHARED_NETWORK6_NAME, server_selector, "deleting a shared network", "shared network deleted", true, @@ -2834,6 +2876,7 @@ MySqlConfigBackendDHCPv6::deleteSharedNetwork6(const ServerSelector& server_sele uint64_t MySqlConfigBackendDHCPv6::deleteAllSharedNetworks6(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SHARED_NETWORKS6, server_selector, "deleting all shared networks", "deleted all shared networks", true)); @@ -2843,11 +2886,14 @@ uint64_t MySqlConfigBackendDHCPv6::deleteOptionDef6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF6) + .arg(code).arg(space); return (impl_->deleteOptionDef6(server_selector, code, space)); } uint64_t MySqlConfigBackendDHCPv6::deleteAllOptionDefs6(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_OPTION_DEFS6); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_OPTION_DEFS6, server_selector, "deleting all option definitions", "deleted all option definitions", true)); @@ -2857,6 +2903,8 @@ uint64_t MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION6) + .arg(code).arg(space); return (impl_->deleteOption6(server_selector, code, space)); } @@ -2865,6 +2913,8 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const std::string& shared_network_name, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6) + .arg(shared_network_name).arg(code).arg(space); return (impl_->deleteOption6(server_selector, shared_network_name, code, space)); } @@ -2874,6 +2924,8 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const SubnetID& subnet_id, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6) + .arg(subnet_id).arg(code).arg(space); return (impl_->deleteOption6(server_selector, subnet_id, code, space)); } @@ -2883,6 +2935,8 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const asiolink::IOAddress& pool_end_address, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_OPTION6) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()).arg(code).arg(space); return (impl_->deleteOption6(server_selector, pool_start_address, pool_end_address, code, space)); } @@ -2893,6 +2947,8 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const uint8_t pd_pool_prefix_length, const uint16_t code, const std::string& space) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6) + .arg(pd_pool_prefix.toText()).arg(pd_pool_prefix_length).arg(code).arg(space); return (impl_->deleteOption6(server_selector, pd_pool_prefix, pd_pool_prefix_length, code, space)); } @@ -2900,6 +2956,8 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, uint64_t MySqlConfigBackendDHCPv6::deleteGlobalParameter6(const ServerSelector& server_selector, const std::string& name) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_GLOBAL_PARAMETER6) + .arg(name); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_GLOBAL_PARAMETER6, server_selector, "deleting global parameter", "global parameter deleted", false, @@ -2908,6 +2966,7 @@ MySqlConfigBackendDHCPv6::deleteGlobalParameter6(const ServerSelector& server_se uint64_t MySqlConfigBackendDHCPv6::deleteAllGlobalParameters6(const ServerSelector& server_selector) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6); return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_GLOBAL_PARAMETERS6, server_selector, "deleting all global parameters", "all global parameters deleted", true)); @@ -2915,21 +2974,25 @@ MySqlConfigBackendDHCPv6::deleteAllGlobalParameters6(const ServerSelector& serve std::string MySqlConfigBackendDHCPv6::getType() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_TYPE6); return (impl_->getType()); } std::string MySqlConfigBackendDHCPv6::getHost() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_HOST6); return (impl_->getHost()); } uint16_t MySqlConfigBackendDHCPv6::getPort() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_PORT6); return (impl_->getPort()); } bool MySqlConfigBackendDHCPv6::registerBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_REGISTER_BACKEND_TYPE6); return ( dhcp::ConfigBackendDHCPv6Mgr::instance().registerBackendFactory("mysql", [](const db::DatabaseConnection::ParameterMap& params) -> dhcp::ConfigBackendDHCPv6Ptr { @@ -2940,6 +3003,7 @@ MySqlConfigBackendDHCPv6::registerBackendType() { void MySqlConfigBackendDHCPv6::unregisterBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_UNREGISTER_BACKEND_TYPE6); dhcp::ConfigBackendDHCPv6Mgr::instance().unregisterBackendFactory("mysql"); } diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h index a6d65f37e4..6a922a4d53 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace isc { diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc index cbef905e21..70518d2e1d 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Fri Feb 08 2019 20:57 +// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 09 2019 11:51 #include #include @@ -7,6 +7,100 @@ namespace isc { namespace cb { +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4 = "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6 = "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6 = "MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4 = "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6 = "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4 = "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6 = "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION4 = "MYSQL_CB_CREATE_UPDATE_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION6 = "MYSQL_CB_CREATE_UPDATE_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF4 = "MYSQL_CB_CREATE_UPDATE_OPTION_DEF4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF6 = "MYSQL_CB_CREATE_UPDATE_OPTION_DEF6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET4 = "MYSQL_CB_CREATE_UPDATE_SUBNET4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET6 = "MYSQL_CB_CREATE_UPDATE_SUBNET6"; +extern const isc::log::MessageID MYSQL_CB_DEINIT_OK = "MYSQL_CB_DEINIT_OK"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4 = "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6 = "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS4 = "MYSQL_CB_DELETE_ALL_OPTION_DEFS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS6 = "MYSQL_CB_DELETE_ALL_OPTION_DEFS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4 = "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6 = "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS4 = "MYSQL_CB_DELETE_ALL_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS6 = "MYSQL_CB_DELETE_ALL_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION4 = "MYSQL_CB_DELETE_BY_POOL_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION6 = "MYSQL_CB_DELETE_BY_POOL_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6 = "MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET4 = "MYSQL_CB_DELETE_BY_PREFIX_SUBNET4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET6 = "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4 = "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6 = "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4 = "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6 = "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER4 = "MYSQL_CB_DELETE_GLOBAL_PARAMETER4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER6 = "MYSQL_CB_DELETE_GLOBAL_PARAMETER6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION4 = "MYSQL_CB_DELETE_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION6 = "MYSQL_CB_DELETE_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF4 = "MYSQL_CB_DELETE_OPTION_DEF4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF6 = "MYSQL_CB_DELETE_OPTION_DEF6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK4 = "MYSQL_CB_DELETE_SHARED_NETWORK4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK6 = "MYSQL_CB_DELETE_SHARED_NETWORK6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4 = "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6 = "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4 = "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6 = "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4 = "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6 = "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS4 = "MYSQL_CB_GET_ALL_OPTIONS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS6 = "MYSQL_CB_GET_ALL_OPTIONS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS4 = "MYSQL_CB_GET_ALL_OPTION_DEFS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS6 = "MYSQL_CB_GET_ALL_OPTION_DEFS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS4 = "MYSQL_CB_GET_ALL_SHARED_NETWORKS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS6 = "MYSQL_CB_GET_ALL_SHARED_NETWORKS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS4 = "MYSQL_CB_GET_ALL_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS6 = "MYSQL_CB_GET_ALL_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER4 = "MYSQL_CB_GET_GLOBAL_PARAMETER4"; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER6 = "MYSQL_CB_GET_GLOBAL_PARAMETER6"; +extern const isc::log::MessageID MYSQL_CB_GET_HOST4 = "MYSQL_CB_GET_HOST4"; +extern const isc::log::MessageID MYSQL_CB_GET_HOST6 = "MYSQL_CB_GET_HOST6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4 = "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6 = "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS4 = "MYSQL_CB_GET_MODIFIED_OPTIONS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS6 = "MYSQL_CB_GET_MODIFIED_OPTIONS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS4 = "MYSQL_CB_GET_MODIFIED_OPTION_DEFS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS6 = "MYSQL_CB_GET_MODIFIED_OPTION_DEFS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4 = "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6 = "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS4 = "MYSQL_CB_GET_MODIFIED_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS6 = "MYSQL_CB_GET_MODIFIED_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION4 = "MYSQL_CB_GET_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION6 = "MYSQL_CB_GET_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF4 = "MYSQL_CB_GET_OPTION_DEF4"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF6 = "MYSQL_CB_GET_OPTION_DEF6"; +extern const isc::log::MessageID MYSQL_CB_GET_PORT4 = "MYSQL_CB_GET_PORT4"; +extern const isc::log::MessageID MYSQL_CB_GET_PORT6 = "MYSQL_CB_GET_PORT6"; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4 = "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4"; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6 = "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK4 = "MYSQL_CB_GET_SHARED_NETWORK4"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK6 = "MYSQL_CB_GET_SHARED_NETWORK6"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4 = "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6 = "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_PREFIX = "MYSQL_CB_GET_SUBNET4_BY_PREFIX"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID = "MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_PREFIX = "MYSQL_CB_GET_SUBNET6_BY_PREFIX"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID = "MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID"; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE4 = "MYSQL_CB_GET_TYPE4"; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE6 = "MYSQL_CB_GET_TYPE6"; +extern const isc::log::MessageID MYSQL_CB_INIT_OK = "MYSQL_CB_INIT_OK"; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE4 = "MYSQL_CB_REGISTER_BACKEND_TYPE4"; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE6 = "MYSQL_CB_REGISTER_BACKEND_TYPE6"; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE4 = "MYSQL_CB_UNREGISTER_BACKEND_TYPE4"; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE6 = "MYSQL_CB_UNREGISTER_BACKEND_TYPE6"; } // namespace cb } // namespace isc @@ -14,6 +108,100 @@ namespace cb { namespace { const char* values[] = { + "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4", "create or update MySQL CB option4 pool start %1 pool end %2", + "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6", "create or update MySQL CB option6 pool start %1 pool end %2", + "MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6", "create or update MySQL CB option6 prefix %1 prefix len %2", + "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4", "create or update MySQL CB option4 by subnet id %1", + "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6", "create or update MySQL CB option6 by subnet id %1", + "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4", "create or update MySQL CB global parameter4 %1", + "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6", "create or update MySQL CB global parameter6 %1", + "MYSQL_CB_CREATE_UPDATE_OPTION4", "create or update MySQL CB option4", + "MYSQL_CB_CREATE_UPDATE_OPTION6", "create or update MySQL CB option6", + "MYSQL_CB_CREATE_UPDATE_OPTION_DEF4", "create or update MySQL CB option definition4 %1 code %2", + "MYSQL_CB_CREATE_UPDATE_OPTION_DEF6", "create or update MySQL CB option definition6 %1 code %2", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4", "create or update MySQL CB shared network4 %1", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6", "create or update MySQL CB shared network6 %1", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4", "create or update MySQL CB shared network %1 option4", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6", "create or update MySQL CB shared network %1 option6", + "MYSQL_CB_CREATE_UPDATE_SUBNET4", "create or update MySQL CB subnet4 %1", + "MYSQL_CB_CREATE_UPDATE_SUBNET6", "create or update MySQL CB subnet6 %1", + "MYSQL_CB_DEINIT_OK", "unloading MYSQAL CB hooks library successful", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4", "delete MySQL CB all global parameters4", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6", "delete MySQL CB all global parameters6", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS4", "delete MySQL CB all option definitions4", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS6", "delete MySQL CB all option definitions6", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4", "delete MySQL CB all shared networks4", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6", "delete MySQL CB all shared networks6", + "MYSQL_CB_DELETE_ALL_SUBNETS4", "delete MySQL CB all subnets4", + "MYSQL_CB_DELETE_ALL_SUBNETS6", "delete MySQL CB all subnets6", + "MYSQL_CB_DELETE_BY_POOL_OPTION4", "delete MySQL CB pool start %1 pool end %2 option4 code %3 space %4", + "MYSQL_CB_DELETE_BY_POOL_OPTION6", "delete MySQL CB pool start %1 pool end %2 option6 code %3 space %4", + "MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6", "delete MySQL CB prefix %1 prefix len %2 option6 code %3 space %4", + "MYSQL_CB_DELETE_BY_PREFIX_SUBNET4", "delete MySQL CB subnet4 by prefix %1", + "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6", "delete MySQL CB subnet6 by prefix %1", + "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4", "delete MySQL CB by subnet id %1 option4 code %2 space %3", + "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6", "delete MySQL CB by subnet id %1 option6 code %2 space %3", + "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4", "delete MySQL CB subnet4 by subnet id %1", + "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6", "delete MySQL CB subnet6 by subnet id %1", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER4", "delete MySQL CB global parameter4 %1", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER6", "delete MySQL CB global parameter6 %1", + "MYSQL_CB_DELETE_OPTION4", "delete MySQL CB option4 code %1 space %2", + "MYSQL_CB_DELETE_OPTION6", "delete MySQL CB option6 code %1 space %2", + "MYSQL_CB_DELETE_OPTION_DEF4", "delete MySQL CB option definition4 code %1 space %2", + "MYSQL_CB_DELETE_OPTION_DEF6", "delete MySQL CB option definition6 code %1 space %2", + "MYSQL_CB_DELETE_SHARED_NETWORK4", "delete MySQL CB shared network4 %1", + "MYSQL_CB_DELETE_SHARED_NETWORK6", "delete MySQL CB shared network6 %1", + "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4", "delete MySQL CB shared network %1 option4 code %2 space %3", + "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6", "delete MySQL CB shared network %1 option6 code %2 space %3", + "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4", "delete MySQL CB shared network %1 subnets4", + "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6", "delete MySQL CB shared network %1 subnets6", + "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4", "retrieving MySQL CB all global parameters4", + "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6", "retrieving MySQL CB all global parameters6", + "MYSQL_CB_GET_ALL_OPTIONS4", "retrieving MySQL CB all options4", + "MYSQL_CB_GET_ALL_OPTIONS6", "retrieving MySQL CB all options6", + "MYSQL_CB_GET_ALL_OPTION_DEFS4", "retrieving MySQL CB all option definitions4", + "MYSQL_CB_GET_ALL_OPTION_DEFS6", "retrieving MySQL CB all option definitions6", + "MYSQL_CB_GET_ALL_SHARED_NETWORKS4", "retrieving MySQL CB all shared networks4", + "MYSQL_CB_GET_ALL_SHARED_NETWORKS6", "retrieving MySQL CB all shared networks6", + "MYSQL_CB_GET_ALL_SUBNETS4", "retrieving all MySQL CB subnets4", + "MYSQL_CB_GET_ALL_SUBNETS6", "retrieving all MySQL CB subnets6", + "MYSQL_CB_GET_GLOBAL_PARAMETER4", "retrieving MySQL CB global parameter4 %1", + "MYSQL_CB_GET_GLOBAL_PARAMETER6", "retrieving MySQL CB global parameter6 %1", + "MYSQL_CB_GET_HOST4", "get MySQL CB host4", + "MYSQL_CB_GET_HOST6", "get MySQL CB host6", + "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4", "retrieving MySQL CB modified global parameters4", + "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6", "retrieving MySQL CB modified global parameters6", + "MYSQL_CB_GET_MODIFIED_OPTIONS4", "retrieving MySQL CB modified options4", + "MYSQL_CB_GET_MODIFIED_OPTIONS6", "retrieving MySQL CB modified options6", + "MYSQL_CB_GET_MODIFIED_OPTION_DEFS4", "retrieving MySQL CB modified option definitions4", + "MYSQL_CB_GET_MODIFIED_OPTION_DEFS6", "retrieving MySQL CB modified option definitions6", + "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4", "retrieving MySQL CB modified shared networks4", + "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6", "retrieving MySQL CB modified shared networks6", + "MYSQL_CB_GET_MODIFIED_SUBNETS4", "retrieving modified MySQL CB subnets4", + "MYSQL_CB_GET_MODIFIED_SUBNETS6", "retrieving modified MySQL CB subnets6", + "MYSQL_CB_GET_OPTION4", "retrieving MySQL CB option4 code %1 space %2", + "MYSQL_CB_GET_OPTION6", "retrieving MySQL CB option6 code %1 space %2", + "MYSQL_CB_GET_OPTION_DEF4", "retrieving MySQL CB option definition4 code %1 space %2", + "MYSQL_CB_GET_OPTION_DEF6", "retrieving MySQL CB option definition6 code %1 space %2", + "MYSQL_CB_GET_PORT4", "get MySQL CB port4", + "MYSQL_CB_GET_PORT6", "get MySQL CB port6", + "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4", "retrieving MySQL CB audit entries4", + "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6", "retrieving MySQL CB audit entries6", + "MYSQL_CB_GET_SHARED_NETWORK4", "retrieving MySQL CB shared network4 %1", + "MYSQL_CB_GET_SHARED_NETWORK6", "retrieving MySQL CB shared network6 %1", + "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4", "retrieving MySQL CB shared network %1 subnets4", + "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6", "retrieving MySQL CB shared network %1 subnets6", + "MYSQL_CB_GET_SUBNET4_BY_PREFIX", "retrieving MySQL CB subnet4 by prefix %1", + "MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID", "retrieving MySQL CB subnet4 by subnet id %1", + "MYSQL_CB_GET_SUBNET6_BY_PREFIX", "retrieving MySQL CB subnet6 by prefix %1", + "MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID", "retrieving MySQL CB subnet6 by subnet id %1", + "MYSQL_CB_GET_TYPE4", "get MySQL CB type4", + "MYSQL_CB_GET_TYPE6", "get MySQL CB type6", + "MYSQL_CB_INIT_OK", "loading MYSQL CB hooks library successful", + "MYSQL_CB_REGISTER_BACKEND_TYPE4", "register MySQL CB backend4", + "MYSQL_CB_REGISTER_BACKEND_TYPE6", "register MySQL CB backend6", + "MYSQL_CB_UNREGISTER_BACKEND_TYPE4", "unregister MySQL CB backend4", + "MYSQL_CB_UNREGISTER_BACKEND_TYPE6", "unregister MySQL CB backend6", NULL }; diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h index 255b4d16c1..e3ac516154 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Fri Feb 08 2019 20:57 +// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 09 2019 11:51 #ifndef MYSQL_CB_MESSAGES_H #define MYSQL_CB_MESSAGES_H @@ -8,6 +8,100 @@ namespace isc { namespace cb { +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET6; +extern const isc::log::MessageID MYSQL_CB_DEINIT_OK; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER4; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER6; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF4; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF6; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK4; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK6; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER4; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER6; +extern const isc::log::MessageID MYSQL_CB_GET_HOST4; +extern const isc::log::MessageID MYSQL_CB_GET_HOST6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION4; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION6; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF4; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF6; +extern const isc::log::MessageID MYSQL_CB_GET_PORT4; +extern const isc::log::MessageID MYSQL_CB_GET_PORT6; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK4; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK6; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_PREFIX; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_PREFIX; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE4; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE6; +extern const isc::log::MessageID MYSQL_CB_INIT_OK; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE4; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE6; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE4; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE6; } // namespace cb } // namespace isc diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes index b03f62a1e1..8cdd699718 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes @@ -1,3 +1,287 @@ # Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") $NAMESPACE isc::cb + +% MYSQL_CB_INIT_OK loading MYSQL CB hooks library successful +This informational message indicates that the MySQL Configuration Backend hooks +library has been loaded successfully. + +% MYSQL_CB_DEINIT_OK unloading MYSQAL CB hooks library successful +This informational message indicates that the MySQL Configuration Backend hooks +library has been unloaded successfully. + +% MYSQL_CB_GET_SUBNET4_BY_PREFIX retrieving MySQL CB subnet4 by prefix %1 +Retrieve MySQL CB subnet4 by prefix + +% MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID retrieving MySQL CB subnet4 by subnet id %1 +Retrieve MySQL CB subnet4 by subnet id + +% MYSQL_CB_GET_ALL_SUBNETS4 retrieving all MySQL CB subnets4 +Retrieve MySQL CB all subnets4 + +% MYSQL_CB_GET_MODIFIED_SUBNETS4 retrieving modified MySQL CB subnets4 +Retrieve MySQL CB modified subnets4 + +% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4 retrieving MySQL CB shared network %1 subnets4 +Retrieve MySQL CB shared network subnets4 + +% MYSQL_CB_GET_SHARED_NETWORK4 retrieving MySQL CB shared network4 %1 +Retrieve MySQL CB shared network4 + +% MYSQL_CB_GET_ALL_SHARED_NETWORKS4 retrieving MySQL CB all shared networks4 +Retrieve MySQL CB all shared networks4 + +% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4 retrieving MySQL CB modified shared networks4 +Retrieve MySQL CB modified shared networks4 + +% MYSQL_CB_GET_OPTION_DEF4 retrieving MySQL CB option definition4 code %1 space %2 +Retrieve MySQL CB option definition4 + +% MYSQL_CB_GET_ALL_OPTION_DEFS4 retrieving MySQL CB all option definitions4 +Retrieve MySQL CB all option definitions4 + +% MYSQL_CB_GET_MODIFIED_OPTION_DEFS4 retrieving MySQL CB modified option definitions4 +Retrieve MySQL CB modified option definitions4 + +% MYSQL_CB_GET_OPTION4 retrieving MySQL CB option4 code %1 space %2 +Retrieve MySQL CB option4 + +% MYSQL_CB_GET_ALL_OPTIONS4 retrieving MySQL CB all options4 +Retrieve MySQL CB all options4 + +% MYSQL_CB_GET_MODIFIED_OPTIONS4 retrieving MySQL CB modified options4 +Retrieve MySQL CB modified options4 + +% MYSQL_CB_GET_GLOBAL_PARAMETER4 retrieving MySQL CB global parameter4 %1 +Retrieve MySQL CB global parameter4 + +% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4 retrieving MySQL CB all global parameters4 +Retrieve MySQL CB all global parameters4 + +% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4 retrieving MySQL CB modified global parameters4 +Retrieve MySQL CB modified global parameters4 + +% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4 retrieving MySQL CB audit entries4 +Retrieve MySQL CB audit entries4 + +% MYSQL_CB_CREATE_UPDATE_SUBNET4 create or update MySQL CB subnet4 %1 +Create or update MySQL CB subnet4 + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4 create or update MySQL CB shared network4 %1 +Create or update MySQL CB shared network4 + +% MYSQL_CB_CREATE_UPDATE_OPTION_DEF4 create or update MySQL CB option definition4 %1 code %2 +Create or update MySQL CB option definition4 + +% MYSQL_CB_CREATE_UPDATE_OPTION4 create or update MySQL CB option4 +Create or update MySQL CB option4 + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 create or update MySQL CB shared network %1 option4 +Create or update MySQL CB shared network option4 + +% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4 create or update MySQL CB option4 by subnet id %1 +Create or update MySQL CB option4 by subnet id + +% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4 create or update MySQL CB option4 pool start %1 pool end %2 +Create or update MySQL CB option4 by pool + +% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4 create or update MySQL CB global parameter4 %1 +Create or update MySQL CB global parameter4 + +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET4 delete MySQL CB subnet4 by prefix %1 +Delete MySQL CB subnet4 by prefix + +% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4 delete MySQL CB subnet4 by subnet id %1 +Delete MySQL CB subnet4 by subnet id + +% MYSQL_CB_DELETE_ALL_SUBNETS4 delete MySQL CB all subnets4 +Delete MySQL CB all subnets4 + +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4 delete MySQL CB shared network %1 subnets4 +Delete MySQL CB shared network subnets4 + +% MYSQL_CB_DELETE_SHARED_NETWORK4 delete MySQL CB shared network4 %1 +Delete MySQL CB shared network4 + +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4 delete MySQL CB all shared networks4 +Delete MySQL CB all shared networks4 + +% MYSQL_CB_DELETE_OPTION_DEF4 delete MySQL CB option definition4 code %1 space %2 +Delete MySQL CB option definition4 + +% MYSQL_CB_DELETE_ALL_OPTION_DEFS4 delete MySQL CB all option definitions4 +Delete MySQL CB all option definitions4 + +% MYSQL_CB_DELETE_OPTION4 delete MySQL CB option4 code %1 space %2 +Delete MySQL CB option4 + +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4 delete MySQL CB shared network %1 option4 code %2 space %3 +Delete MySQL CB shared network option4 + +% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4 delete MySQL CB by subnet id %1 option4 code %2 space %3 +Delete MySQL CB option4 by subnet id + +% MYSQL_CB_DELETE_BY_POOL_OPTION4 delete MySQL CB pool start %1 pool end %2 option4 code %3 space %4 +Delete MySQL CB option4 by pool + +% MYSQL_CB_DELETE_GLOBAL_PARAMETER4 delete MySQL CB global parameter4 %1 +Delete MySQL CB global parameter4 + +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4 delete MySQL CB all global parameters4 +Delete MySQL CB all global parameters4 + +% MYSQL_CB_GET_TYPE4 get MySQL CB type4 +Retrieve MySQL CB type4 + +% MYSQL_CB_GET_HOST4 get MySQL CB host4 +Retrieve MySQL CB host4 + +% MYSQL_CB_GET_PORT4 get MySQL CB port4 +Retrieve MySQL CB port4 + +% MYSQL_CB_REGISTER_BACKEND_TYPE4 register MySQL CB backend4 +Register MySQL CB backend4 + +% MYSQL_CB_UNREGISTER_BACKEND_TYPE4 unregister MySQL CB backend4 +Unregister MySQL CB backend4 + +% MYSQL_CB_GET_SUBNET6_BY_PREFIX retrieving MySQL CB subnet6 by prefix %1 +Retrieve MySQL CB subnet6 by prefix + +% MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID retrieving MySQL CB subnet6 by subnet id %1 +Retrieve MySQL CB subnet6 by subnet id + +% MYSQL_CB_GET_ALL_SUBNETS6 retrieving all MySQL CB subnets6 +Retrieve MySQL CB all subnets6 + +% MYSQL_CB_GET_MODIFIED_SUBNETS6 retrieving modified MySQL CB subnets6 +Retrieve MySQL CB modified subnets6 + +% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6 retrieving MySQL CB shared network %1 subnets6 +Retrieve MySQL CB shared network subnets6 + +% MYSQL_CB_GET_SHARED_NETWORK6 retrieving MySQL CB shared network6 %1 +Retrieve MySQL CB shared network6 + +% MYSQL_CB_GET_ALL_SHARED_NETWORKS6 retrieving MySQL CB all shared networks6 +Retrieve MySQL CB all shared networks6 + +% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6 retrieving MySQL CB modified shared networks6 +Retrieve MySQL CB modified shared networks6 + +% MYSQL_CB_GET_OPTION_DEF6 retrieving MySQL CB option definition6 code %1 space %2 +Retrieve MySQL CB option definition6 + +% MYSQL_CB_GET_ALL_OPTION_DEFS6 retrieving MySQL CB all option definitions6 +Retrieve MySQL CB all option definitions6 + +% MYSQL_CB_GET_MODIFIED_OPTION_DEFS6 retrieving MySQL CB modified option definitions6 +Retrieve MySQL CB modified option definitions6 + +% MYSQL_CB_GET_OPTION6 retrieving MySQL CB option6 code %1 space %2 +Retrieve MySQL CB option6 + +% MYSQL_CB_GET_ALL_OPTIONS6 retrieving MySQL CB all options6 +Retrieve MySQL CB all options6 + +% MYSQL_CB_GET_MODIFIED_OPTIONS6 retrieving MySQL CB modified options6 +Retrieve MySQL CB modified options6 + +% MYSQL_CB_GET_GLOBAL_PARAMETER6 retrieving MySQL CB global parameter6 %1 +Retrieve MySQL CB global parameter6 + +% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6 retrieving MySQL CB all global parameters6 +Retrieve MySQL CB all global parameters6 + +% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6 retrieving MySQL CB modified global parameters6 +Retrieve MySQL CB modified global parameters6 + +% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6 retrieving MySQL CB audit entries6 +Retrieve MySQL CB audit entries6 + +% MYSQL_CB_CREATE_UPDATE_SUBNET6 create or update MySQL CB subnet6 %1 +Create or update MySQL CB subnet6 + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6 create or update MySQL CB shared network6 %1 +Create or update MySQL CB shared network6 + +% MYSQL_CB_CREATE_UPDATE_OPTION_DEF6 create or update MySQL CB option definition6 %1 code %2 +Create or update MySQL CB option definition6 + +% MYSQL_CB_CREATE_UPDATE_OPTION6 create or update MySQL CB option6 +Create or update MySQL CB option6 + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 create or update MySQL CB shared network %1 option6 +Create or update MySQL CB shared network option6 + +% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6 create or update MySQL CB option6 by subnet id %1 +Create or update MySQL CB option6 by subnet id + +% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6 create or update MySQL CB option6 pool start %1 pool end %2 +Create or update MySQL CB option6 by pool + +% MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6 create or update MySQL CB option6 prefix %1 prefix len %2 +Create or update MySQL CB option6 by prefix + +% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6 create or update MySQL CB global parameter6 %1 +Create or update MySQL CB global parameter6 + +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6 delete MySQL CB subnet6 by prefix %1 +Delete MySQL CB subnet6 by prefix + +% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6 delete MySQL CB subnet6 by subnet id %1 +Delete MySQL CB subnet6 by subnet id + +% MYSQL_CB_DELETE_ALL_SUBNETS6 delete MySQL CB all subnets6 +Delete MySQL CB all subnets6 + +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6 delete MySQL CB shared network %1 subnets6 +Delete MySQL CB shared network subnets6 + +% MYSQL_CB_DELETE_SHARED_NETWORK6 delete MySQL CB shared network6 %1 +Delete MySQL CB shared network6 + +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6 delete MySQL CB all shared networks6 +Delete MySQL CB all shared networks6 + +% MYSQL_CB_DELETE_OPTION_DEF6 delete MySQL CB option definition6 code %1 space %2 +Delete MySQL CB option definition6 + +% MYSQL_CB_DELETE_ALL_OPTION_DEFS6 delete MySQL CB all option definitions6 +Delete MySQL CB all option definitions6 + +% MYSQL_CB_DELETE_OPTION6 delete MySQL CB option6 code %1 space %2 +Delete MySQL CB option6 + +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6 delete MySQL CB shared network %1 option6 code %2 space %3 +Delete MySQL CB shared network option6 + +% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6 delete MySQL CB by subnet id %1 option6 code %2 space %3 +Delete MySQL CB option6 by subnet id + +% MYSQL_CB_DELETE_BY_POOL_OPTION6 delete MySQL CB pool start %1 pool end %2 option6 code %3 space %4 +Delete MySQL CB option6 by pool + +% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6 delete MySQL CB prefix %1 prefix len %2 option6 code %3 space %4 +Delete MySQL CB option6 by prefix + +% MYSQL_CB_DELETE_GLOBAL_PARAMETER6 delete MySQL CB global parameter6 %1 +Delete MySQL CB global parameter6 + +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6 delete MySQL CB all global parameters6 +Delete MySQL CB all global parameters6 + +% MYSQL_CB_GET_TYPE6 get MySQL CB type6 +Retrieve MySQL CB type6 + +% MYSQL_CB_GET_HOST6 get MySQL CB host6 +Retrieve MySQL CB host6 + +% MYSQL_CB_GET_PORT6 get MySQL CB port6 +Retrieve MySQL CB port6 + +% MYSQL_CB_REGISTER_BACKEND_TYPE6 register MySQL CB backend6 +Register MySQL CB backend6 + +% MYSQL_CB_UNREGISTER_BACKEND_TYPE6 unregister MySQL CB backend6 +Unregister MySQL CB backend6 diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index a6155f05da..845f6be5bc 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -740,7 +740,7 @@ The code has issued a begin transaction call. % DHCPSRV_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. +the commit may not include a write to disk. % DHCPSRV_MYSQL_DB opening MySQL lease database: %1 This informational message is logged when a DHCP server (either V4 or @@ -772,7 +772,7 @@ lease expires before considering its removal. % DHCPSRV_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 +attempt to recover the connectivity. If not the server will 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. @@ -922,7 +922,7 @@ The code has issued a begin transaction call. % DHCPSRV_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. +the commit may not include a write to disk. % DHCPSRV_PGSQL_DB opening PostgreSQL lease database: %1 This informational message is logged when a DHCP server (either V4 or @@ -956,7 +956,7 @@ lease expires before considering its removal. % DHCPSRV_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 +attempt to recover the connectivity. If not the server will 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. -- 2.47.2