tools: refactor ndn-autoconfig
Hub face creation and prefix registrations are moved into a new
Procedure class. Main function is simplified.
refs #4158
Change-Id: I15b660e3b8a1bde89498a1cb549a87788de46c7a
diff --git a/tests/tools/nfdc/mock-nfd-mgmt-fixture.hpp b/tests/tools/nfdc/mock-nfd-mgmt-fixture.hpp
index fd309bf..9841de8 100644
--- a/tests/tools/nfdc/mock-nfd-mgmt-fixture.hpp
+++ b/tests/tools/nfdc/mock-nfd-mgmt-fixture.hpp
@@ -1,5 +1,5 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
* Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
@@ -26,11 +26,7 @@
#ifndef NFD_TESTS_TOOLS_NFDC_MOCK_NFD_MGMT_FIXTURE_HPP
#define NFD_TESTS_TOOLS_NFDC_MOCK_NFD_MGMT_FIXTURE_HPP
-#include <ndn-cxx/mgmt/nfd/face-query-filter.hpp>
-#include <ndn-cxx/util/dummy-client-face.hpp>
-
-#include "tests/test-common.hpp"
-#include "tests/identity-management-fixture.hpp"
+#include "../mock-nfd-mgmt-fixture.hpp"
namespace nfd {
namespace tools {
@@ -38,111 +34,12 @@
namespace tests {
using namespace nfd::tests;
-using ndn::nfd::ControlParameters;
/** \brief fixture to emulate NFD management
*/
-class MockNfdMgmtFixture : public IdentityManagementTimeFixture
+class MockNfdMgmtFixture : public nfd::tools::tests::MockNfdMgmtFixture
{
protected:
- MockNfdMgmtFixture()
- : face(g_io, m_keyChain,
- {true, false, bind(&MockNfdMgmtFixture::processEventsOverride, this, _1)})
- {
- face.onSendInterest.connect([=] (const Interest& interest) {
- g_io.post([=] {
- if (processInterest != nullptr) {
- processInterest(interest);
- }
- });
- });
- }
-
-protected: // ControlCommand
- /** \brief check the Interest is a command with specified prefix
- * \retval nullopt last Interest is not the expected command
- * \return command parameters
- */
- static ndn::optional<ControlParameters>
- parseCommand(const Interest& interest, const Name& expectedPrefix)
- {
- if (!expectedPrefix.isPrefixOf(interest.getName())) {
- return ndn::nullopt;
- }
- return ControlParameters(interest.getName().at(expectedPrefix.size()).blockFromValue());
- }
-
- /** \brief send successful response to a command Interest
- */
- void
- succeedCommand(const Interest& interest, const ControlParameters& parameters)
- {
- this->sendCommandReply(interest, 200, "OK", parameters.wireEncode());
- }
-
- /** \brief send failure response to a command Interest
- */
- void
- failCommand(const Interest& interest, uint32_t code, const std::string& text)
- {
- this->sendCommandReply(interest, {code, text});
- }
-
- /** \brief send failure response to a command Interest
- */
- void
- failCommand(const Interest& interest, uint32_t code, const std::string& text, const ControlParameters& body)
- {
- this->sendCommandReply(interest, code, text, body.wireEncode());
- }
-
-protected: // StatusDataset
- /** \brief send an empty dataset in reply to StatusDataset request
- * \param prefix dataset prefix without version and segment
- * \pre Interest for dataset has been expressed, sendDataset has not been invoked
- */
- void
- sendEmptyDataset(const Name& prefix)
- {
- this->sendDatasetReply(prefix, nullptr, 0);
- }
-
- /** \brief send one WireEncodable in reply to StatusDataset request
- * \param prefix dataset prefix without version and segment
- * \param payload payload block
- * \note payload must fit in one Data
- * \pre Interest for dataset has been expressed, sendDataset has not been invoked
- */
- template<typename T>
- void
- sendDataset(const Name& prefix, const T& payload)
- {
- BOOST_CONCEPT_ASSERT((ndn::WireEncodable<T>));
-
- this->sendDatasetReply(prefix, payload.wireEncode());
- }
-
- /** \brief send two WireEncodables in reply to StatusDataset request
- * \param prefix dataset prefix without version and segment
- * \param payload1 first vector item
- * \param payload2 second vector item
- * \note all payloads must fit in one Data
- * \pre Interest for dataset has been expressed, sendDataset has not been invoked
- */
- template<typename T1, typename T2>
- void
- sendDataset(const Name& prefix, const T1& payload1, const T2& payload2)
- {
- BOOST_CONCEPT_ASSERT((ndn::WireEncodable<T1>));
- BOOST_CONCEPT_ASSERT((ndn::WireEncodable<T2>));
-
- ndn::encoding::EncodingBuffer buffer;
- payload2.wireEncode(buffer);
- payload1.wireEncode(buffer);
-
- this->sendDatasetReply(prefix, buffer.buf(), buffer.size());
- }
-
/** \brief respond to specific FaceQuery requests
* \retval true the Interest matches one of the defined patterns and is responded
* \retval false the Interest is not responded
@@ -201,71 +98,6 @@
return false;
}
-
-private:
- virtual void
- processEventsOverride(time::milliseconds timeout)
- {
- if (timeout <= time::milliseconds::zero()) {
- // give enough time to finish execution
- timeout = time::seconds(30);
- }
- this->advanceClocks(time::milliseconds(100), timeout);
- }
-
- void
- sendCommandReply(const Interest& interest, const ndn::nfd::ControlResponse& resp)
- {
- auto data = makeData(interest.getName());
- data->setContent(resp.wireEncode());
- face.receive(*data);
- }
-
- void
- sendCommandReply(const Interest& interest, uint32_t code, const std::string& text,
- const Block& body)
- {
- this->sendCommandReply(interest,
- ndn::nfd::ControlResponse(code, text).setBody(body));
- }
-
- /** \brief send a payload in reply to StatusDataset request
- * \param name dataset prefix without version and segment
- * \param contentArgs passed to Data::setContent
- */
- template<typename ...ContentArgs>
- void
- sendDatasetReply(Name name, ContentArgs&&... contentArgs)
- {
- name.appendVersion().appendSegment(0);
-
- // These warnings assist in debugging when nfdc does not receive StatusDataset.
- // They usually indicate a misspelled prefix or incorrect timing in the test case.
- if (face.sentInterests.empty()) {
- BOOST_WARN_MESSAGE(false, "no Interest expressed");
- }
- else {
- BOOST_WARN_MESSAGE(face.sentInterests.back().getName().isPrefixOf(name),
- "last Interest " << face.sentInterests.back().getName() <<
- " cannot be satisfied by this Data " << name);
- }
-
- auto data = make_shared<Data>(name);
- data->setFinalBlockId(name[-1]);
- data->setContent(std::forward<ContentArgs>(contentArgs)...);
- this->signDatasetReply(*data);
- face.receive(*data);
- }
-
- virtual void
- signDatasetReply(Data& data)
- {
- signData(data);
- }
-
-protected:
- ndn::util::DummyClientFace face;
- std::function<void(const Interest&)> processInterest;
};
} // namespace tests
@@ -273,16 +105,4 @@
} // namespace tools
} // namespace nfd
-/** \brief require the command in \p interest has expected prefix
- * \note This must be used in processInterest lambda, and the Interest must be named 'interest'.
- * \return ControlParameters, or nullopt if \p interest does match \p expectedPrefix
- */
-#define MOCK_NFD_MGMT_REQUIRE_COMMAND_IS(expectedPrefix) \
- [interest] { \
- auto params = parseCommand(interest, (expectedPrefix)); \
- BOOST_REQUIRE_MESSAGE(params, "Interest " << interest.getName() << \
- " does not match command prefix " << (expectedPrefix)); \
- return *params; \
- } ()
-
#endif // NFD_TESTS_TOOLS_NFDC_MOCK_NFD_MGMT_FIXTURE_HPP