[3534] Removed CfgMgr::getConfiguration.

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 503373dd95da34a5e233e1f1820332c73566d3c7..e99b8590e2e5967c1554dbd35a10967b3a1c4589 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -653,7 +653,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
     }
 
     LOG_INFO(dhcp4_logger, DHCP4_CONFIG_COMPLETE)
-        .arg(CfgMgr::instance().getConfiguration()->
+        .arg(CfgMgr::instance().getCurrent()->
              getConfigSummary(Configuration::CFGSEL_ALL4));
 
     // Everything was fine. Configuration is successful.

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 99aba3ba870ed42aae1ee2cb7d2008e014e0bc08..ac0eda02d9c4a21e21f637b621e914ca38f40b31 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -144,7 +144,7 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) {
     // safe and we really don't want to emit exceptions to the callback caller.
     // Instead, catch an exception and create appropriate answer.
     try {
-        CfgMgr::instance().getConfiguration()->getCfgIface()
+        CfgMgr::instance().getCurrent()->getCfgIface()
             .openSockets(CfgIface::V6, srv->getPort());
 
     } catch (const std::exception& ex) {

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index a2c2c649aaa7116244f6be1aac2574b4e3782db5..4277e16cafe6fa91c95255272c56144328a2777f 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -854,7 +854,7 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
     }
 
     LOG_INFO(dhcp6_logger, DHCP6_CONFIG_COMPLETE)
-        .arg(CfgMgr::instance().getConfiguration()->
+        .arg(CfgMgr::instance().getCurrent()->
              getConfigSummary(Configuration::CFGSEL_ALL6));
 
     // Everything was fine. Configuration is successful.

diff --git a/src/bin/dhcp6/kea_controller.cc b/src/bin/dhcp6/kea_controller.cc
index 9b49ec26cf82fd1c74e23ca6500d853bce04c664..1b8f39352c030f21bfa22f90a0dccbd0ae4ef8dc 100644 (file)
--- a/src/bin/dhcp6/kea_controller.cc
+++ b/src/bin/dhcp6/kea_controller.cc
@@ -74,7 +74,7 @@ void configure(const std::string& file_name) {
         // If there's no logging element, we'll just pass NULL pointer,
         // which will be handled by configureLogger().
         Daemon::configureLogger(json->get("Logging"),
-                                CfgMgr::instance().getConfiguration(),
+                                CfgMgr::instance().getStaging(),
                                 ControlledDhcpv6Srv::getInstance()->getVerbose());
 
         // Get Dhcp6 component from the config

diff --git a/src/lib/dhcpsrv/cfgmgr.cc b/src/lib/dhcpsrv/cfgmgr.cc
index f4aefc2d0253edf00aad769991d4dac1ed5faeba..fbba636f66e266b6998d0cd53085251d9284e317 100644 (file)
--- a/src/lib/dhcpsrv/cfgmgr.cc
+++ b/src/lib/dhcpsrv/cfgmgr.cc
@@ -387,11 +387,6 @@ CfgMgr::rollback() {
     }
 }
 
-ConfigurationPtr
-CfgMgr::getConfiguration() {
-    return (configuration_);
-}
-
 ConstConfigurationPtr
 CfgMgr::getCurrent() {
     ensureCurrentAllocated();

diff --git a/src/lib/dhcpsrv/cfgmgr.h b/src/lib/dhcpsrv/cfgmgr.h
index 52aa4c1dd7bcf4ab97fe315b9ed28e5810480bda..ef65c912a9975e7479010549caba5d3af55fcbca 100644 (file)
--- a/src/lib/dhcpsrv/cfgmgr.h
+++ b/src/lib/dhcpsrv/cfgmgr.h
@@ -415,11 +415,6 @@ public:
     /// This function is exception safe.
     void rollback();
 
-    /// @brief Returns the current configuration.
-    ///
-    /// @return a pointer to the current configuration.
-    ConfigurationPtr getConfiguration();
-
     /// @brief Returns a pointer to the current configuration.
     ///
     /// This function returns pointer to the current configuration. If the

diff --git a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
index 4bc6be0b1709ed3d3110256b658ee74719ce6c06..9d1c11502c5b4ca7a98f346973284b2260c672cc 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
@@ -295,9 +295,12 @@ public:
 // it is empty by default.
 TEST_F(CfgMgrTest, configuration) {
 
-    ConfigurationPtr configuration = CfgMgr::instance().getConfiguration();
+    ConstConfigurationPtr configuration = CfgMgr::instance().getCurrent();
     ASSERT_TRUE(configuration);
+    EXPECT_TRUE(configuration->getLoggingInfo().empty());
 
+    configuration = CfgMgr::instance().getStaging();
+    ASSERT_TRUE(configuration);
     EXPECT_TRUE(configuration->getLoggingInfo().empty());
 }