From 048ed618fc8c3453862c14645c89b1c668326a80 Mon Sep 17 00:00:00 2001
From: Filip Tehlar <ftehlar@cisco.com>
Date: Thu, 19 Jan 2017 16:29:41 +0100
Subject: [PATCH] Automate rloc-probe tests

Change-Id: I4d8755ece339bdfaf717016b0ef40c7b221db679
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
---
 tests/data_plane/vpp_lite_topo/config.sh           |  2 +-
 .../data_plane/vpp_lite_topo/test_driver/basic.sh  | 22 ++++++++++++++++++++--
 ...st_rloc_probe_4o4.sh => test_rloc_probe_4o4.sh} |  0
 ...st_rloc_probe_4o6.sh => test_rloc_probe_4o6.sh} |  0
 4 files changed, 21 insertions(+), 3 deletions(-)
 rename tests/data_plane/vpp_lite_topo/tests/{manual_test_rloc_probe_4o4.sh => test_rloc_probe_4o4.sh} (100%)
 rename tests/data_plane/vpp_lite_topo/tests/{manual_test_rloc_probe_4o6.sh => test_rloc_probe_4o6.sh} (100%)

diff --git a/tests/data_plane/vpp_lite_topo/config.sh b/tests/data_plane/vpp_lite_topo/config.sh
index 2c58007..4115617 100644
--- a/tests/data_plane/vpp_lite_topo/config.sh
+++ b/tests/data_plane/vpp_lite_topo/config.sh
@@ -26,7 +26,7 @@ if [ ! -f "${VPP_API_TEST}" ] ; then
   echo "$ make build-vat"
   echo "VPP_API_TEST can be set in config.sh or in ~/.onerc."
   echo "Current value:"
-  echo "VPP_LITE_BIN=${VPP_API_TEST}"
+  echo "VPP_API_TEST=${VPP_API_TEST}"
   exit 1
 fi
 
diff --git a/tests/data_plane/vpp_lite_topo/test_driver/basic.sh b/tests/data_plane/vpp_lite_topo/test_driver/basic.sh
index 309ff64..ec96f16 100644
--- a/tests/data_plane/vpp_lite_topo/test_driver/basic.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/basic.sh
@@ -64,6 +64,12 @@ function test_basic_map_register
   ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
   rc=$?
 
+  count=`echo "show error" | nc 0 5002 | grep 'map-notifies received' | awk '{print $1}'`
+  if [ "$count" -eq 0 ] ; then
+    echo "no map-notifies received! ($count)"
+    rc=1
+  fi
+
   maybe_pause
 
   # test done
@@ -83,12 +89,24 @@ function test_rloc_probe
   rc=$?
   assert_rc_ok $rc 2_node_topo_clean "No ICMP response!"
 
-  read -p  "Please check RLOC probe messages manually .." -n1
+  sleep 65
+
+  count=`echo "show error" | nc 0 5002 | grep 'rloc-probe replies received' | awk '{print $1}'`
+  if [ "$count" != "1" ] ; then
+    echo "rloc-probe replies received is not 1! ($count)"
+    rc=1
+  fi
+
+  count=`echo "show error" | nc 0 5003 | grep 'rloc-probe requests received' | awk '{print $1}'`
+  if [ "$count" != "1" ] ; then
+    echo "rloc-probe requests received is not 1! ($count)"
+    rc=1
+  fi
 
   # test done
 
   maybe_pause
   2_node_topo_clean
-  print_status $rc "No ICMP response!"
+  print_status $rc "unexpected value"
   exit $test_result
 }
diff --git a/tests/data_plane/vpp_lite_topo/tests/manual_test_rloc_probe_4o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_rloc_probe_4o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/tests/manual_test_rloc_probe_4o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rloc_probe_4o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/tests/manual_test_rloc_probe_4o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_rloc_probe_4o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/tests/manual_test_rloc_probe_4o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rloc_probe_4o6.sh
-- 
2.16.6