commit 9aafc2a086c77d892a8aa4199edc33f4b127b0b6
author Ju Pan <jupan1994@gmail.com> Mon Aug 05 22:55:50 2019 +0000
committer Davide Pesavento <davidepesa@gmail.com> Mon Aug 12 08:46:08 2019 -0700
tree d7db68945e3e490a8e9dfae02d46f0f435bcbf47
parent 57113d136932f52efbe99e8590396c9183d46933

Revert "mgmt: add EndpointId for fib dataset"

This reverts commit 602c3aaa560e523e2eb401ac6af0c304fd3b1092.

Refs: #4973
Change-Id: I02553dc7385d430cf719db3b0f576dc48f6ec059

daemon/mgmt/fib-manager.cpp

diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index 531d339..1f0d173 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -125,7 +125,6 @@
                            boost::adaptors::transformed([] (const fib::NextHop& nh) {
                              return ndn::nfd::NextHopRecord()
                                  .setFaceId(nh.getFace().getId())
-                                 .setEndpointId(nh.getEndpointId())
                                  .setCost(nh.getCost());
                            });
     context.append(ndn::nfd::FibEntry()

tests/daemon/mgmt/fib-manager.t.cpp

diff --git a/tests/daemon/mgmt/fib-manager.t.cpp b/tests/daemon/mgmt/fib-manager.t.cpp
index 7d161ec..0918aaf 100644
--- a/tests/daemon/mgmt/fib-manager.t.cpp
+++ b/tests/daemon/mgmt/fib-manager.t.cpp
@@ -411,7 +411,7 @@
     actualPrefixes.insert(prefix);
     fib::Entry* fibEntry = m_fib.insert(prefix).first;
     fibEntry->addOrUpdateNextHop(*m_faceTable.get(addFace()), 0, std::numeric_limits<uint8_t>::max() - 1);
-    fibEntry->addOrUpdateNextHop(*m_faceTable.get(addFace()), 7, std::numeric_limits<uint8_t>::max() - 2);
+    fibEntry->addOrUpdateNextHop(*m_faceTable.get(addFace()), 0, std::numeric_limits<uint8_t>::max() - 2);
   }
 
   receiveInterest(Interest("/localhost/nfd/fib/list").setCanBePrefix(true));
@@ -434,7 +434,6 @@
     for (const auto& nh : matchedEntry->getNextHops()) {
       expectedRecords.back().addNextHopRecord(ndn::nfd::NextHopRecord()
                                               .setFaceId(nh.getFace().getId())
-                                              .setEndpointId(nh.getEndpointId())
                                               .setCost(nh.getCost()));
     }
   }