commit 7745c1aa72d7d578f8cbb751d05714c68b9e545b
author Eric Newberry <enewberry@email.arizona.edu> Thu Apr 20 00:23:05 2017 -0700
committer Eric Newberry <enewberry@email.arizona.edu> Sat Apr 22 16:48:59 2017 -0700
tree 68f6dc151b8eb264570c7ec904004af279b1bff8
parent 1cbb932fad67094b8bcd6d5bbf958e809cc9cd5e

remove use of deprecated nfdc syntax and update output processing

change all calls to nfd-status to nfdc

(except test_nfdc)

refs #4058

Change-Id: I4205602d180f5cb5c64e9883e79d5deb518533ad

test_route_inheritance/route-inheritance-test.sh

diff --git a/test_route_inheritance/route-inheritance-test.sh b/test_route_inheritance/route-inheritance-test.sh
index 2d2f0b7..77e5a8f 100755
--- a/test_route_inheritance/route-inheritance-test.sh
+++ b/test_route_inheritance/route-inheritance-test.sh
@@ -25,7 +25,7 @@
   echo 'Starting nfd on host D' > $testLogD ; sleep 2"
 
 # set multicast strategy for root namespace on A
-nfdc set-strategy / /localhost/nfd/strategy/multicast
+nfdc strategy set prefix / strategy /localhost/nfd/strategy/multicast
 
 # run traffic generator on B,C,D
 ssh $CTRL_B "echo 'starting ndn-traffic-server on B' > $testLogB &\
@@ -35,25 +35,31 @@
 ssh $CTRL_D "echo 'starting ndn-traffic-server on D' > $testLogD &\
   ndn-traffic-server $workDir/NDNTrafficServer.conf &> $logDir/serverD.log &"
 
+echo "setting up faces..."
+
+nfdc face create udp4://$IP4_B1:6363 >> $testLogA
+nfdc face create udp4://$IP4_C1:6363 >> $testLogA
+nfdc face create udp4://$IP4_D1:6363 >> $testLogA
+
 echo "setting up routes..."
 
 # on A, add ndn:/ , nexthop=hostB, CHILD_INHERIT=yes, CAPTURE=no
-nfdc register ndn:/ udp4://$IP4_B1:6363 >> $testLogA
+nfdc route add ndn:/ udp4://$IP4_B1:6363 >> $testLogA
 
 # on A, add ndn:/ , nexthop=hostC, CHILD_INHERIT=no, CAPTURE=no
-nfdc register -I ndn:/ udp4://$IP4_C1:6363 >> $testLogA
+nfdc route add ndn:/ udp4://$IP4_C1:6363 no-inherit >> $testLogA
 
 # on A, add ndn:/A , nexthop=hostB, CHILD_INHERIT=yes, CAPTURE=no
-nfdc register ndn:/A udp4://$IP4_B1:6363 >> $testLogA
+nfdc route add ndn:/A udp4://$IP4_B1:6363 >> $testLogA
 
 # on A, add ndn:/A/B/C , nexthop=hostD, CHILD_INHERIT=yes, CAPTURE=no
-nfdc register ndn:/A/B/C udp4://$IP4_D1:6363 >> $testLogA
+nfdc route add ndn:/A/B/C udp4://$IP4_D1:6363 >> $testLogA
 
 # on A, add ndn:/D , nexthop=hostC, CHILD_INHERIT=yes, CAPTURE=yes
-nfdc register -C ndn:/D udp4://$IP4_C1:6363 >> $testLogA
+nfdc route add ndn:/D udp4://$IP4_C1:6363 capture >> $testLogA
 
 # on A, add ndn:/D , nexthop=hostD, CHILD_INHERIT=yes, CAPTURE=no
-nfdc register ndn:/D udp4://$IP4_D1:6363 >> $testLogA
+nfdc route add ndn:/D udp4://$IP4_D1:6363 >> $testLogA
 
 sleep 2