From: Francis Dupont <fdupont@isc.org>
Date: Tue, 23 May 2023 14:23:41 +0000 (+0200)
Subject: [#2757] Moved to upgradeExtendedInfo4
X-Git-Tag: Kea-2.3.8~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45405ffcff2b90ee8de90614897b576c7c355ea;p=thirdparty%2Fkea.git

[#2757] Moved to upgradeExtendedInfo4
---

diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h
index dca8b93f89..10464546e8 100644
--- 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 5b5c7df041..abbde67a55 100644
--- 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 e5831ecc06..e22dcead58 100644
--- 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 11df3850af..5716284842 100644
--- 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 e4be9b5cb5..91fd4ebc48 100644
--- 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 dace3eff89..5df150b558 100644
--- 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 e0534e22e0..7bc64d2b58 100644
--- 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 f89d883df0..b24b404bb7 100644
--- 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 14cab968e8..53956dc20a 100644
--- 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 */,