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
diff --git a/test_auto_prefix_propagate/B.sh b/test_auto_prefix_propagate/B.sh
index 4bc5f0c..585f2dc 100755
--- a/test_auto_prefix_propagate/B.sh
+++ b/test_auto_prefix_propagate/B.sh
@@ -108,7 +108,7 @@
sleep 2
LOG "set multicast strategy for ndn:/"
- nfdc set-strategy ndn:/ ndn:/localhost/nfd/strategy/multicast >>$testLog 2>&1
+ nfdc strategy set / /localhost/nfd/strategy/multicast >>$testLog 2>&1
LOG "set autoreg prefix to /Z"
nfd-autoreg --prefix=/Z >> $testLog 2>&1 &
}
diff --git a/test_auto_prefix_propagate/auto-prefix-propagate-test.sh b/test_auto_prefix_propagate/auto-prefix-propagate-test.sh
index 6f62782..13614e1 100755
--- a/test_auto_prefix_propagate/auto-prefix-propagate-test.sh
+++ b/test_auto_prefix_propagate/auto-prefix-propagate-test.sh
@@ -46,14 +46,14 @@
}
inspect_hub_rib_exist() {
- record=$(run_hub_cmd "nfd-status -r" | grep "$1 route")
+ record=$(run_hub_cmd "nfdc route list" | grep "prefix=$1 ")
if [[ -z "$record" ]]; then
end_test "Fail test $2"
fi
}
inspect_hub_rib_none() {
- record=$(run_hub_cmd "nfd-status -r" | grep "$1 route")
+ record=$(run_hub_cmd "nfdc route list" | grep "prefix=$1 ")
if [[ ! -z "$record" ]]; then
end_test "Fail test $2. the matched record: $record"
fi
@@ -61,7 +61,7 @@
run_test() {
faceUri=udp4://$hubIP:6363
- nfdc create $faceUri >> $testLog
+ nfdc face create $faceUri >> $testLog
defer_time=5
@@ -71,7 +71,7 @@
as the /localhop/nfd prefix has not been registered to the local RIB now."
LOG "run test case: 2"
- nfdc register ndn:/localhop/nfd $faceUri >> $testLog && sleep $defer_time
+ nfdc route add /localhop/nfd $faceUri >> $testLog && sleep $defer_time
inspect_hub_rib_exist /Z/A "2: route of /Z/A does not exist, but it should exist because \
automatic prefix propagation is active (/localhop/nfd prefix has been registered), Z/A/G is \
present in local RIB and /Z/A has been configured as an identity in NFD's keychain."