NFD+model+apps+helper+tests: Upgrade NFD and related changes
Based on NFD:commit:2fc649bfc67b93b4191cfbee5bcd70330bfb48f0 (version 0.3.4)
Change-Id: I89f5182600467171797af4f8f83e1edffe14ad95
Refs: #3125
diff --git a/tests/other/ndn-test.cpp b/tests/other/ndn-test.cpp
index da2f334..4095f54 100644
--- a/tests/other/ndn-test.cpp
+++ b/tests/other/ndn-test.cpp
@@ -171,7 +171,7 @@
cmd.AddValue("pit", "Perform PIT evaluation if this parameter is true",
m_shouldEvaluatePit);
cmd.AddValue("strategy", "Choose forwarding strategy "
- "(e.g., /localhost/nfd/strategy/broadcast, "
+ "(e.g., /localhost/nfd/strategy/multicast, "
"/localhost/nfd/strategy/best-route, ...) ",
m_strategy);
cmd.AddValue("sim-time", "Simulation time", m_simulationTime);
diff --git a/tests/other/ndn-test.sh b/tests/other/ndn-test.sh
index f260de4..fac2756 100755
--- a/tests/other/ndn-test.sh
+++ b/tests/other/ndn-test.sh
@@ -15,10 +15,10 @@
echo "CS size = " $size, "interest rate = " $rate
-# using broadcast forwarding strategy
-echo "Using broadcast forwarding strategy.."
+# using multicast forwarding strategy
+echo "Using multicast forwarding strategy.."
-../../../waf --run ndn-test --command-template="%s --old-cs=ns3::ndn::cs::Lru --cs-size=${size} --rate=${rate} --sim-time=${sim_time} --pit=$(true) --strategy="/localhost/nfd/strategy/broadcast" "
+../../../waf --run ndn-test --command-template="%s --old-cs=ns3::ndn::cs::Lru --cs-size=${size} --rate=${rate} --sim-time=${sim_time} --pit=$(true) --strategy="/localhost/nfd/strategy/multicast" "
echo
@@ -41,10 +41,10 @@
echo "CS size = " $size, "interest rate = " $rate
-# using broadcast forwarding strategy
-echo "Using broadcast forwarding strategy.."
+# using multicast forwarding strategy
+echo "Using multicast forwarding strategy.."
-../../../waf --run ndn-test --command-template="%s --cs-size=${size} --rate=${rate} --strategy="/localhost/nfd/strategy/broadcast" --sim-time=${sim_time}"
+../../../waf --run ndn-test --command-template="%s --cs-size=${size} --rate=${rate} --strategy="/localhost/nfd/strategy/multicast" --sim-time=${sim_time}"
echo
diff --git a/tests/unit-tests/helper/ndn-link-control-helper.t.cpp b/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
index a36715a..92ceefb 100644
--- a/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-link-control-helper.t.cpp
@@ -108,7 +108,7 @@
});
// Choosing forwarding strategy
- ndn::StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/broadcast");
+ ndn::StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/multicast");
addApps({
{"0", "ns3::ndn::ConsumerCbr",
diff --git a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
index d5f14ee..ed60016 100644
--- a/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
+++ b/tests/unit-tests/helper/ndn-strategy-choice-helper.t.cpp
@@ -19,6 +19,8 @@
#include "helper/ndn-strategy-choice-helper.hpp"
+#include "ns3/ndnSIM/NFD/daemon/fw/strategy.hpp"
+
#include "../tests-common.hpp"
namespace ns3 {
@@ -90,7 +92,7 @@
// Install(Ptr<Node> node, const Name& namePrefix, const Name& strategy);
BOOST_AUTO_TEST_CASE(InstallBuiltInStrategyOnNode)
{
- StrategyChoiceHelper::Install(getNode("A2"), "/prefix", "/localhost/nfd/strategy/broadcast");
+ StrategyChoiceHelper::Install(getNode("A2"), "/prefix", "/localhost/nfd/strategy/multicast");
Simulator::Stop(Seconds(5.0));
Simulator::Run();
@@ -110,7 +112,7 @@
nodes.Add(getNode("A1"));
nodes.Add(getNode("A2"));
- StrategyChoiceHelper::Install(nodes, "/prefix", "/localhost/nfd/strategy/broadcast");
+ StrategyChoiceHelper::Install(nodes, "/prefix", "/localhost/nfd/strategy/multicast");
Simulator::Stop(Seconds(5.0));
Simulator::Run();
@@ -126,7 +128,7 @@
// InstallAll(const Name& namePrefix, const Name& strategy);
BOOST_AUTO_TEST_CASE(InstallAllBuiltInStrategy)
{
- StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/broadcast");
+ StrategyChoiceHelper::InstallAll("/prefix", "/localhost/nfd/strategy/multicast");
Simulator::Stop(Seconds(5.0));
Simulator::Run();