commit bef49471369a35c21550e31809fd9ef9dfd32b8b
author Eric Newberry <enewberry@email.arizona.edu> Mon May 08 22:49:05 2017 -0700
committer Eric Newberry <enewberry@email.arizona.edu> Sat May 20 21:11:24 2017 -0700
tree 8008028181b476dccf73b368b11c84bf3aa633e8
parent 7745c1aa72d7d578f8cbb751d05714c68b9e545b

Redesign nfdc test case to use new nfdc syntax

refs #4058

Change-Id: If48027509c3c8865334b776a30f420c5fafa02ec

test_nfdc/test-B.sh

diff --git a/test_nfdc/test-B.sh b/test_nfdc/test-B.sh
index fad09d0..3e33002 100755
--- a/test_nfdc/test-B.sh
+++ b/test_nfdc/test-B.sh
@@ -1,50 +1,50 @@
 #!/usr/bin/env bash
 workDir=$1
+testLog=$workDir/logs/nfdc_test.log
 source $workDir/../multi-host.conf
 source $workDir/include.sh
 
 #compress IPv6
 IP6_A1=$(python -c "import sys; import socket; result = socket.getaddrinfo('$IP6_A1', None); family, socktype, proto, canonname,(address, port, flow_info, scope_id) = result[0]; print address")
 
-remoteFaceIdUdp4=$(check_nfd_status_face_existence none udp4://$IP4_A1)
+remoteFaceIdUdp4=$(check_nfdc_face_existence none udp4://$IP4_A1)
 if [[ -z "$remoteFaceIdUdp4" ]]; then
   exit 3
 fi
 
-remoteFaceIdTcp4=$(check_nfd_status_face_existence none tcp4://$IP4_A1)
+remoteFaceIdTcp4=$(check_nfdc_face_existence none tcp4://$IP4_A1)
 if [[ -z "$remoteFaceIdTcp4" ]]; then
   exit 3
 fi
 
-remoteFaceIdUdp6=$(check_nfd_status_face_existence none udp6://[$IP6_A1])
+remoteFaceIdUdp6=$(check_nfdc_face_existence none udp6://[$IP6_A1])
 if [[ -z "$remoteFaceIdUdp6" ]]; then
   exit 3
 fi
 
-remoteFaceIdTcp6=$(check_nfd_status_face_existence none tcp6://[$IP6_A1])
+remoteFaceIdTcp6=$(check_nfdc_face_existence none tcp6://[$IP6_A1])
 if [[ -z "$remoteFaceIdTcp6" ]]; then
   exit 3
 fi
 
-check_nfd_status_counters $remoteFaceIdUdp4 udp4://$IP4_A1 'in' $NUM_OF_PINGS
+check_nfdc_face_counters $remoteFaceIdUdp4 udp4://$IP4_A1 'in' $NUM_OF_PINGS
 if [[ $? -ne 0 ]]; then
   exit 3
 fi
 
-check_nfd_status_counters $remoteFaceIdTcp4 tcp4://$IP4_A1 'in' $NUM_OF_PINGS
+check_nfdc_face_counters $remoteFaceIdTcp4 tcp4://$IP4_A1 'in' $NUM_OF_PINGS
 if [[ $? -ne 0 ]]; then
   exit 3
 fi
 
-check_nfd_status_counters $remoteFaceIdUdp6 udp6://[$IP6_A1] 'in' $NUM_OF_PINGS
+check_nfdc_face_counters $remoteFaceIdUdp6 udp6://[$IP6_A1] 'in' $NUM_OF_PINGS
 if [[ $? -ne 0 ]]; then
   exit 3
 fi
 
-check_nfd_status_counters $remoteFaceIdTcp6 tcp6://[$IP6_A1] 'in' $NUM_OF_PINGS
+check_nfdc_face_counters $remoteFaceIdTcp6 tcp6://[$IP6_A1] 'in' $NUM_OF_PINGS
 if [[ $? -ne 0 ]]; then
   exit 3
 fi
 
-
 exit 0