commit 26667e16df962c7f827870070a0e13c5b8db25a6
author Junxiao Shi <git@mail1.yoursunny.com> Thu Feb 08 20:01:18 2018 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Feb 08 20:01:18 2018 +0000
tree 5e203b9bcaf0aea8dd76efa865e247b61c956e58
parent d5e89e8c7d271e9ce9d7568f1703babec1106040

mgmt: include capacity and enablement flags in cs/info dataset

refs #4050

Change-Id: I3de0692ec9f26429733bade80a96e154865928fe

daemon/mgmt/cs-manager.cpp

diff --git a/daemon/mgmt/cs-manager.cpp b/daemon/mgmt/cs-manager.cpp
index 5c6c450..20ee279 100644
--- a/daemon/mgmt/cs-manager.cpp
+++ b/daemon/mgmt/cs-manager.cpp
@@ -70,6 +70,10 @@
                      ndn::mgmt::StatusDatasetContext& context) const
 {
   ndn::nfd::CsInfo info;
+  info.setCapacity(m_cs.getLimit());
+  info.setEnableAdmit(m_cs.shouldAdmit());
+  info.setEnableServe(m_cs.shouldServe());
+  info.setNEntries(m_cs.size());
   info.setNHits(m_fwCnt.nCsHits);
   info.setNMisses(m_fwCnt.nCsMisses);
 

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

diff --git a/tests/daemon/mgmt/cs-manager.t.cpp b/tests/daemon/mgmt/cs-manager.t.cpp
index 3edc439..c5d22f4 100644
--- a/tests/daemon/mgmt/cs-manager.t.cpp
+++ b/tests/daemon/mgmt/cs-manager.t.cpp
@@ -98,6 +98,12 @@
 
 BOOST_AUTO_TEST_CASE(Info)
 {
+  m_cs.setLimit(2681);
+  for (int i = 0; i < 310; ++i) {
+    m_cs.insert(*makeData(Name("/Q8H4oi4g").appendSequenceNumber(i)));
+  }
+  m_cs.enableAdmit(false);
+  m_cs.enableServe(true);
   m_fwCnt.nCsHits.set(362);
   m_fwCnt.nCsMisses.set(1493);
 
@@ -107,6 +113,10 @@
   BOOST_REQUIRE_EQUAL(dataset.elements_size(), 1);
 
   ndn::nfd::CsInfo info(*dataset.elements_begin());
+  BOOST_CHECK_EQUAL(info.getCapacity(), 2681);
+  BOOST_CHECK_EQUAL(info.getEnableAdmit(), false);
+  BOOST_CHECK_EQUAL(info.getEnableServe(), true);
+  BOOST_CHECK_EQUAL(info.getNEntries(), 310);
   BOOST_CHECK_EQUAL(info.getNHits(), 362);
   BOOST_CHECK_EQUAL(info.getNMisses(), 1493);
 }