lsdb: rebuild using boost::multi_index to replace 3 LSA lists
refs: #4127
Co-authored-by: Nick Gordon <nmgordon@memphis.edu>
Change-Id: Ic179f90019e472157b0d61c6db02a4afaf4843b6
diff --git a/tests/publisher/test-dataset-interest-handler.cpp b/tests/publisher/test-dataset-interest-handler.cpp
index 2ec5d35..56696f8 100644
--- a/tests/publisher/test-dataset-interest-handler.cpp
+++ b/tests/publisher/test-dataset-interest-handler.cpp
@@ -56,21 +56,16 @@
// Install adjacency LSA
AdjLsa adjLsa;
+ adjLsa.m_expirationTimePoint = ndn::time::system_clock::now() + 3600_s;
adjLsa.m_originRouter = "/RouterA";
addAdjacency(adjLsa, "/RouterA/adjacency1", "udp://face-1", 10);
- lsdb.installAdjLsa(adjLsa);
+ lsdb.installLsa(std::make_shared<AdjLsa>(adjLsa));
std::vector<double> angles = {20.00, 30.00};
// Install coordinate LSA
CoordinateLsa coordinateLsa = createCoordinateLsa("/RouterA", 10.0, angles);
- lsdb.installCoordinateLsa(coordinateLsa);
-
- // Install Name LSA
- NameLsa nameLsa;
- nameLsa.m_originRouter = "/RouterA";
- nameLsa.addName("/RouterA/name1");
- lsdb.installNameLsa(nameLsa);
+ lsdb.installLsa(std::make_shared<CoordinateLsa>(coordinateLsa));
// Install routing table
RoutingTableEntry rte1("desrouter1");
@@ -115,13 +110,13 @@
AdjLsa adjLsa;
adjLsa.m_originRouter = "/RouterA";
addAdjacency(adjLsa, "/RouterA/adjacency1", "udp://face-1", 10);
- lsdb.installAdjLsa(adjLsa);
+ lsdb.installLsa(std::make_shared<AdjLsa>(adjLsa));
std::vector<double> angles = {20.00, 30.00};
// Install coordinate LSA
CoordinateLsa coordinateLsa = createCoordinateLsa("/RouterA", 10.0, angles);
- lsdb.installCoordinateLsa(coordinateLsa);
+ lsdb.installLsa(std::make_shared<CoordinateLsa>(coordinateLsa));
// Install routing table
RoutingTableEntry rte1("desrouter1");