lsa: define AdjLsa operator==
Delete noLink field that is not used anywhere.
refs #4094
Change-Id: I646eb2dc828935c1f75ec2c036ba4fd60e907706
diff --git a/tests/route/test-hyperbolic-calculator.cpp b/tests/route/test-hyperbolic-calculator.cpp
index 0d4dd5e..bbb7930 100644
--- a/tests/route/test-hyperbolic-calculator.cpp
+++ b/tests/route/test-hyperbolic-calculator.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2023, The University of Memphis,
+ * Copyright (c) 2014-2024, The University of Memphis,
* Regents of the University of California,
* Arizona Board of Regents.
*
@@ -69,7 +69,7 @@
adjacencies.insert(b);
adjacencies.insert(c);
- AdjLsa adjA(a.getName(), 1, MAX_TIME, 2, adjacencies);
+ AdjLsa adjA(a.getName(), 1, MAX_TIME, adjacencies);
lsdb.installLsa(std::make_shared<AdjLsa>(adjA));
CoordinateLsa coordA(adjA.getOriginRouter(), 1, MAX_TIME, 16.23, anglesA);
@@ -83,7 +83,7 @@
adjacencyListB.insert(a);
adjacencyListB.insert(c);
- AdjLsa adjB(b.getName(), 1, MAX_TIME, 2, adjacencyListB);
+ AdjLsa adjB(b.getName(), 1, MAX_TIME, adjacencyListB);
lsdb.installLsa(std::make_shared<AdjLsa>(adjB));
CoordinateLsa coordB(adjB.getOriginRouter(), 1, MAX_TIME, 16.59, anglesB);
@@ -97,7 +97,7 @@
adjacencyListC.insert(a);
adjacencyListC.insert(b);
- AdjLsa adjC(c.getName(), 1, MAX_TIME, 2, adjacencyListC);
+ AdjLsa adjC(c.getName(), 1, MAX_TIME, adjacencyListC);
lsdb.installLsa(std::make_shared<AdjLsa>(adjC));
CoordinateLsa coordC(adjC.getOriginRouter(), 1, MAX_TIME, 14.11, anglesC);
diff --git a/tests/route/test-link-state-calculator.cpp b/tests/route/test-link-state-calculator.cpp
index 73421b0..366aa7e 100644
--- a/tests/route/test-link-state-calculator.cpp
+++ b/tests/route/test-link-state-calculator.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2023, The University of Memphis,
+ * Copyright (c) 2014-2024, The University of Memphis,
* Regents of the University of California,
* Arizona Board of Regents.
*
@@ -74,7 +74,7 @@
adjacencyListA.insert(b);
adjacencyListA.insert(c);
- AdjLsa adjA(a.getName(), 1, MAX_TIME, 2, adjacencyListA);
+ AdjLsa adjA(a.getName(), 1, MAX_TIME, adjacencyListA);
lsdb.installLsa(std::make_shared<AdjLsa>(adjA));
// Router B
@@ -85,7 +85,7 @@
adjacencyListB.insert(a);
adjacencyListB.insert(c);
- AdjLsa adjB(b.getName(), 1, MAX_TIME, 2, adjacencyListB);
+ AdjLsa adjB(b.getName(), 1, MAX_TIME, adjacencyListB);
lsdb.installLsa(std::make_shared<AdjLsa>(adjB));
// Router C
@@ -96,7 +96,7 @@
adjacencyListC.insert(a);
adjacencyListC.insert(b);
- AdjLsa adjC(c.getName(), 1, MAX_TIME, 2, adjacencyListC);
+ AdjLsa adjC(c.getName(), 1, MAX_TIME, adjacencyListC);
lsdb.installLsa(std::make_shared<AdjLsa>(adjC));
auto lsaRange = lsdb.getLsdbIterator<AdjLsa>();
diff --git a/tests/route/test-name-prefix-table.cpp b/tests/route/test-name-prefix-table.cpp
index 6181296..adeaa6d 100644
--- a/tests/route/test-name-prefix-table.cpp
+++ b/tests/route/test-name-prefix-table.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2023, The University of Memphis,
+ * Copyright (c) 2014-2024, The University of Memphis,
* Regents of the University of California,
* Arizona Board of Regents.
*
@@ -78,7 +78,6 @@
conf.getAdjacencyList().insert(bupt);
AdjLsa thisRouterAdjLsa(thisRouter.getName(), 1,
ndn::time::system_clock::now() + 3600_s,
- 2,
conf.getAdjacencyList());
lsdb.installLsa(std::make_shared<AdjLsa>(thisRouterAdjLsa));
@@ -88,7 +87,7 @@
buptAdjacencies.insert(thisRouter);
AdjLsa buptAdjLsa(buptRouterName, 1,
ndn::time::system_clock::now() + ndn::time::seconds(5),
- 0 , buptAdjacencies);
+ buptAdjacencies);
lsdb.installLsa(std::make_shared<AdjLsa>(buptAdjLsa));
@@ -121,7 +120,7 @@
// Install new adjacency LSA
AdjLsa buptNewAdjLsa(buptRouterName, 12,
ndn::time::system_clock::now() + ndn::time::seconds(3600),
- 0, buptAdjacencies);
+ buptAdjacencies);
lsdb.installLsa(std::make_shared<AdjLsa>(buptNewAdjLsa));
this->advanceClocks(ndn::time::seconds(1));
@@ -350,7 +349,7 @@
// Adj and Coordinate LSAs router
ndn::Name router2("/router2/2");
- AdjLsa adjLsa(router2, 12, testTimePoint, 2, conf.getAdjacencyList());
+ AdjLsa adjLsa(router2, 12, testTimePoint, conf.getAdjacencyList());
lsaPtr = std::make_shared<AdjLsa>(adjLsa);
BOOST_CHECK(npt.begin() == npt.end());
npt.updateFromLsdb(lsaPtr, LsdbUpdate::INSTALLED, {}, {});
diff --git a/tests/route/test-routing-table.cpp b/tests/route/test-routing-table.cpp
index a6ce36d..de91bea 100644
--- a/tests/route/test-routing-table.cpp
+++ b/tests/route/test-routing-table.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2023, The University of Memphis,
+ * Copyright (c) 2014-2024, The University of Memphis,
* Regents of the University of California
*
* This file is part of NLSR (Named-data Link State Routing).
@@ -124,7 +124,7 @@
{
auto testTimePoint = ndn::time::system_clock::now() + 3600_s;
ndn::Name router2("/router2");
- AdjLsa adjLsa(router2, 12, testTimePoint, 2, conf.getAdjacencyList());
+ AdjLsa adjLsa(router2, 12, testTimePoint, conf.getAdjacencyList());
std::shared_ptr<Lsa> lsaPtr = std::make_shared<AdjLsa>(adjLsa);
BOOST_CHECK(!rt.m_isRouteCalculationScheduled);
lsdb.installLsa(lsaPtr);
@@ -147,7 +147,7 @@
Adjacent ownAdj(conf.getRouterPrefix());
ownAdj.setStatus(Adjacent::STATUS_ACTIVE);
adjl.insert(ownAdj);
- AdjLsa adjLsa4("/router4", 12, testTimePoint, 2, adjl);
+ AdjLsa adjLsa4("/router4", 12, testTimePoint, adjl);
lsaPtr = std::make_shared<AdjLsa>(adjLsa4);
lsdb.installLsa(lsaPtr);