commit f9858fdd1a0a3feebc76947a85269913a4f7de72
author Junxiao Shi <git@mail1.yoursunny.com> Wed Feb 01 16:22:44 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Feb 02 06:07:52 2017 +0000
tree fb4231f6d3b4127fcf781df9a6c215c7c4aec467
parent fab9e0de464ca5a2ed0467542d0900fe18e8471f

fw: strip Link object when Interest reaches producer region

refs #3893

Change-Id: I7cb0a58f75eb4275bbf0fe0c7dcdb583c8519644

tests/daemon/fw/link-forwarding.t.cpp

diff --git a/tests/daemon/fw/link-forwarding.t.cpp b/tests/daemon/fw/link-forwarding.t.cpp
index 864d598..8bf1dfb 100644
--- a/tests/daemon/fw/link-forwarding.t.cpp
+++ b/tests/daemon/fw/link-forwarding.t.cpp
@@ -70,13 +70,11 @@
       topo.setStrategy<BestRouteStrategy2>(node);
     }
 
-    topo.getForwarder(nodeA).getNetworkRegionTable().insert("/arizona/cs/avenir");
     topo.getForwarder(nodeH).getNetworkRegionTable().insert("/arizona/cs/hobo");
     topo.getForwarder(nodeT).getNetworkRegionTable().insert("/telia/terabits/router");
-    topo.getForwarder(nodeP).getNetworkRegionTable().insert("/telia/terabits/serverP");
     topo.getForwarder(nodeC).getNetworkRegionTable().insert("/ucsd/caida/click");
     topo.getForwarder(nodeS).getNetworkRegionTable().insert("/ucla/cs/spurs");
-    topo.getForwarder(nodeQ).getNetworkRegionTable().insert("/ucla/cs/serverQ");
+    // NetworkRegionTable configuration is unnecessary on end hosts
 
     linkAH = topo.addLink("AH", time::milliseconds(10), {nodeA, nodeH});
     linkHT = topo.addLink("HT", time::milliseconds(10), {nodeH, nodeT});
@@ -139,12 +137,11 @@
   BOOST_CHECK_EQUAL(interestHT.hasSelectedDelegation(), true);
   BOOST_CHECK_EQUAL(interestHT.getSelectedDelegation(), "/telia/terabits");
 
-  // T forwards to P, no change to Link and SelectedDelegation
+  // T forwards to P, Link and SelectedDelegation are stripped when Interest reaches producer region
   BOOST_CHECK_EQUAL(linkTP->getFace(nodeT).getCounters().nOutInterests, 1);
   const Interest& interestTP = topo.getPcap(linkTP->getFace(nodeT)).sentInterests.at(0);
-  BOOST_CHECK_EQUAL(interestTP.hasLink(), true);
-  BOOST_CHECK_EQUAL(interestTP.hasSelectedDelegation(), true);
-  BOOST_CHECK_EQUAL(interestTP.getSelectedDelegation(), "/telia/terabits");
+  BOOST_CHECK_EQUAL(interestTP.hasLink(), false);
+  BOOST_CHECK_EQUAL(interestTP.hasSelectedDelegation(), false);
 
   // Data is served by P and reaches A
   BOOST_CHECK_EQUAL(producerP->getForwarderFace().getCounters().nInData, 1);
@@ -180,12 +177,11 @@
   BOOST_CHECK_EQUAL(interestCS.hasSelectedDelegation(), true);
   BOOST_CHECK_EQUAL(interestCS.getSelectedDelegation(), "/ucla/cs");
 
-  // S forwards to Q, no change to Link and SelectedDelegation
+  // S forwards to Q, Link and SelectedDelegation are stripped when Interest reaches producer region
   BOOST_CHECK_EQUAL(linkSQ->getFace(nodeS).getCounters().nOutInterests, 1);
   const Interest& interestSQ = topo.getPcap(linkSQ->getFace(nodeS)).sentInterests.at(0);
-  BOOST_CHECK_EQUAL(interestSQ.hasLink(), true);
-  BOOST_CHECK_EQUAL(interestSQ.hasSelectedDelegation(), true);
-  BOOST_CHECK_EQUAL(interestSQ.getSelectedDelegation(), "/ucla/cs");
+  BOOST_CHECK_EQUAL(interestSQ.hasLink(), false);
+  BOOST_CHECK_EQUAL(interestSQ.hasSelectedDelegation(), false);
 
   // Data is served by Q and reaches A
   BOOST_CHECK_EQUAL(producerQ->getForwarderFace().getCounters().nInData, 1);