rib: Add RIB dataset publisher
refs: #1662
Change-Id: I97885c07af131a7ea78d074b39df884178f09416
diff --git a/tests/rib/rib-manager.cpp b/tests/rib/rib-manager.cpp
index 92188b1..797f01e 100644
--- a/tests/rib/rib-manager.cpp
+++ b/tests/rib/rib-manager.cpp
@@ -27,6 +27,7 @@
#include "tests/test-common.hpp"
#include "tests/dummy-face.hpp"
+#include "rib/rib-status-publisher-common.hpp"
namespace nfd {
namespace rib {
@@ -111,7 +112,7 @@
typedef RibManagerFixture UnauthorizedRibManager;
-BOOST_FIXTURE_TEST_SUITE(RibRibManager, RibManagerFixture)
+BOOST_FIXTURE_TEST_SUITE(RibManager, RibManagerFixture)
BOOST_FIXTURE_TEST_CASE(Basic, AuthorizedRibManager)
{
@@ -219,6 +220,39 @@
BOOST_REQUIRE_EQUAL(face->m_sentInterests.size(), 0);
}
+BOOST_FIXTURE_TEST_CASE(RibStatusRequest, AuthorizedRibManager)
+{
+ FaceEntry entry;
+ Name name("/");
+ entry.faceId = 1;
+ entry.origin = 128;
+ entry.cost = 32;
+ entry.flags = ndn::nfd::ROUTE_FLAG_CAPTURE;
+
+ ControlParameters parameters;
+ parameters
+ .setName(name)
+ .setFaceId(entry.faceId)
+ .setOrigin(entry.origin)
+ .setCost(entry.cost)
+ .setFlags(entry.flags)
+ .setExpirationPeriod(ndn::time::milliseconds::max());
+
+ Name commandName("/localhost/nfd/rib/register");
+
+ BOOST_REQUIRE_EQUAL(face->m_sentInterests.size(), 0);
+
+ receiveCommandInterest(commandName, parameters);
+ face->m_sentInterests.clear();
+ face->m_sentDatas.clear();
+
+ face->receive(Interest("/localhost/nfd/rib/list"));
+ face->processEvents(time::milliseconds(1));
+
+ BOOST_REQUIRE_EQUAL(face->m_sentDatas.size(), 1);
+ RibStatusPublisherFixture::decodeRibEntryBlock(face->m_sentDatas[0], name, entry);
+}
+
BOOST_AUTO_TEST_SUITE_END()
} // namespace tests
diff --git a/tests/rib/rib-status-publisher-common.hpp b/tests/rib/rib-status-publisher-common.hpp
new file mode 100644
index 0000000..11728a0
--- /dev/null
+++ b/tests/rib/rib-status-publisher-common.hpp
@@ -0,0 +1,93 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RIB_TESTS_UNIT_TESTS_RIB_STATUS_PUBLISHER_COMMON_HPP
+#define RIB_TESTS_UNIT_TESTS_RIB_STATUS_PUBLISHER_COMMON_HPP
+
+#include "rib/rib-status-publisher.hpp"
+
+#include "tests/test-common.hpp"
+#include "rib/rib.hpp"
+
+#include <ndn-cxx/management/nfd-control-parameters.hpp>
+#include <ndn-cxx/management/nfd-rib-entry.hpp>
+#include <ndn-cxx/encoding/tlv.hpp>
+
+namespace nfd {
+namespace rib {
+namespace tests {
+
+using ndn::nfd::ControlParameters;
+
+class RibStatusPublisherFixture : public nfd::tests::BaseFixture
+{
+public:
+ static void
+ validateRibEntry(const Block& block, const Name& referenceName, const FaceEntry& referenceFace)
+ {
+ ndn::nfd::RibEntry entry;
+ BOOST_REQUIRE_NO_THROW(entry.wireDecode(block));
+
+ BOOST_CHECK_EQUAL(entry.getName(), referenceName);
+
+ std::list<ndn::nfd::Route> routes = entry.getRoutes();
+
+ std::list<ndn::nfd::Route>::iterator it = routes.begin();
+ BOOST_CHECK_EQUAL(it->getFaceId(), referenceFace.faceId);
+ BOOST_CHECK_EQUAL(it->getOrigin(), referenceFace.origin);
+ BOOST_CHECK_EQUAL(it->getCost(), referenceFace.cost);
+ BOOST_CHECK_EQUAL(it->getFlags(), referenceFace.flags);
+ }
+
+ static void
+ decodeRibEntryBlock(const Data& data, const Name& referenceName, const FaceEntry& referenceFace)
+ {
+ ndn::EncodingBuffer buffer;
+
+ Block payload = data.getContent();
+
+ buffer.appendByteArray(payload.value(), payload.value_size());
+ buffer.prependVarNumber(buffer.size());
+ buffer.prependVarNumber(ndn::Tlv::Content);
+
+ ndn::Block parser(buffer.buf(), buffer.size());
+ parser.parse();
+
+ Block::element_const_iterator i = parser.elements_begin();
+
+ if (i->type() != ndn::tlv::nfd::RibEntry) {
+ BOOST_FAIL("expected RibEntry, got type #" << i->type());
+ }
+ else {
+ validateRibEntry(*i, referenceName, referenceFace);
+ }
+ }
+};
+
+#endif // RIB_TESTS_UNIT_TESTS_RIB_STATUS_PUBLISHER_COMMON_HPP
+
+} // namespace tests
+} // namespace rib
+} // namespace nfd
diff --git a/tests/rib/rib-status-publisher.cpp b/tests/rib/rib-status-publisher.cpp
new file mode 100644
index 0000000..ac68c63
--- /dev/null
+++ b/tests/rib/rib-status-publisher.cpp
@@ -0,0 +1,65 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rib/rib-status-publisher.hpp"
+
+#include "rib-status-publisher-common.hpp"
+#include "tests/dummy-face.hpp"
+
+namespace nfd {
+namespace rib {
+namespace tests {
+
+BOOST_FIXTURE_TEST_SUITE(RibStatusPublisherSuite, RibStatusPublisherFixture)
+
+BOOST_AUTO_TEST_CASE(Basic)
+{
+ Rib rib;
+
+ FaceEntry entry;
+ Name name("/");
+ entry.faceId = 1;
+ entry.origin = 128;
+ entry.cost = 32;
+ entry.flags = ndn::nfd::ROUTE_FLAG_CAPTURE;
+ rib.insert(name, entry);
+
+ ndn::KeyChain keyChain;
+ shared_ptr<nfd::tests::DummyFace> face = nfd::tests::makeDummyFace();
+ RibStatusPublisher publisher(rib, *face, "/localhost/nfd/rib/list", keyChain);
+
+ publisher.publish();
+ face->processEvents(time::milliseconds(1));
+
+ BOOST_REQUIRE_EQUAL(face->m_sentDatas.size(), 1);
+ decodeRibEntryBlock(face->m_sentDatas[0], name, entry);
+}
+
+
+BOOST_AUTO_TEST_SUITE_END()
+
+} // namespace tests
+} // namespace rib
+} // namespace nfd