[#2596] Updated code for link address

diff --git a/src/lib/dhcpsrv/lease_mgr.cc b/src/lib/dhcpsrv/lease_mgr.cc
index def08de46d092c8e8207c78193647478f9da8a11..396537c8087e16a8c3e3275d20a0a26237e76dac 100644 (file)
--- a/src/lib/dhcpsrv/lease_mgr.cc
+++ b/src/lib/dhcpsrv/lease_mgr.cc
@@ -992,19 +992,6 @@ LeaseMgr::addExtendedInfo6(const Lease6Ptr& lease) {
             continue;
         }
         try {
-            ConstElementPtr link = relay->get("link");
-            if (!link || (link->getType() != Element::string)) {
-                continue;
-            }
-            IOAddress link_addr(link->stringValue());
-            if (!link_addr.isV6()) {
-                continue;
-            }
-            if (!link_addr.isV6Zero()) {
-                addLinkAddr6(lease->addr_, link_addr);
-                added = true;
-            }
-
             ConstElementPtr relay_id = relay->get("relay-id");
             if (relay_id) {
                 string relay_id_hex = relay_id->stringValue();
@@ -1013,7 +1000,7 @@ LeaseMgr::addExtendedInfo6(const Lease6Ptr& lease) {
                 if (relay_id_data.empty()) {
                     continue;
                 }
-                addRelayId6(lease->addr_, link_addr, relay_id_data);
+                addRelayId6(lease->addr_, relay_id_data);
                 added = true;
             }
 
@@ -1025,7 +1012,7 @@ LeaseMgr::addExtendedInfo6(const Lease6Ptr& lease) {
                 if (remote_id_data.empty()) {
                     continue;
                 }
-                addRemoteId6(lease->addr_, link_addr, remote_id_data);
+                addRemoteId6(lease->addr_, remote_id_data);
                 added = true;
             }
         } catch (const exception&) {

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index 1bd1a0aef7e98a8b2a57a61aed983bcd63046a6a..a36bc056ecd7b7e3fbbdca707e00114522270cb3 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -2870,7 +2870,6 @@ Memfile_LeaseMgr::buildExtendedInfoTables6Internal(bool update, bool current) {
     if (enabled) {
         relay_id6_.clear();
         remote_id6_.clear();
-        link_addr6_.clear();
     }
 
     size_t leases = 0;

diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
index f9374b276be664613789839489547caf5dfdbdc8..950420a345f199d8d4fc2059768eeb3bf7625b84 100644 (file)
--- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
@@ -422,14 +422,6 @@ public:
                 ++remote_id_it;
             }
         }
-        auto link_addr_it = link_addr6_.begin();
-        while (link_addr_it != link_addr6_.end()) {
-            if ((*link_addr_it)->lease_addr_ == addr) {
-                link_addr_it = link_addr6_.erase(link_addr_it);
-            } else {
-                ++link_addr_it;
-            }
-        }
     }
 
     /// @brief Add lease6 extended info into by-relay-id table.
@@ -569,7 +561,6 @@ public:
     // List supports easier erase.
     list<Lease6ExtendedInfoPtr> relay_id6_;
     list<Lease6ExtendedInfoPtr> remote_id6_;
-    list<Lease6SimpleExtendedInfoPtr> link_addr6_;
 };
 
 class LeaseMgrTest : public GenericLeaseMgrTest {
@@ -1238,11 +1229,9 @@ TEST(Lease6ExtendedInfoTest, invalidSetExtendedInfoTablesEnabled) {
         lease->setContext(user_context);
         mgr->relay_id6_.clear();
         mgr->remote_id6_.clear();
-        mgr->link_addr6_.clear();
         EXPECT_NO_THROW(mgr->addExtendedInfo6(lease));
         EXPECT_TRUE(mgr->relay_id6_.empty());
         EXPECT_TRUE(mgr->remote_id6_.empty());
-        EXPECT_TRUE(mgr->link_addr6_.empty());
     }
 }
 
