[#2585] Addressed naming comment

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index afabc41851943467440db22eab57a43428224d79..f94458b43683297fcc98666ff9e170d69fe87523 100644 (file)
--- 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 0f8819ec33d8eb46a5c56f9bb8ed57f0f64df195..59397692d304c6cbee3e0afe7ac30ad5d206546a 100644 (file)
--- 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 0e1deacb3ffb7e637d5caeb66ad4174b2207ea98..5e04b085f058f938d52062bac95ea6843a19f20b 100644 (file)
--- 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 e04a851f3316ad639d8ca1546c05d4a44e3ab46f..b498357e7dd93b7a01dc2394b3e2ec850adcfb82 100644 (file)
--- 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 6373b56a638fcc04d02be5871f0ea540fc73502e..f28c22e9267e5a04d0ac8e719d7b7097eafa20a9 100644 (file)
--- 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 2f95a79b13c5fcc0acda57741f9e274554894119..b1fd51548cdcb8b7fc281278e1d0148d8bad3bc7 100644 (file)
--- 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 051215d8a3a07f246bf2258452c0c36ed82d7c70..c62fe59610c15a444a2b0f57e365b22e5153841a 100644 (file)
--- 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 e36bb4e8737bf2e355f97c55351268ab94164c16..791e52a4af3f80269fceb350f7bfe09ca50095fd 100644 (file)
--- 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 26c8228a1f4f6e6e9230262b35f8290ee11a0a9d..786d63567a9e1f02e2d15094541437c1cad4eeb1 100644 (file)
--- 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 cf8277413d4413253f72db66b46de3e387e14958..4149cd7f21935cbbf6e5c0a350152d8f3d04d68f 100644 (file)
--- 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 ad59ffa790cd05a5ec0bf358d354ea1ea0a5d2da..f7bb7e64b922684ff35bca27222d1f9bfe608883 100644 (file)
--- 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 d3e46636aea08dabb82e2f8a83185ddc3d34399e..f45d5b48f6fcd975acf7d3e31b8f4367e414309d 100644 (file)
--- 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 bcc5ba17a5a8c4f320d703bc32450e2325741805..fba69773a789ebbeadf19a4ff3af509c4930a06f 100644 (file)
--- 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.