commit 6be9387a4fa0086e9c79c3be3155db038031ddce
author Md Ashiqur Rahman <marahman@email.arizona.edu> Wed Aug 07 01:25:31 2019 +0000
committer Davide Pesavento <davidepesa@gmail.com> Mon Aug 12 12:00:30 2019 -0700
tree d2801c30e8cf188dd019d454725c3f60d41f3296
parent 9aafc2a086c77d892a8aa4199edc33f4b127b0b6

Revert "fib: add EndpointId field in NextHop record"

This reverts commit 3ad49db6eaef0d3f4a0a9bdd3356c6bb9845db57.

refs: #4973

Change-Id: I3216a55a8c4ed52cd9181f790f8ab72e44330a38

tests/daemon/fw/ncc-strategy.t.cpp

diff --git a/tests/daemon/fw/ncc-strategy.t.cpp b/tests/daemon/fw/ncc-strategy.t.cpp
index d7172e3..c9a604b 100644
--- a/tests/daemon/fw/ncc-strategy.t.cpp
+++ b/tests/daemon/fw/ncc-strategy.t.cpp
@@ -59,8 +59,8 @@
 
   Fib& fib = forwarder.getFib();
   fib::Entry& fibEntry = *fib.insert(Name()).first;
-  fibEntry.addOrUpdateNextHop(*face1, 0, 10);
-  fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+  fibEntry.addOrUpdateNextHop(*face1, 10);
+  fibEntry.addOrUpdateNextHop(*face2, 20);
 
   Pit& pit = forwarder.getPit();
 
@@ -118,7 +118,7 @@
 
   Fib& fib = forwarder.getFib();
   fib::Entry& fibEntry = *fib.insert(Name()).first;
-  fibEntry.addOrUpdateNextHop(*face1, 0, 10);
+  fibEntry.addOrUpdateNextHop(*face1, 10);
 
   Pit& pit = forwarder.getPit();
 
@@ -149,7 +149,7 @@
   strategy.afterReceiveInterest(FaceEndpoint(*face3, 0), *interest2, pitEntry2);
 
   // FIB entry is changed before doPropagate executes
-  fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+  fibEntry.addOrUpdateNextHop(*face2, 20);
   this->advanceClocks(10_ms, 1_s);// should not crash
 }
 
@@ -169,8 +169,8 @@
 
   Fib& fib = forwarder.getFib();
   fib::Entry& fibEntry = *fib.insert(Name()).first;
-  fibEntry.addOrUpdateNextHop(*face1, 0, 10);
-  fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+  fibEntry.addOrUpdateNextHop(*face1, 10);
+  fibEntry.addOrUpdateNextHop(*face2, 20);
 
   Pit& pit = forwarder.getPit();
 
@@ -222,7 +222,7 @@
 
   Fib& fib = forwarder.getFib();
   fib::Entry& fibEntry = *fib.insert(Name()).first;
-  fibEntry.addOrUpdateNextHop(*face2, 0, 10);
+  fibEntry.addOrUpdateNextHop(*face2, 10);
 
   Pit& pit = forwarder.getPit();
 
@@ -265,8 +265,8 @@
 
   Fib& fib = forwarder.getFib();
   fib::Entry& fibEntry = *fib.insert(Name()).first;
-  fibEntry.addOrUpdateNextHop(*face1, 0, 10); // face1 is top-ranked nexthop
-  fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+  fibEntry.addOrUpdateNextHop(*face1, 10); // face1 is top-ranked nexthop
+  fibEntry.addOrUpdateNextHop(*face2, 20);
 
   Pit& pit = forwarder.getPit();
 
@@ -368,7 +368,7 @@
   // NccStrategy has selected one path as the best.
   // When we reduce the RTT of the other path, ideally it should be selected as the best face.
   // However, this won't happen due to a weakness in NccStrategy.
-  // See https://redmine.named-data.net/issues/3411#note-4
+  // See  https://redmine.named-data.net/issues/3411#note-4
   shared_ptr<Face> bestFace1 = getMeInfo()->bestFace.lock();
   if (bestFace1.get() == &linkAB->getFace(nodeA)) {
     linkCD->setDelay(5_ms);