@@ -1265,11 +1254,6 @@ TEST(Lease6ExtendedInfoTest, noIdSetExtendedInfoTablesEnabled) {
     EXPECT_NO_THROW(mgr->addExtendedInfo6(lease));
     EXPECT_TRUE(mgr->relay_id6_.empty());
     EXPECT_TRUE(mgr->remote_id6_.empty());
-    ASSERT_EQ(1, mgr->link_addr6_.size());
-    Lease6SimpleExtendedInfoPtr sex_info = mgr->link_addr6_.front();
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ("2001:db8::1", sex_info->link_addr_.toText());
-    EXPECT_EQ("2001:db8::100", sex_info->lease_addr_.toText());
 }
 
 /// Verify setExtendedInfoTablesEnabled with one relay with ids.
@@ -1295,7 +1279,6 @@ TEST(Lease6ExtendedInfoTest, idsSetExtendedInfoTablesEnabled) {
     EXPECT_EQ(1, mgr->relay_id6_.size());
     Lease6ExtendedInfoPtr ex_info = mgr->relay_id6_.front();
     ASSERT_TRUE(ex_info);
-    EXPECT_EQ("2001:db8::5", ex_info->link_addr_.toText());
     EXPECT_EQ("2001:db8::100", ex_info->lease_addr_.toText());
     const vector<uint8_t>& relay_id = ex_info->id_;
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
@@ -1304,17 +1287,10 @@ TEST(Lease6ExtendedInfoTest, idsSetExtendedInfoTablesEnabled) {
     EXPECT_EQ(1, mgr->remote_id6_.size());
     ex_info = mgr->remote_id6_.front();
     ASSERT_TRUE(ex_info);
-    EXPECT_EQ("2001:db8::5", ex_info->link_addr_.toText());
     EXPECT_EQ("2001:db8::100", ex_info->lease_addr_.toText());
     const vector<uint8_t>& remote_id = ex_info->id_;
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, remote_id);
-
-    ASSERT_EQ(1, mgr->link_addr6_.size());
-    Lease6SimpleExtendedInfoPtr sex_info = mgr->link_addr6_.front();
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ("2001:db8::5", sex_info->link_addr_.toText());
-    EXPECT_EQ("2001:db8::100", sex_info->lease_addr_.toText());
 }
 
 /// Verify setExtendedInfoTablesEnabled with one relay with ids but
@@ -1341,7 +1317,6 @@ TEST(Lease6ExtendedInfoTest, linkZeroSetExtendedInfoTablesEnabled) {
     EXPECT_EQ(1, mgr->relay_id6_.size());
     Lease6ExtendedInfoPtr ex_info = mgr->relay_id6_.front();
     ASSERT_TRUE(ex_info);
-    EXPECT_EQ("::", ex_info->link_addr_.toText());
     EXPECT_EQ("2001:db8::100", ex_info->lease_addr_.toText());
     const vector<uint8_t>& relay_id = ex_info->id_;
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
@@ -1350,13 +1325,10 @@ TEST(Lease6ExtendedInfoTest, linkZeroSetExtendedInfoTablesEnabled) {
     EXPECT_EQ(1, mgr->remote_id6_.size());
     ex_info = mgr->remote_id6_.front();
     ASSERT_TRUE(ex_info);
-    EXPECT_EQ("::", ex_info->link_addr_.toText());
     EXPECT_EQ("2001:db8::100", ex_info->lease_addr_.toText());
     const vector<uint8_t>& remote_id = ex_info->id_;
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, remote_id);
-
-    EXPECT_TRUE(mgr->link_addr6_.empty());
 }
 
 /// Verify setExtendedInfoTablesEnabled with two relays.
