From: Razvan Becheriu <razvan@isc.org>
Date: Wed, 26 Oct 2022 15:26:53 +0000 (+0300)
Subject: [#2621] fixed UT compilation on with clang and c++20
X-Git-Tag: Kea-2.3.4~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9525cdee966bde62b6f0f43ff4f43f596299497;p=thirdparty%2Fkea.git

[#2621] fixed UT compilation on with clang and c++20
---

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index f80a8d6d64..75843c4e70 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -765,9 +765,9 @@ public:
         }
         Subnet4Ptr s = *subnet_it;
 
-        EXPECT_EQ(t1, s->getT1());
-        EXPECT_EQ(t2, s->getT2());
-        EXPECT_EQ(valid, s->getValid());
+        EXPECT_EQ(t1, s->getT1().get());
+        EXPECT_EQ(t2, s->getT2().get());
+        EXPECT_EQ(valid, s->getValid().get());
         EXPECT_EQ(min_valid ? min_valid : valid, s->getValid().getMin());
         EXPECT_EQ(max_valid ? max_valid : valid, s->getValid().getMax());
 
@@ -1059,8 +1059,8 @@ TEST_F(Dhcp4ParserTest, unspecifiedRenewTimer) {
 
     EXPECT_TRUE(subnet->getT1().unspecified());
     EXPECT_FALSE(subnet->getT2().unspecified());
-    EXPECT_EQ(2000, subnet->getT2());
-    EXPECT_EQ(4000, subnet->getValid());
+    EXPECT_EQ(2000, subnet->getT2().get());
+    EXPECT_EQ(4000, subnet->getValid().get());
 
     // Check that subnet-id is 1
     EXPECT_EQ(1, subnet->getID());
@@ -1091,9 +1091,9 @@ TEST_F(Dhcp4ParserTest, unspecifiedRebindTimer) {
         getCfgSubnets4()->selectSubnet(IOAddress("192.0.2.200"));
     ASSERT_TRUE(subnet);
     EXPECT_FALSE(subnet->getT1().unspecified());
-    EXPECT_EQ(1000, subnet->getT1());
+    EXPECT_EQ(1000, subnet->getT1().get());
     EXPECT_TRUE(subnet->getT2().unspecified());
-    EXPECT_EQ(4000, subnet->getValid());
+    EXPECT_EQ(4000, subnet->getValid().get());
 
     // Check that subnet-id is 1
     EXPECT_EQ(1, subnet->getID());
@@ -1128,9 +1128,9 @@ TEST_F(Dhcp4ParserTest, subnetGlobalDefaults) {
     Subnet4Ptr subnet = CfgMgr::instance().getStagingCfg()->
         getCfgSubnets4()->selectSubnet(IOAddress("192.0.2.200"));
     ASSERT_TRUE(subnet);
-    EXPECT_EQ(1000, subnet->getT1());
-    EXPECT_EQ(2000, subnet->getT2());
-    EXPECT_EQ(4000, subnet->getValid());
+    EXPECT_EQ(1000, subnet->getT1().get());
+    EXPECT_EQ(2000, subnet->getT2().get());
+    EXPECT_EQ(4000, subnet->getValid().get());
     EXPECT_EQ(3000, subnet->getValid().getMin());
     EXPECT_EQ(5000, subnet->getValid().getMax());
 
@@ -1905,9 +1905,9 @@ TEST_F(Dhcp4ParserTest, subnetLocal) {
     Subnet4Ptr subnet = CfgMgr::instance().getStagingCfg()->
         getCfgSubnets4()->selectSubnet(IOAddress("192.0.2.200"));
     ASSERT_TRUE(subnet);
-    EXPECT_EQ(1, subnet->getT1());
-    EXPECT_EQ(2, subnet->getT2());
-    EXPECT_EQ(4, subnet->getValid());
+    EXPECT_EQ(1, subnet->getT1().get());
+    EXPECT_EQ(2, subnet->getT2().get());
+    EXPECT_EQ(4, subnet->getValid().get());
     EXPECT_EQ(3, subnet->getValid().getMin());
     EXPECT_EQ(5, subnet->getValid().getMax());
 }
@@ -2023,9 +2023,9 @@ TEST_F(Dhcp4ParserTest, poolPrefixLen) {
     Subnet4Ptr subnet = CfgMgr::instance().getStagingCfg()->
         getCfgSubnets4()->selectSubnet(IOAddress("192.0.2.200"));
     ASSERT_TRUE(subnet);
-    EXPECT_EQ(1000, subnet->getT1());
-    EXPECT_EQ(2000, subnet->getT2());
-    EXPECT_EQ(4000, subnet->getValid());
+    EXPECT_EQ(1000, subnet->getT1().get());
+    EXPECT_EQ(2000, subnet->getT2().get());
+    EXPECT_EQ(4000, subnet->getValid().get());
 }
 
 // Goal of this test is to verify if invalid pool definitions
diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index eeef2070fe..a48f4104b7 100644
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -490,10 +490,10 @@ public:
         }
         Subnet6Ptr s = *subnet_it;
 
-        EXPECT_EQ(t1, s->getT1());
-        EXPECT_EQ(t2, s->getT2());
-        EXPECT_EQ(pref, s->getPreferred());
-        EXPECT_EQ(valid, s->getValid());
+        EXPECT_EQ(t1, s->getT1().get());
+        EXPECT_EQ(t2, s->getT2().get());
+        EXPECT_EQ(pref, s->getPreferred().get());
+        EXPECT_EQ(valid, s->getValid().get());
         EXPECT_EQ(min_pref ? min_pref : pref, s->getPreferred().getMin());
         EXPECT_EQ(max_pref ? max_pref : pref, s->getPreferred().getMax());
         EXPECT_EQ(min_valid ? min_valid : valid, s->getValid().getMin());
@@ -1381,12 +1381,12 @@ TEST_F(Dhcp6ParserTest, subnetGlobalDefaults) {
     Subnet6Ptr subnet = CfgMgr::instance().getStagingCfg()->getCfgSubnets6()->
         selectSubnet(IOAddress("2001:db8:1::5"), classify_);
     ASSERT_TRUE(subnet);
-    EXPECT_EQ(1000, subnet->getT1());
-    EXPECT_EQ(2000, subnet->getT2());
-    EXPECT_EQ(3000, subnet->getPreferred());
+    EXPECT_EQ(1000, subnet->getT1().get());
+    EXPECT_EQ(2000, subnet->getT2().get());
+    EXPECT_EQ(3000, subnet->getPreferred().get());
     EXPECT_EQ(2000, subnet->getPreferred().getMin());
     EXPECT_EQ(4000, subnet->getPreferred().getMax());
-    EXPECT_EQ(4000, subnet->getValid());
+    EXPECT_EQ(4000, subnet->getValid().get());
     EXPECT_EQ(3000, subnet->getValid().getMin());
     EXPECT_EQ(5000, subnet->getValid().getMax());
 
@@ -1724,12 +1724,12 @@ TEST_F(Dhcp6ParserTest, subnetLocal) {
     Subnet6Ptr subnet = CfgMgr::instance().getStagingCfg()->getCfgSubnets6()->
         selectSubnet(IOAddress("2001:db8:1::5"), classify_);
     ASSERT_TRUE(subnet);
-    EXPECT_EQ(1, subnet->getT1());
-    EXPECT_EQ(2, subnet->getT2());
-    EXPECT_EQ(3, subnet->getPreferred());
+    EXPECT_EQ(1, subnet->getT1().get());
+    EXPECT_EQ(2, subnet->getT2().get());
+    EXPECT_EQ(3, subnet->getPreferred().get());
     EXPECT_EQ(2, subnet->getPreferred().getMin());
     EXPECT_EQ(4, subnet->getPreferred().getMax());
-    EXPECT_EQ(4, subnet->getValid());
+    EXPECT_EQ(4, subnet->getValid().get());
     EXPECT_EQ(3, subnet->getValid().getMin());
     EXPECT_EQ(5, subnet->getValid().getMax());
 }
@@ -2155,10 +2155,10 @@ TEST_F(Dhcp6ParserTest, poolPrefixLen) {
     Subnet6Ptr subnet = CfgMgr::instance().getStagingCfg()->getCfgSubnets6()->
         selectSubnet(IOAddress("2001:db8:1::5"), classify_);
     ASSERT_TRUE(subnet);
-    EXPECT_EQ(1000, subnet->getT1());
-    EXPECT_EQ(2000, subnet->getT2());
-    EXPECT_EQ(3000, subnet->getPreferred());
-    EXPECT_EQ(4000, subnet->getValid());
+    EXPECT_EQ(1000, subnet->getT1().get());
+    EXPECT_EQ(2000, subnet->getT2().get());
+    EXPECT_EQ(3000, subnet->getPreferred().get());
+    EXPECT_EQ(4000, subnet->getValid().get());
 }
 
 // Goal of this test is to verify if invalid pool definitions
diff --git a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
index f2bafc35e2..a1008f33f7 100644
--- a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
@@ -59,7 +59,7 @@ void checkMergedSubnet(CfgSubnets4& cfg_subnets,
 
     // Make sure we have the one we expect.
     ASSERT_EQ(exp_subnet_id, subnet->getID()) << "subnet ID is wrong";
-    ASSERT_EQ(exp_valid, subnet->getValid()) << "subnet valid time is wrong";
+    ASSERT_EQ(exp_valid, subnet->getValid().get()) << "subnet valid time is wrong";
 
     SharedNetwork4Ptr shared_network;
     subnet->getSharedNetwork(shared_network);
@@ -1400,7 +1400,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getValid().unspecified());
-        EXPECT_EQ(100, subnet->getValid());
+        EXPECT_EQ(100, subnet->getValid().get());
         EXPECT_EQ(100, subnet->getValid().getMin());
         EXPECT_EQ(100, subnet->getValid().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1424,7 +1424,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getValid().unspecified());
-        EXPECT_EQ(100, subnet->getValid());
+        EXPECT_EQ(100, subnet->getValid().get());
         EXPECT_EQ(100, subnet->getValid().getMin());
         EXPECT_EQ(100, subnet->getValid().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1448,7 +1448,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getValid().unspecified());
-        EXPECT_EQ(100, subnet->getValid());
+        EXPECT_EQ(100, subnet->getValid().get());
         EXPECT_EQ(100, subnet->getValid().getMin());
         EXPECT_EQ(100, subnet->getValid().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1474,7 +1474,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getValid().unspecified());
-        EXPECT_EQ(200, subnet->getValid());
+        EXPECT_EQ(200, subnet->getValid().get());
         EXPECT_EQ(100, subnet->getValid().getMin());
         EXPECT_EQ(200, subnet->getValid().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1500,7 +1500,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getValid().unspecified());
-        EXPECT_EQ(100, subnet->getValid());
+        EXPECT_EQ(100, subnet->getValid().get());
         EXPECT_EQ(100, subnet->getValid().getMin());
         EXPECT_EQ(200, subnet->getValid().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1538,7 +1538,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getValid().unspecified());
-        EXPECT_EQ(200, subnet->getValid());
+        EXPECT_EQ(200, subnet->getValid().get());
         EXPECT_EQ(100, subnet->getValid().getMin());
         EXPECT_EQ(300, subnet->getValid().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1588,7 +1588,7 @@ TEST(CfgSubnets4Test, validLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getValid().unspecified());
-        EXPECT_EQ(100, subnet->getValid());
+        EXPECT_EQ(100, subnet->getValid().get());
         EXPECT_EQ(100, subnet->getValid().getMin());
         EXPECT_EQ(100, subnet->getValid().getMax());
         data::ConstElementPtr repr = subnet->toElement();
diff --git a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
index bfba04e0b4..53e5351753 100644
--- a/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
@@ -65,7 +65,7 @@ void checkMergedSubnet(CfgSubnets6& cfg_subnets,
 
     // Make sure we have the one we expect.
     ASSERT_EQ(exp_subnet_id, subnet->getID()) << "subnet ID is wrong";
-    ASSERT_EQ(exp_valid, subnet->getValid()) << "subnetID:"
+    ASSERT_EQ(exp_valid, subnet->getValid().get()) << "subnetID:"
               << subnet->getID() << ", subnet valid time is wrong";
 
     SharedNetwork6Ptr shared_network;
@@ -1200,7 +1200,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getPreferred().unspecified());
-        EXPECT_EQ(100, subnet->getPreferred());
+        EXPECT_EQ(100, subnet->getPreferred().get());
         EXPECT_EQ(100, subnet->getPreferred().getMin());
         EXPECT_EQ(100, subnet->getPreferred().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1224,7 +1224,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getPreferred().unspecified());
-        EXPECT_EQ(100, subnet->getPreferred());
+        EXPECT_EQ(100, subnet->getPreferred().get());
         EXPECT_EQ(100, subnet->getPreferred().getMin());
         EXPECT_EQ(100, subnet->getPreferred().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1248,7 +1248,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getPreferred().unspecified());
-        EXPECT_EQ(100, subnet->getPreferred());
+        EXPECT_EQ(100, subnet->getPreferred().get());
         EXPECT_EQ(100, subnet->getPreferred().getMin());
         EXPECT_EQ(100, subnet->getPreferred().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1274,7 +1274,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getPreferred().unspecified());
-        EXPECT_EQ(200, subnet->getPreferred());
+        EXPECT_EQ(200, subnet->getPreferred().get());
         EXPECT_EQ(100, subnet->getPreferred().getMin());
         EXPECT_EQ(200, subnet->getPreferred().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1300,7 +1300,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getPreferred().unspecified());
-        EXPECT_EQ(100, subnet->getPreferred());
+        EXPECT_EQ(100, subnet->getPreferred().get());
         EXPECT_EQ(100, subnet->getPreferred().getMin());
         EXPECT_EQ(200, subnet->getPreferred().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1338,7 +1338,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getPreferred().unspecified());
-        EXPECT_EQ(200, subnet->getPreferred());
+        EXPECT_EQ(200, subnet->getPreferred().get());
         EXPECT_EQ(100, subnet->getPreferred().getMin());
         EXPECT_EQ(300, subnet->getPreferred().getMax());
         data::ConstElementPtr repr = subnet->toElement();
@@ -1388,7 +1388,7 @@ TEST(CfgSubnets6Test, preferredLifetimeValidation) {
         ASSERT_NO_THROW(subnet = parser.parse(copied));
         ASSERT_TRUE(subnet);
         EXPECT_FALSE(subnet->getPreferred().unspecified());
-        EXPECT_EQ(100, subnet->getPreferred());
+        EXPECT_EQ(100, subnet->getPreferred().get());
         EXPECT_EQ(100, subnet->getPreferred().getMin());
         EXPECT_EQ(100, subnet->getPreferred().getMax());
         data::ConstElementPtr repr = subnet->toElement();
diff --git a/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc b/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
index 0ca5f0450a..9b3da68134 100644
--- a/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
@@ -1362,7 +1362,7 @@ TEST_F(ClientClassDefParserTest, noFixedFields6) {
     ASSERT_TRUE(cclass);
 
     // And it should not have any fixed fields set
-    EXPECT_EQ(0, cclass->getPreferred());
+    EXPECT_EQ(0, cclass->getPreferred().get());
     EXPECT_EQ(0, cclass->getPreferred().getMin());
     EXPECT_EQ(0, cclass->getPreferred().getMax());
 
diff --git a/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc b/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc
index 8a6d58de35..fc35dde10c 100644
--- a/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc
@@ -254,9 +254,9 @@ TEST_F(SharedNetwork4ParserTest, parse) {
     EXPECT_EQ("srv1", network->getClientClass().get());
     EXPECT_EQ("bird", network->getName());
     EXPECT_EQ("eth1961", network->getIface().get());
-    EXPECT_EQ(99, network->getT1());
-    EXPECT_EQ(199, network->getT2());
-    EXPECT_EQ(399, network->getValid());
+    EXPECT_EQ(99, network->getT1().get());
+    EXPECT_EQ(199, network->getT2().get());
+    EXPECT_EQ(399, network->getValid().get());
     EXPECT_EQ(299, network->getValid().getMin());
     EXPECT_EQ(499, network->getValid().getMax());
     EXPECT_TRUE(network->getCalculateTeeTimes());
@@ -278,7 +278,7 @@ TEST_F(SharedNetwork4ParserTest, parse) {
     EXPECT_EQ("x", network->getHostnameCharReplacement().get());
     EXPECT_TRUE(network->getStoreExtendedInfo().get());
     EXPECT_EQ(0.123, network->getCacheThreshold());
-    EXPECT_EQ(123, network->getCacheMaxAge());
+    EXPECT_EQ(123, network->getCacheMaxAge().get());
     EXPECT_TRUE(network->getDdnsUpdateOnRenew().get());
 
     // Relay information.
@@ -300,7 +300,7 @@ TEST_F(SharedNetwork4ParserTest, parse) {
     Subnet4Ptr subnet = network->getSubnet(SubnetID(1));
     ASSERT_TRUE(subnet);
     EXPECT_EQ("10.1.2.0", subnet->get().first.toText());
-    EXPECT_EQ(300, subnet->getValid());
+    EXPECT_EQ(300, subnet->getValid().get());
     EXPECT_EQ(200, subnet->getValid().getMin());
     EXPECT_EQ(400, subnet->getValid().getMax());
     EXPECT_FALSE(subnet->getHostnameCharSet().unspecified());
@@ -310,7 +310,7 @@ TEST_F(SharedNetwork4ParserTest, parse) {
     subnet = network->getSubnet(SubnetID(2));
     ASSERT_TRUE(subnet);
     EXPECT_EQ("192.0.2.0", subnet->get().first.toText());
-    EXPECT_EQ(30, subnet->getValid());
+    EXPECT_EQ(30, subnet->getValid().get());
     EXPECT_EQ(30, subnet->getValid().getMin());
     EXPECT_EQ(30, subnet->getValid().getMax());
     EXPECT_EQ("[^A-Z]", subnet->getHostnameCharSet().get());
@@ -664,13 +664,13 @@ TEST_F(SharedNetwork6ParserTest, parse) {
     EXPECT_EQ("srv1", network->getClientClass().get());
     EXPECT_EQ("bird", network->getName());
     EXPECT_EQ("eth1961", network->getIface().get());
-    EXPECT_EQ(211, network->getPreferred());
+    EXPECT_EQ(211, network->getPreferred().get());
     EXPECT_EQ(111, network->getPreferred().getMin());
     EXPECT_EQ(311, network->getPreferred().getMax());
     EXPECT_TRUE(network->getRapidCommit());
-    EXPECT_EQ(99, network->getT1());
-    EXPECT_EQ(199, network->getT2());
-    EXPECT_EQ(399, network->getValid());
+    EXPECT_EQ(99, network->getT1().get());
+    EXPECT_EQ(199, network->getT2().get());
+    EXPECT_EQ(399, network->getValid().get());
     EXPECT_EQ(299, network->getValid().getMin());
     EXPECT_EQ(499, network->getValid().getMax());
     EXPECT_TRUE(network->getCalculateTeeTimes());
@@ -686,7 +686,7 @@ TEST_F(SharedNetwork6ParserTest, parse) {
     EXPECT_EQ("x", network->getHostnameCharReplacement().get());
     EXPECT_TRUE(network->getStoreExtendedInfo().get());
     EXPECT_EQ(0.123, network->getCacheThreshold());
-    EXPECT_EQ(123, network->getCacheMaxAge());
+    EXPECT_EQ(123, network->getCacheMaxAge().get());
     EXPECT_TRUE(network->getDdnsUpdateOnRenew().get());
 
     // Relay information.
@@ -708,10 +708,10 @@ TEST_F(SharedNetwork6ParserTest, parse) {
     Subnet6Ptr subnet = network->getSubnet(SubnetID(1));
     ASSERT_TRUE(subnet);
     EXPECT_EQ("3000::", subnet->get().first.toText());
-    EXPECT_EQ(300, subnet->getPreferred());
+    EXPECT_EQ(300, subnet->getPreferred().get());
     EXPECT_EQ(200, subnet->getPreferred().getMin());
     EXPECT_EQ(400, subnet->getPreferred().getMax());
-    EXPECT_EQ(400, subnet->getValid());
+    EXPECT_EQ(400, subnet->getValid().get());
     EXPECT_EQ(300, subnet->getValid().getMin());
     EXPECT_EQ(500, subnet->getValid().getMax());
     EXPECT_FALSE(subnet->getHostnameCharSet().unspecified());
@@ -721,10 +721,10 @@ TEST_F(SharedNetwork6ParserTest, parse) {
     subnet = network->getSubnet(SubnetID(2));
     ASSERT_TRUE(subnet);
     EXPECT_EQ("2001:db8:1::", subnet->get().first.toText());
-    EXPECT_EQ(30, subnet->getPreferred());
+    EXPECT_EQ(30, subnet->getPreferred().get());
     EXPECT_EQ(30, subnet->getPreferred().getMin());
     EXPECT_EQ(30, subnet->getPreferred().getMax());
-    EXPECT_EQ(40, subnet->getValid());
+    EXPECT_EQ(40, subnet->getValid().get());
     EXPECT_EQ(40, subnet->getValid().getMin());
     EXPECT_EQ(40, subnet->getValid().getMax());
     EXPECT_EQ("[^A-Z]", subnet->getHostnameCharSet().get());
diff --git a/src/lib/dhcpsrv/tests/shared_network_unittest.cc b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
index f8a2908af1..e039c6cb20 100644
--- a/src/lib/dhcpsrv/tests/shared_network_unittest.cc
+++ b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
@@ -222,9 +222,9 @@ TEST(SharedNetwork4Test, replaceSubnet4) {
     EXPECT_TRUE(network->replace(subnet));
 
     // Second subnet was updated.
-    EXPECT_EQ(10, returned_subnet->getT1());
-    EXPECT_EQ(20, returned_subnet->getT2());
-    EXPECT_EQ(30, returned_subnet->getValid());
+    EXPECT_EQ(10, returned_subnet->getT1().get());
+    EXPECT_EQ(20, returned_subnet->getT2().get());
+    EXPECT_EQ(30, returned_subnet->getValid().get());
     SharedNetwork4Ptr network1;
     returned_subnet->getSharedNetwork(network1);
     EXPECT_FALSE(network1);
@@ -233,9 +233,9 @@ TEST(SharedNetwork4Test, replaceSubnet4) {
     returned_subnet = *network->getAllSubnets()->begin();
     ASSERT_TRUE(returned_subnet);
     ASSERT_EQ(1, returned_subnet->getID());
-    EXPECT_EQ(100, returned_subnet->getT1());
-    EXPECT_EQ(200, returned_subnet->getT2());
-    EXPECT_EQ(300, returned_subnet->getValid());
+    EXPECT_EQ(100, returned_subnet->getT1().get());
+    EXPECT_EQ(200, returned_subnet->getT2().get());
+    EXPECT_EQ(300, returned_subnet->getValid().get());
     returned_subnet->getSharedNetwork(network1);
     EXPECT_TRUE(network1);
     EXPECT_TRUE(network == network1);
@@ -955,10 +955,10 @@ TEST(SharedNetwork6Test, replaceSubnet6) {
     EXPECT_TRUE(network->replace(subnet));
 
     // Second subnet was updated.
-    EXPECT_EQ(10, returned_subnet->getT1());
-    EXPECT_EQ(20, returned_subnet->getT2());
-    EXPECT_EQ(30, returned_subnet->getPreferred());
-    EXPECT_EQ(40, returned_subnet->getValid());
+    EXPECT_EQ(10, returned_subnet->getT1().get());
+    EXPECT_EQ(20, returned_subnet->getT2().get());
+    EXPECT_EQ(30, returned_subnet->getPreferred().get());
+    EXPECT_EQ(40, returned_subnet->getValid().get());
     SharedNetwork6Ptr network1;
     returned_subnet->getSharedNetwork(network1);
     EXPECT_FALSE(network1);
@@ -967,10 +967,10 @@ TEST(SharedNetwork6Test, replaceSubnet6) {
     returned_subnet = *network->getAllSubnets()->begin();
     ASSERT_TRUE(returned_subnet);
     ASSERT_EQ(1, returned_subnet->getID());
-    EXPECT_EQ(100, returned_subnet->getT1());
-    EXPECT_EQ(200, returned_subnet->getT2());
-    EXPECT_EQ(300, returned_subnet->getPreferred());
-    EXPECT_EQ(400, returned_subnet->getValid());
+    EXPECT_EQ(100, returned_subnet->getT1().get());
+    EXPECT_EQ(200, returned_subnet->getT2().get());
+    EXPECT_EQ(300, returned_subnet->getPreferred().get());
+    EXPECT_EQ(400, returned_subnet->getValid().get());
     returned_subnet->getSharedNetwork(network1);
     EXPECT_TRUE(network1);
     EXPECT_TRUE(network == network1);
diff --git a/src/lib/dhcpsrv/tests/subnet_unittest.cc b/src/lib/dhcpsrv/tests/subnet_unittest.cc
index 30a5d0f971..da0097450b 100644
--- a/src/lib/dhcpsrv/tests/subnet_unittest.cc
+++ b/src/lib/dhcpsrv/tests/subnet_unittest.cc
@@ -179,9 +179,9 @@ TEST(Subnet4Test, subnetID) {
 TEST(Subnet4Test, inRange) {
     Subnet4 subnet(IOAddress("192.0.2.1"), 24, 1000, 2000, 3000);
 
-    EXPECT_EQ(1000, subnet.getT1());
-    EXPECT_EQ(2000, subnet.getT2());
-    EXPECT_EQ(3000, subnet.getValid());
+    EXPECT_EQ(1000, subnet.getT1().get());
+    EXPECT_EQ(2000, subnet.getT2().get());
+    EXPECT_EQ(3000, subnet.getValid().get());
 
     EXPECT_FALSE(subnet.hasRelays());
 
@@ -894,10 +894,10 @@ TEST(Subnet6Test, subnetID) {
 TEST(Subnet6Test, inRange) {
     Subnet6 subnet(IOAddress("2001:db8:1::"), 64, 1000, 2000, 3000, 4000);
 
-    EXPECT_EQ(1000, subnet.getT1());
-    EXPECT_EQ(2000, subnet.getT2());
-    EXPECT_EQ(3000, subnet.getPreferred());
-    EXPECT_EQ(4000, subnet.getValid());
+    EXPECT_EQ(1000, subnet.getT1().get());
+    EXPECT_EQ(2000, subnet.getT2().get());
+    EXPECT_EQ(3000, subnet.getPreferred().get());
+    EXPECT_EQ(4000, subnet.getValid().get());
 
     EXPECT_FALSE(subnet.inRange(IOAddress("2001:db8:0:ffff:ffff:ffff:ffff:ffff")));
     EXPECT_TRUE(subnet.inRange(IOAddress("2001:db8:1::0")));