From: Marcin Siodelski Date: Thu, 4 Oct 2018 15:48:22 +0000 (+0200) Subject: [#93,!35] Addressed minor and refectoring issues. X-Git-Tag: 5-netconf-extend-syntax_base~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d56eac737ce0ddf4195fa881709bd1b3dab109a;p=thirdparty%2Fkea.git [#93,!35] Addressed minor and refectoring issues. --- diff --git a/src/hooks/dhcp/mysql_cb/Makefile.am b/src/hooks/dhcp/mysql_cb/Makefile.am index efdd70bef7..de1b592e36 100644 --- a/src/hooks/dhcp/mysql_cb/Makefile.am +++ b/src/hooks/dhcp/mysql_cb/Makefile.am @@ -47,6 +47,7 @@ libdhcp_mysql_cb_la_LIBADD = libmysqlcb.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la +libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index ba0d01a2bf..5f69793805 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -242,6 +242,9 @@ public: subnets.push_back(last_subnet); } + // If the row contains information about the pool and it appears to be + // new pool entry (checked by comparing pool id), let's create the new + // pool and add it to the subnet. if (!out_bindings[20]->amNull() && (out_bindings[21]->getInteger() != 0) && (out_bindings[22]->getInteger() != 0) && @@ -257,12 +260,12 @@ public: /// @brief Sends query to retrieve single subnet by id. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Subnet identifier. /// /// @return Pointer to the returned subnet or NULL if such subnet /// doesn't exist. - Subnet4Ptr getSubnet4(const ServerSelector& /* selector */, + Subnet4Ptr getSubnet4(const ServerSelector& /* server_selector */, const SubnetID& subnet_id) { MySqlBindingCollection in_bindings; in_bindings.push_back(MySqlBinding::createInteger(subnet_id)); @@ -277,12 +280,12 @@ public: /// /// The prefix should be in the following format: "192.0.2.0/24". /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Subnet identifier. /// /// @return Pointer to the returned subnet or NULL if such subnet /// doesn't exist. - Subnet4Ptr getSubnet4(const ServerSelector& /* selector */, + Subnet4Ptr getSubnet4(const ServerSelector& /* server_selector */, const std::string& subnet_prefix) { MySqlBindingCollection in_bindings; in_bindings.push_back(MySqlBinding::createString(subnet_prefix)); @@ -295,9 +298,9 @@ public: /// @brief Sends query to insert or update subnet. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet Pointer to the subnet to be inserted or updated. - void createUpdateSubnet4(const ServerSelector& selector, + void createUpdateSubnet4(const ServerSelector& server_selector, const Subnet4Ptr& subnet) { // Convert DHCPv4o6 interface id to text. OptionPtr dhcp4o6_interface_id = subnet->get4o6().getInterfaceId(); @@ -359,7 +362,7 @@ public: }; // Check if the subnet already exists. - Subnet4Ptr existing_subnet = getSubnet4(selector, subnet->getID()); + Subnet4Ptr existing_subnet = getSubnet4(server_selector, subnet->getID()); // If the subnet exists we are going to update this subnet. if (existing_subnet) { @@ -402,9 +405,9 @@ public: /// @brief Sends query to delete subnet by id. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of the subnet to be deleted. - void deleteSubnet4(const ServerSelector& /* selector */, + void deleteSubnet4(const ServerSelector& /* server_selector */, const SubnetID& subnet_id) { MySqlBindingCollection in_bindings; in_bindings.push_back(MySqlBinding::createInteger(subnet_id)); @@ -468,6 +471,9 @@ public: last_network = *shared_networks.rbegin(); } + // If this is the first shared network or the shared network id in this + // row points to the next shared network we use the data in the + // row to create the new shared network instance. if ((last_network_id == 0) || (last_network_id != out_bindings[0]->getInteger())) { @@ -553,12 +559,12 @@ public: /// @brief Sends query to retrieve single shared network by name. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Shared network name. /// /// @return Pointer to the returned shared network or NULL if such shared /// network doesn't exist. - SharedNetwork4Ptr getSharedNetwork4(const ServerSelector& /* selector */, + SharedNetwork4Ptr getSharedNetwork4(const ServerSelector& /* server_selector */, const std::string& name) { MySqlBindingCollection in_bindings; in_bindings.push_back(MySqlBinding::createString(name)); @@ -571,9 +577,9 @@ public: /// @brief Sends query to insert or update shared network. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet Pointer to the shared network to be inserted or updated. - void createUpdateSharedNetwork4(const ServerSelector& selector, + void createUpdateSharedNetwork4(const ServerSelector& server_selector, const SharedNetwork4Ptr& shared_network) { MySqlBindingCollection in_bindings = { MySqlBinding::createString(shared_network->getName()), @@ -592,7 +598,7 @@ public: }; // Check if the shared network already exists. - SharedNetwork4Ptr existing_network = getSharedNetwork4(selector, + SharedNetwork4Ptr existing_network = getSharedNetwork4(server_selector, shared_network->getName()); // If the shared network exists we are going to update this network. @@ -625,13 +631,13 @@ public: /// @brief Sends query to retrieve single option definition by code and /// option space. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Option code. /// @param space Option space name. /// /// @return Pointer to the returned option definition or NULL if such /// option definition doesn't exist. - OptionDefinitionPtr getOptionDef4(const ServerSelector& /* selector */, + OptionDefinitionPtr getOptionDef4(const ServerSelector& /* server_selector */, const uint16_t code, const std::string& space) { OptionDefContainer option_defs; @@ -645,9 +651,9 @@ public: /// @brief Sends query to retrieve all option definitions. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @return Container holding returned option definitions. - OptionDefContainer getAllOptionDefs4(const ServerSelector& /* selector */) { + OptionDefContainer getAllOptionDefs4(const ServerSelector& /* server_selector */) { OptionDefContainer option_defs; MySqlBindingCollection in_bindings; getOptionDefs(MySqlConfigBackendDHCPv4Impl::GET_ALL_OPTION_DEFS4, @@ -658,11 +664,11 @@ public: /// @brief Sends query to retrieve option definitions with modification /// time later than specified timestamp. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Lower bound subnet modification time. /// @return Container holding returned option definitions. OptionDefContainer - getModifiedOptionDefs4(const ServerSelector& /* selector */, + getModifiedOptionDefs4(const ServerSelector& /* server_selector */, const boost::posix_time::ptime& modification_time) { OptionDefContainer option_defs; MySqlBindingCollection in_bindings = { @@ -675,9 +681,9 @@ public: /// @brief Sends query to insert or update option definition. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param option_def Pointer to the option definition to be inserted or updated. - void createUpdateOptionDef4(const ServerSelector& selector, + void createUpdateOptionDef4(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { ElementPtr record_types = Element::createList(); for (auto field : option_def->getRecordFields()) { @@ -700,7 +706,7 @@ public: }; // If the shared network exists we are going to update this network. - OptionDefinitionPtr existing_definition = getOptionDef4(selector, + OptionDefinitionPtr existing_definition = getOptionDef4(server_selector, option_def->getCode(), option_def->getOptionSpaceName()); if (existing_definition) { @@ -720,10 +726,11 @@ public: /// @brief Sends query to delete option definition by code and /// option space name. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Option code. /// @param name Option name. - void deleteOptionDef4(const ServerSelector& /* selector */, const uint16_t code, + void deleteOptionDef4(const ServerSelector& /* server_selector */, + const uint16_t code, const std::string& space) { MySqlBindingCollection in_bindings = { MySqlBinding::createInteger(static_cast(code)), @@ -1160,19 +1167,19 @@ MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters) } Subnet4Ptr -MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector, const std::string& subnet_prefix) const { - return (impl_->getSubnet4(selector, subnet_prefix)); + return (impl_->getSubnet4(server_selector, subnet_prefix)); } Subnet4Ptr -MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector, const SubnetID& subnet_id) const { - return (impl_->getSubnet4(selector, subnet_id)); + return (impl_->getSubnet4(server_selector, subnet_id)); } Subnet4Collection -MySqlConfigBackendDHCPv4::getAllSubnets4(const ServerSelector& /* selector */) const { +MySqlConfigBackendDHCPv4::getAllSubnets4(const ServerSelector& /* server_selector */) const { Subnet4Collection subnets; MySqlBindingCollection in_bindings; impl_->getSubnets4(MySqlConfigBackendDHCPv4Impl::GET_ALL_SUBNETS4, @@ -1181,7 +1188,7 @@ MySqlConfigBackendDHCPv4::getAllSubnets4(const ServerSelector& /* selector */) c } Subnet4Collection -MySqlConfigBackendDHCPv4::getModifiedSubnets4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::getModifiedSubnets4(const ServerSelector& /* server_selector */, const boost::posix_time::ptime& modification_time) const { Subnet4Collection subnets; MySqlBindingCollection in_bindings = { @@ -1193,13 +1200,13 @@ MySqlConfigBackendDHCPv4::getModifiedSubnets4(const ServerSelector& /* selector } SharedNetwork4Ptr -MySqlConfigBackendDHCPv4::getSharedNetwork4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::getSharedNetwork4(const ServerSelector& server_selector, const std::string& name) const { - return (impl_->getSharedNetwork4(selector, name)); + return (impl_->getSharedNetwork4(server_selector, name)); } SharedNetwork4Collection -MySqlConfigBackendDHCPv4::getAllSharedNetworks4(const ServerSelector& /* selector */) const { +MySqlConfigBackendDHCPv4::getAllSharedNetworks4(const ServerSelector& /* server_selector */) const { SharedNetwork4Collection shared_networks; MySqlBindingCollection in_bindings; impl_->getSharedNetworks4(MySqlConfigBackendDHCPv4Impl::GET_ALL_SHARED_NETWORKS4, @@ -1209,7 +1216,7 @@ MySqlConfigBackendDHCPv4::getAllSharedNetworks4(const ServerSelector& /* selecto SharedNetwork4Collection MySqlConfigBackendDHCPv4:: -getModifiedSharedNetworks4(const ServerSelector& /* selector */, +getModifiedSharedNetworks4(const ServerSelector& /* server_selector */, const boost::posix_time::ptime& modification_time) const { SharedNetwork4Collection shared_networks; MySqlBindingCollection in_bindings = { @@ -1221,146 +1228,146 @@ getModifiedSharedNetworks4(const ServerSelector& /* selector */, } OptionDefinitionPtr -MySqlConfigBackendDHCPv4::getOptionDef4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::getOptionDef4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { - return (impl_->getOptionDef4(selector, code, space)); + return (impl_->getOptionDef4(server_selector, code, space)); } OptionDefContainer -MySqlConfigBackendDHCPv4::getAllOptionDefs4(const ServerSelector& selector) const { - return (impl_->getAllOptionDefs4(selector)); +MySqlConfigBackendDHCPv4::getAllOptionDefs4(const ServerSelector& server_selector) const { + return (impl_->getAllOptionDefs4(server_selector)); } OptionDefContainer MySqlConfigBackendDHCPv4:: -getModifiedOptionDefs4(const ServerSelector& selector, +getModifiedOptionDefs4(const ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const { - return (impl_->getModifiedOptionDefs4(selector, modification_time)); + return (impl_->getModifiedOptionDefs4(server_selector, modification_time)); } util::OptionalValue -MySqlConfigBackendDHCPv4::getGlobalStringParameter4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::getGlobalStringParameter4(const ServerSelector& /* server_selector */, const std::string& /* name */) const { isc_throw(NotImplemented, "not implemented"); } util::OptionalValue -MySqlConfigBackendDHCPv4::getGlobalNumberParameter4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::getGlobalNumberParameter4(const ServerSelector& /* server_selector */, const std::string& /* name */) const { isc_throw(NotImplemented, "not implemented"); } std::map -MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& /* selector */) const { +MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& /* server_selector */) const { isc_throw(NotImplemented, "not implemented"); } void -MySqlConfigBackendDHCPv4::createUpdateSubnet4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::createUpdateSubnet4(const ServerSelector& server_selector, const Subnet4Ptr& subnet) { - impl_->createUpdateSubnet4(selector, subnet); + impl_->createUpdateSubnet4(server_selector, subnet); } void -MySqlConfigBackendDHCPv4::createUpdateSharedNetwork4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::createUpdateSharedNetwork4(const ServerSelector& server_selector, const SharedNetwork4Ptr& shared_network) { - impl_->createUpdateSharedNetwork4(selector, shared_network); + impl_->createUpdateSharedNetwork4(server_selector, shared_network); } void -MySqlConfigBackendDHCPv4::createUpdateOptionDef4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::createUpdateOptionDef4(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { - impl_->createUpdateOptionDef4(selector, option_def); + impl_->createUpdateOptionDef4(server_selector, option_def); } void -MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& /* server_selector */, const OptionPtr& /* option */) { } void -MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& /* server_selector */, const SubnetID& /* subnet_id */, const OptionPtr& /* option */) { } void -MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& /* server_selector */, const asiolink::IOAddress& /* pool_start_address */, const asiolink::IOAddress& /* pool_end_address */, const OptionPtr& /* option */) { } void -MySqlConfigBackendDHCPv4::createUpdateGlobalParameter4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::createUpdateGlobalParameter4(const ServerSelector& /* server_selector */, const std::string& /* name */, const std::string& /* value */) { } void -MySqlConfigBackendDHCPv4::createUpdateGlobalParameter4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::createUpdateGlobalParameter4(const ServerSelector& /* server_selector */, const std::string& /* name */, const int64_t /* value */) { } void -MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& /* server_selector */, const std::string& subnet_prefix) { impl_->deleteFromTable(MySqlConfigBackendDHCPv4Impl::DELETE_SUBNET4_PREFIX, subnet_prefix); } void -MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, const SubnetID& subnet_id) { - impl_->deleteSubnet4(selector, subnet_id); + impl_->deleteSubnet4(server_selector, subnet_id); } void -MySqlConfigBackendDHCPv4::deleteAllSubnets4(const ServerSelector& /* selector */) { +MySqlConfigBackendDHCPv4::deleteAllSubnets4(const ServerSelector& /* server_selector */) { impl_->deleteFromTable(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SUBNETS4); } void -MySqlConfigBackendDHCPv4::deleteSharedNetwork4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::deleteSharedNetwork4(const ServerSelector& /* server_selector */, const std::string& name) { impl_->deleteFromTable(MySqlConfigBackendDHCPv4Impl::DELETE_SHARED_NETWORK4_NAME, name); } void -MySqlConfigBackendDHCPv4::deleteAllSharedNetworks4(const ServerSelector& /* selector */) { +MySqlConfigBackendDHCPv4::deleteAllSharedNetworks4(const ServerSelector& /* server_selector */) { impl_->deleteFromTable(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SHARED_NETWORKS4); } void -MySqlConfigBackendDHCPv4::deleteOptionDef4(const ServerSelector& selector, +MySqlConfigBackendDHCPv4::deleteOptionDef4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { - impl_->deleteOptionDef4(selector, code, space); + impl_->deleteOptionDef4(server_selector, code, space); } void -MySqlConfigBackendDHCPv4::deleteAllOptionDefs4(const ServerSelector& /* selector */) { +MySqlConfigBackendDHCPv4::deleteAllOptionDefs4(const ServerSelector& /* server_selector */) { impl_->deleteFromTable(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_OPTION_DEFS4); } void -MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& /* server_selector */, const uint16_t /* code */, const std::string& /* space */) { } void -MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& /* server_selector */, const SubnetID& /* subnet_id */, const uint16_t /* code */, const std::string& /* space */) { } void -MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& /* server_selector */, const asiolink::IOAddress& /* pool_start_address */, const asiolink::IOAddress& /* pool_end_address */, const uint16_t /* code */, @@ -1368,12 +1375,12 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& /* selector */, } void -MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& /* selector */, +MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& /* server_selector */, const std::string& /* name */) { } void -MySqlConfigBackendDHCPv4::deleteAllGlobalParameters4(const ServerSelector& /* selector */) { +MySqlConfigBackendDHCPv4::deleteAllGlobalParameters4(const ServerSelector& /* server_selector */) { } std::string diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h index ca41389753..400d5e5250 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h @@ -29,265 +29,265 @@ public: /// @brief Retrieves a single subnet by subnet_prefix. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_prefix Prefix of the subnet to be retrieved. /// @return Pointer to the retrieved subnet or NULL if not found. virtual Subnet4Ptr - getSubnet4(const db::ServerSelector& selector, + getSubnet4(const db::ServerSelector& server_selector, const std::string& subnet_prefix) const; /// @brief Retrieves a single subnet by subnet identifier. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of a subnet to be retrieved. /// @return Pointer to the retrieved subnet or NULL if not found. virtual Subnet4Ptr - getSubnet4(const db::ServerSelector& selector, const SubnetID& subnet_id) const; + getSubnet4(const db::ServerSelector& server_selector, const SubnetID& subnet_id) const; /// @brief Retrieves all subnets. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @return Collection of subnets or empty collection if no subnet found. virtual Subnet4Collection - getAllSubnets4(const db::ServerSelector& selector) const; + getAllSubnets4(const db::ServerSelector& server_selector) const; /// @brief Retrieves subnets modified after specified time. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Lower bound subnet modification time. /// @return Collection of subnets or empty collection if no subnet found. virtual Subnet4Collection - getModifiedSubnets4(const db::ServerSelector& selector, + getModifiedSubnets4(const db::ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const; /// @brief Retrieves shared network by name. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the shared network to be retrieved. /// @return Pointer to the shared network or NULL if not found. virtual SharedNetwork4Ptr - getSharedNetwork4(const db::ServerSelector& selector, + getSharedNetwork4(const db::ServerSelector& server_selector, const std::string& name) const; /// @brief Retrieves all shared networks. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @return Collection of shared network or empty collection if /// no shared network found. virtual SharedNetwork4Collection - getAllSharedNetworks4(const db::ServerSelector& selector) const; + getAllSharedNetworks4(const db::ServerSelector& server_selector) const; /// @brief Retrieves shared networks modified after specified time. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Lower bound shared network modification time. /// @return Collection of shared network or empty collection if /// no shared network found. virtual SharedNetwork4Collection - getModifiedSharedNetworks4(const db::ServerSelector& selector, + getModifiedSharedNetworks4(const db::ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const; /// @brief Retrieves single option definition by code and space. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Code of the option to be retrieved. /// @param space Option space of the option to be retrieved. /// @return Pointer to the option definition or NULL if not found. virtual OptionDefinitionPtr - getOptionDef4(const db::ServerSelector& selector, const uint16_t code, + getOptionDef4(const db::ServerSelector& server_selector, const uint16_t code, const std::string& space) const; /// @brief Retrieves all option definitions. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @return Collection of option definitions or empty collection if /// no option definition found. virtual OptionDefContainer - getAllOptionDefs4(const db::ServerSelector& selector) const; + getAllOptionDefs4(const db::ServerSelector& server_selector) const; /// @brief Retrieves option definitions modified after specified time. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Lower bound option definition modification /// time. /// @return Collection of option definitions or empty collection if /// no option definition found. virtual OptionDefContainer - getModifiedOptionDefs4(const db::ServerSelector& selector, + getModifiedOptionDefs4(const db::ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const; /// @brief Retrieves global string parameter value. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter to be retrieved. /// @return Value of the global string parameter. virtual util::OptionalValue - getGlobalStringParameter4(const db::ServerSelector& selector, + getGlobalStringParameter4(const db::ServerSelector& server_selector, const std::string& name) const; /// @brief Retrieves global number parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the parameter to be retrieved. virtual util::OptionalValue - getGlobalNumberParameter4(const db::ServerSelector& selector, + getGlobalNumberParameter4(const db::ServerSelector& server_selector, const std::string& name) const; /// @brief Retrieves all global parameters as strings. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual std::map - getAllGlobalParameters4(const db::ServerSelector& selector) const; + getAllGlobalParameters4(const db::ServerSelector& server_selector) const; /// @brief Creates or updates a subnet. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet Subnet to be added or updated. virtual void - createUpdateSubnet4(const db::ServerSelector& selector, + createUpdateSubnet4(const db::ServerSelector& server_selector, const Subnet4Ptr& subnet); /// @brief Creates or updates a shared network. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param shared_network Shared network to be added or updated. virtual void - createUpdateSharedNetwork4(const db::ServerSelector& selector, + createUpdateSharedNetwork4(const db::ServerSelector& server_selector, const SharedNetwork4Ptr& shared_network); /// @brief Creates or updates an option definition. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param option_def Option definition to be added or updated. virtual void - createUpdateOptionDef4(const db::ServerSelector& selector, + createUpdateOptionDef4(const db::ServerSelector& server_selector, const OptionDefinitionPtr& option_def); /// @brief Creates or updates global option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param option Option to be added or updated. virtual void - createUpdateOption4(const db::ServerSelector& selector, + createUpdateOption4(const db::ServerSelector& server_selector, const OptionPtr& option); /// @brief Creates or updates subnet level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of a subnet to which option belongs. /// @param option Option to be added or updated. virtual void - createUpdateOption4(const db::ServerSelector& selector, + createUpdateOption4(const db::ServerSelector& server_selector, const SubnetID& subnet_id, const OptionPtr& option); /// @brief Creates or updates pool level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param pool_start_address Lower bound address of the pool to which /// the option belongs. /// @param pool_end_address Upper bound address of the pool to which the /// option belongs. /// @param option Option to be added or updated. virtual void - createUpdateOption4(const db::ServerSelector& selector, + createUpdateOption4(const db::ServerSelector& server_selector, const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const OptionPtr& option); /// @brief Creates or updates global string parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter. /// @param value Value of the global parameter. virtual void - createUpdateGlobalParameter4(const db::ServerSelector& selector, + createUpdateGlobalParameter4(const db::ServerSelector& server_selector, const std::string& name, const std::string& value); /// @brief Creates or updates global number parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter. /// @param value Value of the global parameter. virtual void - createUpdateGlobalParameter4(const db::ServerSelector& selector, + createUpdateGlobalParameter4(const db::ServerSelector& server_selector, const std::string& name, const int64_t value); /// @brief Deletes subnet by prefix. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_prefix Prefix of the subnet to be deleted. virtual void - deleteSubnet4(const db::ServerSelector& selector, + deleteSubnet4(const db::ServerSelector& server_selector, const std::string& subnet_prefix); /// @brief Deletes subnet by identifier. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of the subnet to be deleted. virtual void - deleteSubnet4(const db::ServerSelector& selector, const SubnetID& subnet_id); + deleteSubnet4(const db::ServerSelector& server_selector, const SubnetID& subnet_id); /// @brief Deletes all subnets. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllSubnets4(const db::ServerSelector& selector); + deleteAllSubnets4(const db::ServerSelector& server_selector); /// @brief Deletes shared network by name. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the shared network to be deleted. virtual void - deleteSharedNetwork4(const db::ServerSelector& selector, + deleteSharedNetwork4(const db::ServerSelector& server_selector, const std::string& name); /// @brief Deletes all shared networks. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllSharedNetworks4(const db::ServerSelector& selector); + deleteAllSharedNetworks4(const db::ServerSelector& server_selector); /// @brief Deletes option definition. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Code of the option to be deleted. /// @param space Option space of the option to be deleted. virtual void - deleteOptionDef4(const db::ServerSelector& selector, const uint16_t code, + deleteOptionDef4(const db::ServerSelector& server_selector, const uint16_t code, const std::string& space); /// @brief Deletes all option definitions. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllOptionDefs4(const db::ServerSelector& selector); + deleteAllOptionDefs4(const db::ServerSelector& server_selector); /// @brief Deletes global option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Code of the option to be deleted. /// @param space Option space of the option to be deleted. virtual void - deleteOption4(const db::ServerSelector& selector, const uint16_t code, + deleteOption4(const db::ServerSelector& server_selector, const uint16_t code, const std::string& space); /// @brief Deletes subnet level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of the subnet to which deleted option /// belongs. /// @param code Code of the deleted option. /// @param space Option space of the deleted option. virtual void - deleteOption4(const db::ServerSelector& selector, const SubnetID& subnet_id, + deleteOption4(const db::ServerSelector& server_selector, const SubnetID& subnet_id, const uint16_t code, const std::string& space); /// @brief Deletes pool level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param pool_start_address Lower bound address of the pool to which /// deleted option belongs. /// @param pool_end_address Upper bound address of the pool to which the @@ -295,7 +295,7 @@ public: /// @param code Code of the deleted option. /// @param space Option space of the deleted option. virtual void - deleteOption4(const db::ServerSelector& selector, + deleteOption4(const db::ServerSelector& server_selector, const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const uint16_t code, @@ -303,17 +303,17 @@ public: /// @brief Deletes global parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter to be deleted. virtual void - deleteGlobalParameter4(const db::ServerSelector& selector, + deleteGlobalParameter4(const db::ServerSelector& server_selector, const std::string& name); /// @brief Deletes all global parameters. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllGlobalParameters4(const db::ServerSelector& selector); + deleteAllGlobalParameters4(const db::ServerSelector& server_selector); /// @brief Returns backend type in the textual format. /// diff --git a/src/hooks/dhcp/mysql_cb/tests/Makefile.am b/src/hooks/dhcp/mysql_cb/tests/Makefile.am index c8663e2d00..747d2c3ad0 100644 --- a/src/hooks/dhcp/mysql_cb/tests/Makefile.am +++ b/src/hooks/dhcp/mysql_cb/tests/Makefile.am @@ -36,6 +36,7 @@ mysql_cb_unittests_LDADD = $(top_builddir)/src/hooks/dhcp/mysql_cb/libmysqlcb.l mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la +mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc index 8a2a7c50e5..c4c2ea34ab 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc @@ -99,7 +99,9 @@ public: test_subnets_.push_back(subnet); - // Other subnets include mostly null values except for mandatory parameters. + // Adding another subnet with the same subnet id to test + // cases that this second instance can override existing + // subnet instance. subnet.reset(new Subnet4(IOAddress("10.0.0.0"), 8, 20, 30, 40, 1024)); pool1.reset(new Pool4(IOAddress("10.0.0.10"), IOAddress("10.0.0.20"))); @@ -138,9 +140,13 @@ public: test_networks_.push_back(shared_network); + // Adding another shared network called "level1" to test + // cases that this second instance can override existing + // "level1" instance. shared_network.reset(new SharedNetwork4("level1")); test_networks_.push_back(shared_network); + // Add more shared networks. shared_network.reset(new SharedNetwork4("level2")); test_networks_.push_back(shared_network); @@ -407,7 +413,8 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSharedNetworks4) { ASSERT_TRUE(networks.empty()); } -// Test that subnet can be inserted, fetched, updated and then fetched again. +// Test that option definition can be inserted, fetched, updated and then +// fetched again. TEST_F(MySqlConfigBackendDHCPv4Test, getOptionDef4) { // Insert new option definition. OptionDefinitionPtr option_def = test_option_defs_[0]; @@ -433,7 +440,7 @@ TEST_F(MySqlConfigBackendDHCPv4Test, getOptionDef4) { EXPECT_TRUE(returned_option_def->equals(*option_def2)); } -// Test that all shared networks can be fetched. +// Test that all option definitions can be fetched. TEST_F(MySqlConfigBackendDHCPv4Test, getAllOptionDefs4) { // Insert test option definitions into the database. Note that the second // option definition will overwrite the first option definition as they use diff --git a/src/lib/dhcpsrv/config_backend_dhcp4.h b/src/lib/dhcpsrv/config_backend_dhcp4.h index c6324846ce..3a6cf0f870 100644 --- a/src/lib/dhcpsrv/config_backend_dhcp4.h +++ b/src/lib/dhcpsrv/config_backend_dhcp4.h @@ -30,265 +30,265 @@ public: /// @brief Retrieves a single subnet by subnet_prefix. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_prefix Prefix of the subnet to be retrieved. /// @return Pointer to the retrieved subnet or NULL if not found. virtual Subnet4Ptr - getSubnet4(const db::ServerSelector& selector, + getSubnet4(const db::ServerSelector& server_selector, const std::string& subnet_prefix) const = 0; /// @brief Retrieves a single subnet by subnet identifier. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of a subnet to be retrieved. /// @return Pointer to the retrieved subnet or NULL if not found. virtual Subnet4Ptr - getSubnet4(const db::ServerSelector& selector, const SubnetID& subnet_id) const = 0; + getSubnet4(const db::ServerSelector& server_selector, const SubnetID& subnet_id) const = 0; /// @brief Retrieves all subnets. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @return Collection of subnets or empty collection if no subnet found. virtual Subnet4Collection - getAllSubnets4(const db::ServerSelector& selector) const = 0; + getAllSubnets4(const db::ServerSelector& server_selector) const = 0; /// @brief Retrieves subnets modified after specified time. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Lower bound subnet modification time. /// @return Collection of subnets or empty collection if no subnet found. virtual Subnet4Collection - getModifiedSubnets4(const db::ServerSelector& selector, + getModifiedSubnets4(const db::ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const = 0; /// @brief Retrieves shared network by name. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the shared network to be retrieved. /// @return Pointer to the shared network or NULL if not found. virtual SharedNetwork4Ptr - getSharedNetwork4(const db::ServerSelector& selector, + getSharedNetwork4(const db::ServerSelector& server_selector, const std::string& name) const = 0; /// @brief Retrieves all shared networks. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @return Collection of shared network or empty collection if /// no shared network found. virtual SharedNetwork4Collection - getAllSharedNetworks4(const db::ServerSelector& selector) const = 0; + getAllSharedNetworks4(const db::ServerSelector& server_selector) const = 0; /// @brief Retrieves shared networks modified after specified time. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Lower bound shared network modification time. /// @return Collection of shared network or empty collection if /// no shared network found. virtual SharedNetwork4Collection - getModifiedSharedNetworks4(const db::ServerSelector& selector, + getModifiedSharedNetworks4(const db::ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const = 0; /// @brief Retrieves single option definition by code and space. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Code of the option to be retrieved. /// @param space Option space of the option to be retrieved. /// @return Pointer to the option definition or NULL if not found. virtual OptionDefinitionPtr - getOptionDef4(const db::ServerSelector& selector, const uint16_t code, + getOptionDef4(const db::ServerSelector& server_selector, const uint16_t code, const std::string& space) const = 0; /// @brief Retrieves all option definitions. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @return Collection of option definitions or empty collection if /// no option definition found. virtual OptionDefContainer - getAllOptionDefs4(const db::ServerSelector& selector) const = 0; + getAllOptionDefs4(const db::ServerSelector& server_selector) const = 0; /// @brief Retrieves option definitions modified after specified time. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Lower bound option definition modification /// time. /// @return Collection of option definitions or empty collection if /// no option definition found. virtual OptionDefContainer - getModifiedOptionDefs4(const db::ServerSelector& selector, + getModifiedOptionDefs4(const db::ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const = 0; /// @brief Retrieves global string parameter value. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter to be retrieved. /// @return Value of the global string parameter. virtual util::OptionalValue - getGlobalStringParameter4(const db::ServerSelector& selector, + getGlobalStringParameter4(const db::ServerSelector& server_selector, const std::string& name) const = 0; /// @brief Retrieves global number parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the parameter to be retrieved. virtual util::OptionalValue - getGlobalNumberParameter4(const db::ServerSelector& selector, + getGlobalNumberParameter4(const db::ServerSelector& server_selector, const std::string& name) const = 0; /// @brief Retrieves all global parameters as strings. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual std::map - getAllGlobalParameters4(const db::ServerSelector& selector) const = 0; + getAllGlobalParameters4(const db::ServerSelector& server_selector) const = 0; /// @brief Creates or updates a subnet. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet Subnet to be added or updated. virtual void - createUpdateSubnet4(const db::ServerSelector& selector, + createUpdateSubnet4(const db::ServerSelector& server_selector, const Subnet4Ptr& subnet) = 0; /// @brief Creates or updates a shared network. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param shared_network Shared network to be added or updated. virtual void - createUpdateSharedNetwork4(const db::ServerSelector& selector, + createUpdateSharedNetwork4(const db::ServerSelector& server_selector, const SharedNetwork4Ptr& shared_network) = 0; /// @brief Creates or updates an option definition. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param option_def Option definition to be added or updated. virtual void - createUpdateOptionDef4(const db::ServerSelector& selector, + createUpdateOptionDef4(const db::ServerSelector& server_selector, const OptionDefinitionPtr& option_def) = 0; /// @brief Creates or updates global option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param option Option to be added or updated. virtual void - createUpdateOption4(const db::ServerSelector& selector, + createUpdateOption4(const db::ServerSelector& server_selector, const OptionPtr& option) = 0; /// @brief Creates or updates subnet level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of a subnet to which option belongs. /// @param option Option to be added or updated. virtual void - createUpdateOption4(const db::ServerSelector& selector, + createUpdateOption4(const db::ServerSelector& server_selector, const SubnetID& subnet_id, const OptionPtr& option) = 0; /// @brief Creates or updates pool level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param pool_start_address Lower bound address of the pool to which /// the option belongs. /// @param pool_end_address Upper bound address of the pool to which the /// option belongs. /// @param option Option to be added or updated. virtual void - createUpdateOption4(const db::ServerSelector& selector, + createUpdateOption4(const db::ServerSelector& server_selector, const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const OptionPtr& option) = 0; /// @brief Creates or updates global string parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter. /// @param value Value of the global parameter. virtual void - createUpdateGlobalParameter4(const db::ServerSelector& selector, + createUpdateGlobalParameter4(const db::ServerSelector& server_selector, const std::string& name, const std::string& value) = 0; /// @brief Creates or updates global number parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter. /// @param value Value of the global parameter. virtual void - createUpdateGlobalParameter4(const db::ServerSelector& selector, + createUpdateGlobalParameter4(const db::ServerSelector& server_selector, const std::string& name, const int64_t value) = 0; /// @brief Deletes subnet by prefix. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_prefix Prefix of the subnet to be deleted. virtual void - deleteSubnet4(const db::ServerSelector& selector, + deleteSubnet4(const db::ServerSelector& server_selector, const std::string& subnet_prefix) = 0; /// @brief Deletes subnet by identifier. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of the subnet to be deleted. virtual void - deleteSubnet4(const db::ServerSelector& selector, const SubnetID& subnet_id) = 0; + deleteSubnet4(const db::ServerSelector& server_selector, const SubnetID& subnet_id) = 0; /// @brief Deletes all subnets. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllSubnets4(const db::ServerSelector& selector) = 0; + deleteAllSubnets4(const db::ServerSelector& server_selector) = 0; /// @brief Deletes shared network by name. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the shared network to be deleted. virtual void - deleteSharedNetwork4(const db::ServerSelector& selector, + deleteSharedNetwork4(const db::ServerSelector& server_selector, const std::string& name) = 0; /// @brief Deletes all shared networks. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllSharedNetworks4(const db::ServerSelector& selector) = 0; + deleteAllSharedNetworks4(const db::ServerSelector& server_selector) = 0; /// @brief Deletes option definition. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Code of the option to be deleted. /// @param space Option space of the option to be deleted. virtual void - deleteOptionDef4(const db::ServerSelector& selector, const uint16_t code, + deleteOptionDef4(const db::ServerSelector& server_selector, const uint16_t code, const std::string& space) = 0; /// @brief Deletes all option definitions. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllOptionDefs4(const db::ServerSelector& selector) = 0; + deleteAllOptionDefs4(const db::ServerSelector& server_selector) = 0; /// @brief Deletes global option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param code Code of the option to be deleted. /// @param space Option space of the option to be deleted. virtual void - deleteOption4(const db::ServerSelector& selector, const uint16_t code, + deleteOption4(const db::ServerSelector& server_selector, const uint16_t code, const std::string& space) = 0; /// @brief Deletes subnet level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param subnet_id Identifier of the subnet to which deleted option /// belongs. /// @param code Code of the deleted option. /// @param space Option space of the deleted option. virtual void - deleteOption4(const db::ServerSelector& selector, const SubnetID& subnet_id, + deleteOption4(const db::ServerSelector& server_selector, const SubnetID& subnet_id, const uint16_t code, const std::string& space) = 0; /// @brief Deletes pool level option. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param pool_start_address Lower bound address of the pool to which /// deleted option belongs. /// @param pool_end_address Upper bound address of the pool to which the @@ -296,7 +296,7 @@ public: /// @param code Code of the deleted option. /// @param space Option space of the deleted option. virtual void - deleteOption4(const db::ServerSelector& selector, + deleteOption4(const db::ServerSelector& server_selector, const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const uint16_t code, @@ -304,17 +304,17 @@ public: /// @brief Deletes global parameter. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param name Name of the global parameter to be deleted. virtual void - deleteGlobalParameter4(const db::ServerSelector& selector, + deleteGlobalParameter4(const db::ServerSelector& server_selector, const std::string& name) = 0; /// @brief Deletes all global parameters. /// - /// @param selector Server selector. + /// @param server_selector Server selector. virtual void - deleteAllGlobalParameters4(const db::ServerSelector& selector) = 0; + deleteAllGlobalParameters4(const db::ServerSelector& server_selector) = 0; }; } // end of namespace isc::dhcp