mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 14:35:29 +00:00
Code Issues Releases Wiki Activity

[#2757] Finished move to upgradeExtendedInfo4

Browse Source
This commit is contained in:
Francis Dupont
2023-05-23 16:40:28 +02:00
parent 5afa8fe982
commit d6612eaf21
2 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/lib/dhcpsrv/tests/mysql_lease_extended_info_unittest.cc
View File

@@ -124,9 +124,9 @@ public:
/// @brief Test getLease4ByRemoteId. /// @brief Test getLease4ByRemoteId.
void testGetLeases4ByRemoteId(); void testGetLeases4ByRemoteId();
/// @brief Test upgradeExtendedInfo. /// @brief Test upgradeExtendedInfo4.
void testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check, void testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
const LeasePageSize& page_size); const LeasePageSize& page_size);
/// @brief Lease manager. /// @brief Lease manager.
LeaseMgr* lease_mgr_; LeaseMgr* lease_mgr_;
@@ -621,8 +621,8 @@ TEST_F(MySqlExtendedInfoTest, getLeases4ByRemoteIdMultiThreading) {
} }
void void
MySqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check, MySqlExtendedInfoTest::testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
const LeasePageSize& page_size) { const LeasePageSize& page_size) {
// Lease manager is created with empty tables. // Lease manager is created with empty tables.
initLease4(false); initLease4(false);
@@ -738,7 +738,7 @@ MySqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
setExtendedInfoSanityCheck(check); setExtendedInfoSanityCheck(check);
size_t updated; size_t updated;
ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo(page_size)); ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo4(page_size));
// Verify result. // Verify result.
switch (check) { switch (check) {
@@ -925,44 +925,44 @@ MySqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoNone) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4None) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_NONE, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_NONE,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoFix) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4Fix) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoStrict) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4Strict) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_STRICT, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_STRICT,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfoPedantic) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4Pedantic) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo10) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_10) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(10)); LeasePageSize(10));
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo5) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_5) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(5)); LeasePageSize(5));
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo2) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_2) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(2)); LeasePageSize(2));
} }
TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo1) { TEST_F(MySqlExtendedInfoTest, upgradeExtendedInfo4_1) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(1)); LeasePageSize(1));
} }
} // namespace } // namespace

60
src/lib/dhcpsrv/tests/pgsql_lease_extended_info_unittest.cc
View File

@@ -124,9 +124,9 @@ public:
/// @brief Test getLease4ByRemoteId. /// @brief Test getLease4ByRemoteId.
void testGetLeases4ByRemoteId(); void testGetLeases4ByRemoteId();
/// @brief Test upgradeExtendedInfo. /// @brief Test upgradeExtendedInfo4.
void testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check, void testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
const LeasePageSize& page_size); const LeasePageSize& page_size);
/// @brief Lease manager. /// @brief Lease manager.
LeaseMgr* lease_mgr_; LeaseMgr* lease_mgr_;
@@ -621,8 +621,8 @@ TEST_F(PgSqlExtendedInfoTest, getLeases4ByRemoteIdMultiThreading) {
} }
void void
PgSqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInfoSanity& check, PgSqlExtendedInfoTest::testUpgradeExtendedInfo4(const CfgConsistency::ExtendedInfoSanity& check,
const LeasePageSize& page_size) { const LeasePageSize& page_size) {
// Lease manager is created with empty tables. // Lease manager is created with empty tables.
initLease4(false); initLease4(false);
@@ -738,7 +738,7 @@ PgSqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
setExtendedInfoSanityCheck(check); setExtendedInfoSanityCheck(check);
size_t updated; size_t updated;
ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo(page_size)); ASSERT_NO_THROW(updated = lease_mgr_->upgradeExtendedInfo4(page_size));
// Verify result. // Verify result.
switch (check) { switch (check) {
@@ -925,44 +925,44 @@ PgSqlExtendedInfoTest::testUpgradeExtendedInfo(const CfgConsistency::ExtendedInf
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoNone) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4None) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_NONE, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_NONE,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoFix) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4Fix) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoStrict) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4Strict) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_STRICT, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_STRICT,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfoPedantic) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4Pedantic) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_PEDANTIC,
LeasePageSize(100)); LeasePageSize(100));
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo10) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_10) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(10)); LeasePageSize(10));
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo5) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_5) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(5)); LeasePageSize(5));
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo2) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_2) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(2)); LeasePageSize(2));
} }
TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo1) { TEST_F(PgSqlExtendedInfoTest, upgradeExtendedInfo4_1) {
testUpgradeExtendedInfo(CfgConsistency::EXTENDED_INFO_CHECK_FIX, testUpgradeExtendedInfo4(CfgConsistency::EXTENDED_INFO_CHECK_FIX,
LeasePageSize(1)); LeasePageSize(1));
} }
} // namespace } // namespace