[#2757] Moved to upgradeExtendedInfo4

diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h
index dca8b93f8941e9f4d3358df59c175e0606d023ad..10464546e8160f7ef83c921ea81d3567890c8c0b 100644 (file)
--- a/src/lib/dhcpsrv/lease_mgr.h
+++ b/src/lib/dhcpsrv/lease_mgr.h
@@ -972,7 +972,7 @@ public:
     ///
     /// @param page_size The page size used for retrieval.
     /// @return The number of updates in the database.
-    virtual size_t upgradeExtendedInfo(const LeasePageSize& page_size) = 0;
+    virtual size_t upgradeExtendedInfo4(const LeasePageSize& page_size) = 0;
 
     /// @brief Returns the setting indicating if lease extended info tables
     /// are enabled.

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index 5b5c7df041862762cbb31be05f7e0e1b88e58d04..abbde67a55e8aa0addfbaa682d8e87ff4d9e2ad5 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -3033,7 +3033,7 @@ Memfile_LeaseMgr::extractExtendedInfo4(bool update, bool current) {
 }
 
 size_t
-Memfile_LeaseMgr::upgradeExtendedInfo(const LeasePageSize& /* page_size */) {
+Memfile_LeaseMgr::upgradeExtendedInfo4(const LeasePageSize& /* page_size */) {
     return (0);
 }
 

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index e5831ecc065b1c4fbc4b7bfb4f147ec28f8c1e88..e22dcead5817d8ec43c830a82a7055ee686c4b62 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -1512,7 +1512,7 @@ public:
     ///
     /// @param page_size The page size used for retrieval.
     /// @return Always return 0 as this function is a noop for not SQL backends.
-    virtual size_t upgradeExtendedInfo(const LeasePageSize& page_size) override;
+    virtual size_t upgradeExtendedInfo4(const LeasePageSize& page_size) override;
 
 protected:
 

diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index 11df3850af69f73d52a94fb47a931576b3a15074..571628484282b7fd0ace2341d3981aafc8dfb879 100644 (file)
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -3896,7 +3896,7 @@ MySqlLeaseMgr::getLeases4ByRemoteId(const OptionBuffer& remote_id,
 }
 
 size_t
-MySqlLeaseMgr::upgradeExtendedInfo(const LeasePageSize& page_size) {
+MySqlLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& page_size) {
     auto check = CfgMgr::instance().getCurrentCfg()->
         getConsistency()->getExtendedInfoSanityCheck();
 

diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h
index e4be9b5cb5abadc6ffab58c318b748ed9c01c751..91fd4ebc48e5df5a7cf29b03d84d5a5628168e40 100644 (file)
--- a/src/lib/dhcpsrv/mysql_lease_mgr.h
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.h
@@ -1132,7 +1132,7 @@ private:
     ///
     /// @param page_size The page size used for retrieval.
     /// @return The number of updates in the database.
-    virtual size_t upgradeExtendedInfo(const LeasePageSize& page_size) override;
+    virtual size_t upgradeExtendedInfo4(const LeasePageSize& page_size) override;
 
     /// @brief Build extended info v6 tables.
     ///

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index dace3eff89b3c3314446fc78858e8f5c5e276915..5df150b5589f6c2f471fddfb6eddd2d26c52ae7f 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -3036,7 +3036,7 @@ PgSqlLeaseMgr::getLeases4ByRemoteId(const OptionBuffer& remote_id,
 }
 
 size_t
-PgSqlLeaseMgr::upgradeExtendedInfo(const LeasePageSize& page_size) {
+PgSqlLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& page_size) {
     auto check = CfgMgr::instance().getCurrentCfg()->
         getConsistency()->getExtendedInfoSanityCheck();
 

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h
index e0534e22e08c3287c938b71bda1d8894f7a1206f..7bc64d2b58c2fde4eabc29ee05c0b230c2ce7d33 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.h
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h
@@ -1086,7 +1086,7 @@ private:
     ///
     /// @param page_size The page size used for retrieval.
     /// @return The number of updates in the database.
-    virtual size_t upgradeExtendedInfo(const LeasePageSize& page_size) override;
+    virtual size_t upgradeExtendedInfo4(const LeasePageSize& page_size) override;
 
     /// @brief Build extended info v6 tables.
     ///

diff --git a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc
index f89d883df064e6226f73b43e8f543c5692559a99..b24b404bb7051c62fd5ab0de03e363dbe865eace 100644 (file)
--- a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc
+++ b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.cc
@@ -292,7 +292,7 @@ ConcreteLeaseMgr::getLeases6ByLink(const IOAddress& /* link_addr */,
 }
 
 size_t
-ConcreteLeaseMgr::upgradeExtendedInfo(const LeasePageSize& /* page_size */) {
+ConcreteLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& /* page_size */) {
     return (0);
 }
 

diff --git a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h
index 14cab968e804fc20b05d04224d6316212e1300af..53956dc20a187fd555c9ea83e9c60dffb73efa94 100644 (file)
--- a/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h
+++ b/src/lib/dhcpsrv/testutils/concrete_lease_mgr.h
@@ -379,7 +379,7 @@ public:
 
     /// @brief Stub implementation.
     virtual size_t
-    upgradeExtendedInfo(const LeasePageSize& /* page_size */) override;
+    upgradeExtendedInfo4(const LeasePageSize& /* page_size */) override;
 
     /// @brief Stub implementation.
     virtual size_t buildExtendedInfoTables6(bool /* update */,