fib: add EndpointId field in NextHop record
refs: #4284
Change-Id: If0cfc21cfa81d6fa3c1590ecdce8fbbc1ea95e13
diff --git a/tests/daemon/fw/ncc-strategy.t.cpp b/tests/daemon/fw/ncc-strategy.t.cpp
index 2e9ee18..38a2401 100644
--- a/tests/daemon/fw/ncc-strategy.t.cpp
+++ b/tests/daemon/fw/ncc-strategy.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -63,8 +63,8 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addNextHop(*face1, 10);
- fibEntry.addNextHop(*face2, 20);
+ fibEntry.addOrUpdateNextHop(*face1, 0, 10);
+ fibEntry.addOrUpdateNextHop(*face2, 0, 20);
Pit& pit = forwarder.getPit();
@@ -122,7 +122,7 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addNextHop(*face1, 10);
+ fibEntry.addOrUpdateNextHop(*face1, 0, 10);
Pit& pit = forwarder.getPit();
@@ -153,7 +153,7 @@
strategy.afterReceiveInterest(*face3, *interest2, pitEntry2);
// FIB entry is changed before doPropagate executes
- fibEntry.addNextHop(*face2, 20);
+ fibEntry.addOrUpdateNextHop(*face2, 0, 20);
this->advanceClocks(time::milliseconds(10), time::milliseconds(1000));// should not crash
}
@@ -173,8 +173,8 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addNextHop(*face1, 10);
- fibEntry.addNextHop(*face2, 20);
+ fibEntry.addOrUpdateNextHop(*face1, 0, 10);
+ fibEntry.addOrUpdateNextHop(*face2, 0, 20);
Pit& pit = forwarder.getPit();
@@ -228,7 +228,7 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addNextHop(*face2, 10);
+ fibEntry.addOrUpdateNextHop(*face2, 0, 10);
Pit& pit = forwarder.getPit();
@@ -273,8 +273,8 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addNextHop(*face1, 10); // face1 is top-ranked nexthop
- fibEntry.addNextHop(*face2, 20);
+ fibEntry.addOrUpdateNextHop(*face1, 0, 10); // face1 is top-ranked nexthop
+ fibEntry.addOrUpdateNextHop(*face2, 0, 20);
Pit& pit = forwarder.getPit();
@@ -376,7 +376,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 http://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(time::milliseconds(5));