@@ -1384,7 +1356,6 @@ TEST(Lease6ExtendedInfoTest, twoSetExtendedInfoTablesEnabled) {
     EXPECT_EQ(1, mgr->relay_id6_.size());
     Lease6ExtendedInfoPtr ex_info = mgr->relay_id6_.front();
     ASSERT_TRUE(ex_info);
-    EXPECT_EQ("2001:db8::5", ex_info->link_addr_.toText());
     EXPECT_EQ("2001:db8::100", ex_info->lease_addr_.toText());
     const vector<uint8_t>& relay_id = ex_info->id_;
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
@@ -1393,21 +1364,10 @@ TEST(Lease6ExtendedInfoTest, twoSetExtendedInfoTablesEnabled) {
     EXPECT_EQ(1, mgr->remote_id6_.size());
     ex_info = mgr->remote_id6_.front();
     ASSERT_TRUE(ex_info);
-    EXPECT_EQ("2001:db8::5", ex_info->link_addr_.toText());
     EXPECT_EQ("2001:db8::100", ex_info->lease_addr_.toText());
     const vector<uint8_t>& remote_id = ex_info->id_;
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, remote_id);
-
-    ASSERT_EQ(2, mgr->link_addr6_.size());
-    Lease6SimpleExtendedInfoPtr sex_info = mgr->link_addr6_.front();
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ("2001:db8::1", sex_info->link_addr_.toText());
-    EXPECT_EQ("2001:db8::100", sex_info->lease_addr_.toText());
-    sex_info = mgr->link_addr6_.back();
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ("2001:db8::5", sex_info->link_addr_.toText());
-    EXPECT_EQ("2001:db8::100", sex_info->lease_addr_.toText());
 }
 
 // There's no point in calling any other methods in LeaseMgr, as they

diff --git a/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc
index 2369283486482a3f997c934847f2f6b179bfd263..22f5fd8f89b4e7b4b204b41893bc5eccef4dfa48 100644 (file)
--- a/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_extended_info_unittest.cc
@@ -1046,18 +1046,15 @@ TEST_F(MemfileExtendedInfoTest, deleteLease6) {
 
     // Create parameter values.
     IOAddress lease_addr(ADDRESS6[0]);
-    IOAddress link_addr(ADDRESS6[1]);
     vector<uint8_t> relay_id = createFromString(DUID6[0]);
     vector<uint8_t> remote_id = createFromString(DUID6[1]);
 
     // Fill the table.
-    EXPECT_NO_THROW(lease_mgr_->addRelayId6(lease_addr, link_addr, relay_id));
-    EXPECT_NO_THROW(lease_mgr_->addRemoteId6(lease_addr, link_addr, remote_id));
-    EXPECT_NO_THROW(lease_mgr_->addLinkAddr6(lease_addr, link_addr));
+    EXPECT_NO_THROW(lease_mgr_->addRelayId6(lease_addr, relay_id));
+    EXPECT_NO_THROW(lease_mgr_->addRemoteId6(lease_addr, remote_id));
 
     EXPECT_EQ(1, lease_mgr_->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr_->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr_->link_addr6_.size());
 
     // Delete the second lease: no side effect on tables.
     Lease6Ptr lease = leases6[1];
@@ -1070,7 +1067,6 @@ TEST_F(MemfileExtendedInfoTest, deleteLease6) {
     EXPECT_EQ(Lease::ACTION_IGNORE, lease->extended_info_action_);
     EXPECT_EQ(1, lease_mgr_->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr_->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr_->link_addr6_.size());
 
     // Delete the first lease: tables are cleared.
     lease = leases6[0];
@@ -1080,7 +1076,6 @@ TEST_F(MemfileExtendedInfoTest, deleteLease6) {
     EXPECT_TRUE(ret);
     EXPECT_TRUE(lease_mgr_->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr_->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr_->link_addr6_.empty());
 }
 
 /// @brief Verifies that v6 deleteLease does not touch extended info tables
@@ -1092,18 +1087,15 @@ TEST_F(MemfileExtendedInfoTest, deleteLease6disabled) {
 
     // Create parameter values.
     IOAddress lease_addr(ADDRESS6[0]);
-    IOAddress link_addr(ADDRESS6[1]);
     vector<uint8_t> relay_id = createFromString(DUID6[0]);
     vector<uint8_t> remote_id = createFromString(DUID6[1]);
 
     // Fill the table.
-    EXPECT_NO_THROW(lease_mgr_->addRelayId6(lease_addr, link_addr, relay_id));
-    EXPECT_NO_THROW(lease_mgr_->addRemoteId6(lease_addr, link_addr, remote_id));
-    EXPECT_NO_THROW(lease_mgr_->addLinkAddr6(lease_addr, link_addr));
+    EXPECT_NO_THROW(lease_mgr_->addRelayId6(lease_addr, relay_id));
+    EXPECT_NO_THROW(lease_mgr_->addRemoteId6(lease_addr, remote_id));
 
     EXPECT_EQ(1, lease_mgr_->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr_->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr_->link_addr6_.size());
 
     // Delete the first lease: tables are no longer cleared.
     Lease6Ptr lease = leases6[0];
@@ -1116,7 +1108,6 @@ TEST_F(MemfileExtendedInfoTest, deleteLease6disabled) {
     EXPECT_EQ(Lease::ACTION_IGNORE, lease->extended_info_action_);
     EXPECT_EQ(1, lease_mgr_->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr_->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr_->link_addr6_.size());
 }
 
 /// @brief Verifies that v6 addLease adds references to extended info tables.
@@ -1125,12 +1116,10 @@ TEST_F(MemfileExtendedInfoTest, addLease6) {
     EXPECT_TRUE(lease_mgr_->getExtendedInfoTablesEnabled());
     EXPECT_TRUE(lease_mgr_->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr_->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr_->link_addr6_.empty());
 
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1157,7 +1146,6 @@ TEST_F(MemfileExtendedInfoTest, addLease6) {
     Lease6ExtendedInfoPtr ex_info = *relay_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], ex_info->link_addr_.toText());
     const vector<uint8_t>& relay_id = ex_info->id_;
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
     EXPECT_EQ(exp_relay_id, relay_id);
@@ -1168,18 +1156,9 @@ TEST_F(MemfileExtendedInfoTest, addLease6) {
     ex_info = *remote_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], ex_info->link_addr_.toText());
     const vector<uint8_t>& remote_id = ex_info->id_;
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, remote_id);
-
-    ASSERT_EQ(1, lease_mgr_->link_addr6_.size());
-    auto link_addr_it = lease_mgr_->link_addr6_.cbegin();
-    ASSERT_NE(link_addr_it, lease_mgr_->link_addr6_.cend());
-    Lease6SimpleExtendedInfoPtr sex_info = *link_addr_it;
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ(ADDRESS6[1], sex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], sex_info->link_addr_.toText());
 }
 
 /// @brief Verifies that v6 addLease does not touch extended info tables
