[#3223] removed dead code in v4

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index e18ef222655d2d3354d4eccbba050868f6ee1d03..6817415d620368567982656f6d91cf53947c7e50 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -994,9 +994,6 @@ ControlledDhcpv4Srv::processConfig(isc::data::ConstElementPtr config) {
 
         CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
         string params = "universe=4";
-        if (cfg_db->getExtendedInfoTablesEnabled()) {
-            params += " extended-info-tables=true";
-        }
         cfg_db->setAppendedParameters(params);
         cfg_db->createManagers();
         // Reset counters related to connections as all managers have been recreated.

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 987bf3b5e03ff88973263fe66eecf94c4cc5bf7b..9a45e0b69ad14163e577bf8a7c57b598a3277c05 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -746,9 +746,6 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
 
                     CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
                     string params = "universe=4 persist=false";
-                    if (cfg_db->getExtendedInfoTablesEnabled()) {
-                        params += " extended-info-tables=true";
-                    }
                     cfg_db->setAppendedParameters(params);
                     cfg_db->createManagers();
                 } catch (const std::exception& ex) {

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 71e265d56a217dadfc18fdb16e47aa18cb87c2ce..c5cf8772b41f8c4c05ec1e4ddd5f222092eec47d 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -878,9 +878,11 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
 
                     CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
                     string params = "universe=6 persist=false";
-                    if (cfg_db->getExtendedInfoTablesEnabled()) {
-                        params += " extended-info-tables=true";
-                    }
+                    // The "extended-info-tables" has no effect on -T command
+                    // line parameter so it is omitted on purpose.
+                    // Note that in this case, the current code creates managers
+                    // before hooks are loaded, so it can not be activated by
+                    // the BLQ hook.
                     cfg_db->setAppendedParameters(params);
                     cfg_db->createManagers();
                 } catch (const std::exception& ex) {

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index 37d670645bd96279991018c8528a67d4511cc2b1..db4f5d577c789fdcfb6b9a53622cc614f6654bcf 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -1007,7 +1007,7 @@ Memfile_LeaseMgr::Memfile_LeaseMgr(const DatabaseConnection::ParameterMap& param
     // operation.
     if (!persistLeases(V4) && !persistLeases(V6)) {
         LOG_WARN(dhcpsrv_logger, DHCPSRV_MEMFILE_NO_STORAGE);
-    } else  {
+    } else {
         if (conversion_needed) {
             auto const& version(getVersion());
             LOG_WARN(dhcpsrv_logger, DHCPSRV_MEMFILE_CONVERTING_LEASE_FILES)
@@ -2332,14 +2332,14 @@ Memfile_LeaseMgr::loadLeasesFromFiles(const std::string& filename,
         if (lease_file->exists()) {
             LeaseFileLoader::load<LeaseObjectType>(*lease_file, storage,
                                                    max_row_errors);
-            conversion_needed =  conversion_needed || lease_file->needsConversion();
+            conversion_needed = conversion_needed || lease_file->needsConversion();
         }
 
         lease_file.reset(new LeaseFileType(appendSuffix(filename, FILE_INPUT)));
         if (lease_file->exists()) {
             LeaseFileLoader::load<LeaseObjectType>(*lease_file, storage,
                                                    max_row_errors);
-            conversion_needed =  conversion_needed || lease_file->needsConversion();
+            conversion_needed = conversion_needed || lease_file->needsConversion();
         }
     }
 
@@ -2352,7 +2352,7 @@ Memfile_LeaseMgr::loadLeasesFromFiles(const std::string& filename,
     lease_file.reset(new LeaseFileType(filename));
     LeaseFileLoader::load<LeaseObjectType>(*lease_file, storage,
                                            max_row_errors, false);
-    conversion_needed =  conversion_needed || lease_file->needsConversion();
+    conversion_needed = conversion_needed || lease_file->needsConversion();
 
     return (conversion_needed);
 }

diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index 470d683272306955b8ba0bcbe6caa81a3fa7f6ce..034f1f55bd262dd1c347337f851c2bcf3af97e2d 100644 (file)
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -408,7 +408,7 @@ public:
 /// parses parameters string properly.
 TEST_F(MemfileLeaseMgrTest, constructor) {
     DatabaseConnection::ParameterMap pmap;
-    pmap["universe"] = "4";
+    pmap["universe"] = "6";
     pmap["persist"] = "false";
     boost::scoped_ptr<Memfile_LeaseMgr> lease_mgr;
 
@@ -423,9 +423,9 @@ TEST_F(MemfileLeaseMgrTest, constructor) {
     // Expecting that persist parameter is yes or no. Everything other than
     // that is wrong.
     pmap["lfc-interval"] = "10";
-    pmap["name"] = getLeaseFilePath("leasefile4_1.csv");
+    pmap["name"] = getLeaseFilePath("leasefile6_1.csv");
     pmap["max-row-errors"] = "5";
-    pmap["name"] = getLeaseFilePath("leasefile4_1.csv");
+    pmap["name"] = getLeaseFilePath("leasefile6_1.csv");
     pmap["persist"] = "bogus";
     EXPECT_THROW(lease_mgr.reset(new Memfile_LeaseMgr(pmap)), isc::BadValue);