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_multicast_strategy/test.sh

diff --git a/test_multicast_strategy/test.sh b/test_multicast_strategy/test.sh
index 4b20fb6..4f46394 100755
--- a/test_multicast_strategy/test.sh
+++ b/test_multicast_strategy/test.sh
@@ -32,13 +32,16 @@
 
 # set up forwarding on A
 echo "setting up forwarding on A..."
-nfdc set-strategy ndn:/test-mcast ndn:/localhost/nfd/strategy/multicast
-nfdc add-nexthop -c 10 ndn:/test-mcast udp4://$IP4_B1
-nfdc add-nexthop -c 20 ndn:/test-mcast udp4://$IP4_C1
+nfdc strategy set ndn:/test-mcast ndn:/localhost/nfd/strategy/multicast
+nfdc face create udp4://$IP4_B1
+nfdc face create udp4://$IP4_C1
+nfdc route add ndn:/test-mcast udp4://$IP4_B1 cost 10
+nfdc route add ndn:/test-mcast udp4://$IP4_C1 cost 20
 
 # set up forwarding on D
 echo "setting up forwarding on D..."
-ssh $CTRL_D "nfdc add-nexthop ndn:/test-mcast udp4://$IP4_A2"
+ssh $CTRL_D "nfdc face create udp4://$IP4_A2"
+ssh $CTRL_D "nfdc route add ndn:/test-mcast udp4://$IP4_A2"
 
 # run ndn-traffic client on D
 echo "running ndn-traffic client on D..."
@@ -53,10 +56,9 @@
 echo "collecting data from B, C and D..."
 scp $CTRL_B:$workdir/logs/serverB.log $workdir/logs/serverB.log
 scp $CTRL_C:$workdir/logs/serverC.log $workdir/logs/serverC.log
-ssh $CTRL_D "nfd-status -f > $workdir/logs/nfd-status-D.log"
-scp $CTRL_D:$workdir/logs/nfd-status-D.log $workdir/logs/nfd-status-D.log
+ssh $CTRL_D "nfdc face list > $workdir/logs/nfdc-face-list-D.log"
+scp $CTRL_D:$workdir/logs/nfdc-face-list-D.log $workdir/logs/nfdc-face-list-D.log
 scp $CTRL_D:$workdir/logs/client.log $workdir/logs/client.log
-nfd-status > $workdir/logs/nfd-status-A.log
 
 # analyze result
 echo "analyzing result"
@@ -74,7 +76,7 @@
     clean_up
     exit 2
 fi
-cat $workdir/logs/nfd-status-D.log | grep udp4 | while read line
+cat $workdir/logs/nfdc-face-list-D.log | grep udp4 | while read line
 do
     ind=$(echo $line | grep -Po "i .*?d} out" | sed 's/i //g' | sed 's/d} out//g')
     if [[ $ind -gt 120 ]]