@@ -1191,7 +1170,6 @@ TEST_F(MemfileExtendedInfoTest, addLease6disabled) {
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1212,7 +1190,6 @@ TEST_F(MemfileExtendedInfoTest, addLease6disabled) {
     EXPECT_EQ(Lease::ACTION_IGNORE, lease->extended_info_action_);
     EXPECT_TRUE(lease_mgr_->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr_->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr_->link_addr6_.empty());
 }
 
 /// @brief Verifies that updateLease6 does not references to extended
@@ -1224,7 +1201,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6ignore) {
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1255,7 +1231,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6ignore) {
     // Tables were not touched.
     EXPECT_TRUE(lease_mgr_->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr_->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr_->link_addr6_.empty());
 
     // Note that with persist when the database is reloaded the user context
     // is still there so tables will be updated: the ACTION_IGNORE setting
@@ -1272,7 +1247,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6delete) {
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1293,7 +1267,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6delete) {
     EXPECT_TRUE(ret);
     EXPECT_EQ(1, lease_mgr_->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr_->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr_->link_addr6_.size());
 
     // Set action and call updateLease6.
     lease.reset(new Lease6(*lease));
@@ -1304,7 +1277,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6delete) {
     // Tables were cleared.
     EXPECT_TRUE(lease_mgr_->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr_->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr_->link_addr6_.empty());
 }
 
 /// @brief Verifies that updateLease6 does not clears references from extended
