summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bin/dhcp4/ctrl_dhcp4_srv.cc2
-rw-r--r--src/bin/dhcp6/ctrl_dhcp6_srv.cc2
-rw-r--r--src/lib/dhcpsrv/cfg_db_access.cc2
-rw-r--r--src/lib/dhcpsrv/cfg_db_access.h10
-rw-r--r--src/lib/dhcpsrv/lease_mgr.cc4
-rw-r--r--src/lib/dhcpsrv/lease_mgr.h14
-rw-r--r--src/lib/dhcpsrv/memfile_lease_mgr.cc2
-rw-r--r--src/lib/dhcpsrv/mysql_lease_mgr.cc2
-rw-r--r--src/lib/dhcpsrv/mysql_lease_mgr.h2
-rw-r--r--src/lib/dhcpsrv/pgsql_lease_mgr.cc2
-rw-r--r--src/lib/dhcpsrv/pgsql_lease_mgr.h2
-rw-r--r--src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc6
13 files changed, 26 insertions, 26 deletions
diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index afabc41851..f94458b436 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -918,7 +918,7 @@ ControlledDhcpv4Srv::processConfig(isc::data::ConstElementPtr config) {
CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
cfg_db->setAppendedParameters("universe=4");
- if (cfg_db->getExtendedInfoEnabled()) {
+ if (cfg_db->getExtendedInfoTablesEnabled()) {
cfg_db->setAppendedParameters("extended-info-tables=true");
}
cfg_db->createManagers();
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 0f8819ec33..59397692d3 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -922,7 +922,7 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) {
CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
cfg_db->setAppendedParameters("universe=6");
- if (cfg_db->getExtendedInfoEnabled()) {
+ if (cfg_db->getExtendedInfoTablesEnabled()) {
cfg_db->setAppendedParameters("extended-info-tables=true");
}
cfg_db->createManagers();
diff --git a/src/lib/dhcpsrv/cfg_db_access.cc b/src/lib/dhcpsrv/cfg_db_access.cc
index 0e1deacb3f..5e04b085f0 100644
--- a/src/lib/dhcpsrv/cfg_db_access.cc
+++ b/src/lib/dhcpsrv/cfg_db_access.cc
@@ -24,7 +24,7 @@ namespace dhcp {
CfgDbAccess::CfgDbAccess()
: appended_parameters_(), lease_db_access_("type=memfile"),
host_db_access_(), ip_reservations_unique_(true),
- extended_info_enabled_(false) {
+ extended_info_tables_enabled_(false) {
}
std::string
diff --git a/src/lib/dhcpsrv/cfg_db_access.h b/src/lib/dhcpsrv/cfg_db_access.h
index e04a851f33..b498357e7d 100644
--- a/src/lib/dhcpsrv/cfg_db_access.h
+++ b/src/lib/dhcpsrv/cfg_db_access.h
@@ -104,8 +104,8 @@ public:
/// are enabled.
///
/// @param enabled new setting to be used by @c LeaseMgr.
- void setExtendedInfoEnabled(const bool enabled) {
- extended_info_enabled_ = enabled;
+ void setExtendedInfoTablesEnabled(const bool enabled) {
+ extended_info_tables_enabled_ = enabled;
}
/// @brief Returns the setting indicating if lease extended info tables
@@ -113,8 +113,8 @@ public:
///
/// @return true if lease extended info tables are enabled or false
/// if they are disabled.
- bool getExtendedInfoEnabled() const {
- return (extended_info_enabled_);
+ bool getExtendedInfoTablesEnabled() const {
+ return (extended_info_tables_enabled_);
}
/// @brief Creates instance of lease manager and host data sources
@@ -144,7 +144,7 @@ protected:
/// @brief Holds the setting whether the lease extended info tables
/// are enabled or disabled. The default is disabled.
- bool extended_info_enabled_;
+ bool extended_info_tables_enabled_;
};
/// @brief A pointer to the @c CfgDbAccess.
diff --git a/src/lib/dhcpsrv/lease_mgr.cc b/src/lib/dhcpsrv/lease_mgr.cc
index 6373b56a63..f28c22e926 100644
--- a/src/lib/dhcpsrv/lease_mgr.cc
+++ b/src/lib/dhcpsrv/lease_mgr.cc
@@ -362,7 +362,7 @@ LeaseMgr::getDBVersion() {
}
void
-LeaseMgr::setExtendedInfoEnabled(const DatabaseConnection::ParameterMap& parameters) {
+LeaseMgr::setExtendedInfoTablesEnabled(const DatabaseConnection::ParameterMap& parameters) {
std::string extended_info_tables;
try {
extended_info_tables = parameters.at("extended-info-tables");
@@ -371,7 +371,7 @@ LeaseMgr::setExtendedInfoEnabled(const DatabaseConnection::ParameterMap& paramet
}
// If extended_info_tables is 'true' we will enable them.
if (extended_info_tables == "true") {
- setExtendedInfoEnabled(true);
+ setExtendedInfoTablesEnabled(true);
}
}
diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h
index 2f95a79b13..b1fd51548c 100644
--- a/src/lib/dhcpsrv/lease_mgr.h
+++ b/src/lib/dhcpsrv/lease_mgr.h
@@ -225,7 +225,7 @@ class LeaseMgr {
public:
/// @brief Constructor
///
- LeaseMgr() : extended_info_enabled_(false)
+ LeaseMgr() : extended_info_tables_enabled_(false)
{}
/// @brief Destructor
@@ -940,8 +940,8 @@ public:
///
/// @return true if lease extended info tables are enabled or false
/// if they are disabled.
- bool getExtendedInfoEnabled() const {
- return (extended_info_enabled_);
+ bool getExtendedInfoTablesEnabled() const {
+ return (extended_info_tables_enabled_);
}
protected:
@@ -955,8 +955,8 @@ protected:
/// on value changes can intercept it by redefining it.
///
/// @param enabled new setting.
- virtual void setExtendedInfoEnabled(const bool enabled) {
- extended_info_enabled_ = enabled;
+ virtual void setExtendedInfoTablesEnabled(const bool enabled) {
+ extended_info_tables_enabled_ = enabled;
}
/// @brief Decode parameters to set whether the lease extended info tables
@@ -965,7 +965,7 @@ protected:
/// @note: common code in constructors.
///
/// @param parameters The parameter map.
- virtual void setExtendedInfoEnabled(const db::DatabaseConnection::ParameterMap& parameters);
+ virtual void setExtendedInfoTablesEnabled(const db::DatabaseConnection::ParameterMap& parameters);
/// @brief Delete lease6 extended info from tables.
///
@@ -1003,7 +1003,7 @@ private:
/// @brief Holds the setting whether the lease extended info tables
/// are enabled or disabled. The default is disabled.
- bool extended_info_enabled_;
+ bool extended_info_tables_enabled_;
};
} // namespace dhcp
diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index 051215d8a3..c62fe59610 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -639,7 +639,7 @@ Memfile_LeaseMgr::Memfile_LeaseMgr(const DatabaseConnection::ParameterMap& param
bool conversion_needed = false;
// Check if the extended info tables are enabled.
- setExtendedInfoEnabled(parameters);
+ setExtendedInfoTablesEnabled(parameters);
// Check the universe and use v4 file or v6 file.
std::string universe = conn_.getParameter("universe");
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index e36bb4e873..791e52a4af 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -1800,7 +1800,7 @@ MySqlLeaseMgr::MySqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters)
: parameters_(parameters), timer_name_("") {
// Check if the extended info tables are enabled.
- LeaseMgr::setExtendedInfoEnabled(parameters);
+ LeaseMgr::setExtendedInfoTablesEnabled(parameters);
// Create unique timer name per instance.
timer_name_ = "MySqlLeaseMgr[";
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h
index 26c8228a1f..786d63567a 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.h
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.h
@@ -1138,7 +1138,7 @@ protected:
///
/// Transient redefine to refuse the enable setting.
/// @param enabled new setting.
- virtual void setExtendedInfoEnabled(const bool enabled) override {
+ virtual void setExtendedInfoTablesEnabled(const bool enabled) override {
if (enabled) {
isc_throw(isc::NotImplemented,
"extended info tables are not yet supported by mysql");
diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index cf8277413d..4149cd7f21 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -1256,7 +1256,7 @@ PgSqlLeaseMgr::PgSqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters)
: parameters_(parameters), timer_name_("") {
// Check if the extended info tables are enabled.
- LeaseMgr::setExtendedInfoEnabled(parameters);
+ LeaseMgr::setExtendedInfoTablesEnabled(parameters);
// Create unique timer name per instance.
timer_name_ = "PgSqlLeaseMgr[";
diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h
index ad59ffa790..f7bb7e64b9 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.h
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h
@@ -1097,7 +1097,7 @@ protected:
///
/// Transient redefine to refuse the enable setting.
/// @param enabled new setting.
- virtual void setExtendedInfoEnabled(const bool enabled) override {
+ virtual void setExtendedInfoTablesEnabled(const bool enabled) override {
if (enabled) {
isc_throw(isc::NotImplemented,
"extended info tables are not yet supported by postgresql");
diff --git a/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc
index d3e46636ae..f45d5b48f6 100644
--- a/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc
@@ -102,7 +102,7 @@ public:
pmap_["extended-info-tables"] = "true";
ASSERT_NO_THROW(lease_mgr_.reset(new NakedMemfileLeaseMgr(pmap_)));
- EXPECT_TRUE(lease_mgr_->getExtendedInfoEnabled());
+ EXPECT_TRUE(lease_mgr_->getExtendedInfoTablesEnabled());
}
/// @brief Create and set v6 leases.
diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index bcc5ba17a5..fba69773a7 100644
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -98,7 +98,7 @@ public:
}
using Memfile_LeaseMgr::lfcCallback;
- using Memfile_LeaseMgr::setExtendedInfoEnabled;
+ using Memfile_LeaseMgr::setExtendedInfoTablesEnabled;
};
/// @brief Test fixture class for @c Memfile_LeaseMgr
@@ -402,10 +402,10 @@ TEST_F(MemfileLeaseMgrTest, constructor) {
EXPECT_NO_THROW(lease_mgr.reset(new Memfile_LeaseMgr(pmap)));
// Check the extended info enable flag.
- EXPECT_FALSE(lease_mgr->getExtendedInfoEnabled());
+ EXPECT_FALSE(lease_mgr->getExtendedInfoTablesEnabled());
pmap["extended-info-tables"] = "true";
EXPECT_NO_THROW(lease_mgr.reset(new Memfile_LeaseMgr(pmap)));
- EXPECT_TRUE(lease_mgr->getExtendedInfoEnabled());
+ EXPECT_TRUE(lease_mgr->getExtendedInfoTablesEnabled());
// Expecting that persist parameter is yes or no. Everything other than
// that is wrong.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 11:28:45 +0100