@@ -1316,7 +1288,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6deleteDisabled) {
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1337,7 +1308,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6deleteDisabled) {
     EXPECT_TRUE(ret);
     EXPECT_EQ(1, lease_mgr_->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr_->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr_->link_addr6_.size());
 
     // Disable on the fly extended info tables.
     // Note it is a priori an illegal operation so this could have to be
@@ -1353,7 +1323,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6deleteDisabled) {
     // Tables were not touched.
     EXPECT_EQ(1, lease_mgr_->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr_->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr_->link_addr6_.size());
 }
 
 /// @brief Verifies that updateLease6 adds references to extended
@@ -1365,7 +1334,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update) {
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1377,7 +1345,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update) {
     EXPECT_TRUE(ret);
     EXPECT_TRUE(lease_mgr_->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr_->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr_->link_addr6_.empty());
 
     // Set user context.
     lease.reset(new Lease6(*lease));
@@ -1403,7 +1370,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update) {
     Lease6ExtendedInfoPtr ex_info = *relay_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], ex_info->link_addr_.toText());
     const vector<uint8_t>& relay_id = ex_info->id_;
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
     EXPECT_EQ(exp_relay_id, relay_id);
@@ -1414,18 +1380,9 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update) {
     ex_info = *remote_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], ex_info->link_addr_.toText());
     const vector<uint8_t>& remote_id = ex_info->id_;
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, remote_id);
-
-    ASSERT_EQ(1, lease_mgr_->link_addr6_.size());
-    auto link_addr_it = lease_mgr_->link_addr6_.cbegin();
-    ASSERT_NE(link_addr_it, lease_mgr_->link_addr6_.cend());
-    Lease6SimpleExtendedInfoPtr sex_info = *link_addr_it;
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ(ADDRESS6[1], sex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], sex_info->link_addr_.toText());
 }
 
 /// @brief Verifies that updateLease6 does not add references to extended
@@ -1437,7 +1394,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6updateDisabled) {
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1468,7 +1424,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6updateDisabled) {
     // Tables were not touched.
     EXPECT_TRUE(lease_mgr_->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr_->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr_->link_addr6_.empty());
 }
 
 /// @brief Verifies that updateLease6 modifies references to extended
@@ -1481,7 +1436,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update2) {
     // Create parameter values.
     Lease6Ptr lease;
     IOAddress lease_addr(ADDRESS6[1]);
-    IOAddress link_addr(ADDRESS6[2]);
     vector<uint8_t> duid_data = createFromString(DUID6[0]);
     DuidPtr duid(new DUID(duid_data));
     ASSERT_NO_THROW(lease.reset(new Lease6(Lease::TYPE_NA, lease_addr, duid,
@@ -1509,7 +1463,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update2) {
     Lease6ExtendedInfoPtr ex_info = *relay_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], ex_info->link_addr_.toText());
     const vector<uint8_t>& relay_id = ex_info->id_;
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
     EXPECT_EQ(exp_relay_id, relay_id);
@@ -1520,21 +1473,11 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update2) {
     ex_info = *remote_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], ex_info->link_addr_.toText());
     const vector<uint8_t>& remote_id = ex_info->id_;
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, remote_id);
 
-    ASSERT_EQ(1, lease_mgr_->link_addr6_.size());
-    auto link_addr_it = lease_mgr_->link_addr6_.cbegin();
-    ASSERT_NE(link_addr_it, lease_mgr_->link_addr6_.cend());
-    Lease6SimpleExtendedInfoPtr sex_info = *link_addr_it;
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ(ADDRESS6[1], sex_info->lease_addr_.toText());
-    EXPECT_EQ(ADDRESS6[2], sex_info->link_addr_.toText());
-
     // Change the user context.
-    IOAddress link_addr2(ADDRESS6[4]);
     user_context_txt =
         "{ \"ISC\": { \"relay-info\": [ { \"hop\": 44,"
         " \"link\": \"2001:db8::4\",  \"peer\": \"2001:db8::5\","
@@ -1557,8 +1500,6 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update2) {
     ex_info = *relay_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_NE(ADDRESS6[2], ex_info->link_addr_.toText());
-    EXPECT_EQ(ADDRESS6[4], ex_info->link_addr_.toText());
     const vector<uint8_t>& relay_id2 = ex_info->id_;
     const vector<uint8_t>& exp_relay_id2 = vector<uint8_t>(8, 0x65);
     EXPECT_NE(exp_relay_id, relay_id2);
@@ -1570,21 +1511,10 @@ TEST_F(MemfileExtendedInfoTest, updateLease6update2) {
     ex_info = *remote_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ(ADDRESS6[1], ex_info->lease_addr_.toText());
-    EXPECT_NE(ADDRESS6[2], ex_info->link_addr_.toText());
-    EXPECT_EQ(ADDRESS6[4], ex_info->link_addr_.toText());
     const vector<uint8_t>& remote_id2 = ex_info->id_;
     const vector<uint8_t>& exp_remote_id2 = { 1, 2, 3, 4, 5, 7 };
     EXPECT_NE(exp_remote_id, remote_id2);
     EXPECT_EQ(exp_remote_id2, remote_id2);
-
-    ASSERT_EQ(1, lease_mgr_->link_addr6_.size());
-    link_addr_it = lease_mgr_->link_addr6_.cbegin();
-    ASSERT_NE(link_addr_it, lease_mgr_->link_addr6_.cend());
-    sex_info = *link_addr_it;
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ(ADDRESS6[1], sex_info->lease_addr_.toText());
-    EXPECT_NE(ADDRESS6[2], sex_info->link_addr_.toText());
-    EXPECT_EQ(ADDRESS6[4], sex_info->link_addr_.toText());
 }
 
 }  // namespace

diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index 6335ac9c9bdb4a5eef16a435eb403728c56787d9..1da0b9620ae968d737fd15b16244a719c512aef4 100644 (file)
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -100,7 +100,6 @@ public:
     using Memfile_LeaseMgr::setExtendedInfoTablesEnabled;
     using Memfile_LeaseMgr::relay_id6_;
     using Memfile_LeaseMgr::remote_id6_;
-    using Memfile_LeaseMgr::link_addr6_;
 };
 
 /// @brief Test fixture class for @c Memfile_LeaseMgr
@@ -3602,7 +3601,6 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6) {
     Lease6ExtendedInfoPtr ex_info = *relay_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ("2001:db8:1::2", ex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", ex_info->link_addr_.toText());
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
     EXPECT_EQ(exp_relay_id, ex_info->id_);
 
@@ -3612,17 +3610,8 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6) {
     ex_info = *remote_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ("2001:db8:1::2", ex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", ex_info->link_addr_.toText());
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, ex_info->id_);
-
-    ASSERT_EQ(1, lease_mgr->link_addr6_.size());
-    auto link_addr_it = lease_mgr->link_addr6_.cbegin();
-    ASSERT_NE(link_addr_it, lease_mgr->link_addr6_.cend());
-    Lease6SimpleExtendedInfoPtr sex_info = *link_addr_it;
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ("2001:db8:1::2", sex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", sex_info->link_addr_.toText());
 }
 
 /// @brief Checks that buildExtendedInfoTables6 does not update
@@ -3685,7 +3674,6 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6noSanitize) {
     // Check that extended info tables were not updated.
     EXPECT_TRUE(lease_mgr->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr->link_addr6_.empty());
 }
 
 /// @brief Checks that buildExtendedInfoTables6 adds extended info to tables
@@ -3744,7 +3732,6 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6enabled) {
     Lease6ExtendedInfoPtr ex_info = *relay_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ("2001:db8:1::2", ex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", ex_info->link_addr_.toText());
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
     EXPECT_EQ(exp_relay_id, ex_info->id_);
 
@@ -3754,17 +3741,8 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6enabled) {
     ex_info = *remote_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ("2001:db8:1::2", ex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", ex_info->link_addr_.toText());
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, ex_info->id_);
-
-    ASSERT_EQ(1, lease_mgr->link_addr6_.size());
-    auto link_addr_it = lease_mgr->link_addr6_.cbegin();
-    ASSERT_NE(link_addr_it, lease_mgr->link_addr6_.cend());
-    Lease6SimpleExtendedInfoPtr sex_info = *link_addr_it;
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ("2001:db8:1::2", sex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", sex_info->link_addr_.toText());
 }
 
 /// @brief Checks that buildExtendedInfoTables6 does not add extended info
@@ -3811,7 +3789,6 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6disabled) {
     // Check that extended info tables were not updated.
     EXPECT_TRUE(lease_mgr->relay_id6_.empty());
     EXPECT_TRUE(lease_mgr->remote_id6_.empty());
-    EXPECT_TRUE(lease_mgr->link_addr6_.empty());
 }
 
 /// @brief Checks that buildExtendedInfoTables6 updates when explicitly
@@ -3953,27 +3930,21 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6rebuild) {
     // Check that extended info tables were updated.
     EXPECT_EQ(1, lease_mgr->relay_id6_.size());
     EXPECT_EQ(1, lease_mgr->remote_id6_.size());
-    EXPECT_EQ(1, lease_mgr->link_addr6_.size());
 
     // Add a junk entry in each table.
     IOAddress lease_addr("2001:db8:1::10");
-    IOAddress link_addr("2001:db8::11");
     const vector<uint8_t>& relay_id = vector<uint8_t>(10, 0x65);
     Lease6ExtendedInfoPtr relay;
-    relay.reset(new Lease6ExtendedInfo(lease_addr, link_addr, relay_id));
+    relay.reset(new Lease6ExtendedInfo(lease_addr, relay_id));
     lease_mgr->relay_id6_.insert(relay);
     const vector<uint8_t>& remote_id = { 10, 11, 12, 13, 14, 15, 16 };
     Lease6ExtendedInfoPtr remote;
-    remote.reset(new Lease6ExtendedInfo(lease_addr, link_addr, remote_id));
+    remote.reset(new Lease6ExtendedInfo(lease_addr, remote_id));
     lease_mgr->remote_id6_.insert(remote);
-    Lease6SimpleExtendedInfoPtr link;
-    link.reset(new Lease6SimpleExtendedInfo(lease_addr, link_addr));
-    lease_mgr->link_addr6_.insert(link);
 
     // Check that tables grown.
     EXPECT_EQ(2, lease_mgr->relay_id6_.size());
     EXPECT_EQ(2, lease_mgr->remote_id6_.size());
-    EXPECT_EQ(2, lease_mgr->link_addr6_.size());
 
     // Rebuild the tables.
     size_t updated = 0;
@@ -3987,7 +3958,6 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6rebuild) {
     Lease6ExtendedInfoPtr ex_info = *relay_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ("2001:db8:1::2", ex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", ex_info->link_addr_.toText());
     const vector<uint8_t>& exp_relay_id = vector<uint8_t>(8, 0x64);
     EXPECT_EQ(exp_relay_id, ex_info->id_);
 
@@ -3997,17 +3967,8 @@ TEST_F(MemfileLeaseMgrTest, buildExtendedInfoTables6rebuild) {
     ex_info = *remote_id_it;
     ASSERT_TRUE(ex_info);
     EXPECT_EQ("2001:db8:1::2", ex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", ex_info->link_addr_.toText());
     const vector<uint8_t>& exp_remote_id = { 1, 2, 3, 4, 5, 6 };
     EXPECT_EQ(exp_remote_id, ex_info->id_);
-
-    ASSERT_EQ(1, lease_mgr->link_addr6_.size());
-    auto link_addr_it = lease_mgr->link_addr6_.cbegin();
-    ASSERT_NE(link_addr_it, lease_mgr->link_addr6_.cend());
-    Lease6SimpleExtendedInfoPtr sex_info = *link_addr_it;
-    ASSERT_TRUE(sex_info);
-    EXPECT_EQ("2001:db8:1::2", sex_info->lease_addr_.toText());
-    EXPECT_EQ("2001:db8::4", sex_info->link_addr_.toText());
 }
 
 }  // namespace