Fix tests after VPP API change

chroot startup.conf option was renamed to api-segment. Additionally, make sure
VPP instances are really killed at cleanup.

Change-Id: Icadb9dfebade7e66a4302ba0640583f02869d200
Signed-off-by: Florin Coras <fcoras@cisco.com>

3 files changed, 9 insertions, 7 deletions

diff --git a/tests/data_plane/vpp_lite_topo/config.sh b/tests/data_plane/vpp_lite_topo/config.sh
index 790d31e..351df29 100644
--- a/tests/data_plane/vpp_lite_topo/config.sh
+++ b/tests/data_plane/vpp_lite_topo/config.sh
@@ -4,7 +4,7 @@ ODL_IP="127.0.0.1"
 ODL_PORT="8181"
 
 # path to vpp executable
-VPP_LITE_BIN=/home/vagrant/vpp/build-root/install-vpp_lite_debug-native/vpp/bin/vpp
+VPP_LITE_BIN=/vpp/build-root/install-vpp_lite_debug-native/vpp/bin/vpp
 
 if [ ! -f "${VPP_LITE_BIN}" ] ; then
   echo "Error: VPP binary not found. You can set VPP_LITE_BIN in config.sh"
diff --git a/tests/data_plane/vpp_lite_topo/lisp_test.sh b/tests/data_plane/vpp_lite_topo/lisp_test.sh
index 33eee54..abacd42 100755
--- a/tests/data_plane/vpp_lite_topo/lisp_test.sh
+++ b/tests/data_plane/vpp_lite_topo/lisp_test.sh
@@ -132,13 +132,13 @@ sudo $VPP_LITE_BIN                              \
   unix { log /tmp/vpp1.log cli-listen           \
          localhost:5002 full-coredump           \
          exec $VPP_LITE_CONF/${VPP1_CONF} }     \
-         api-trace { on } chroot {prefix xtr1}
+         api-trace { on } api-segment {prefix xtr1}
 
 sudo $VPP_LITE_BIN                              \
   unix { log /tmp/vpp2.log cli-listen           \
          localhost:5003 full-coredump           \
          exec $VPP_LITE_CONF/${VPP2_CONF}}      \
-         api-trace { on } chroot {prefix xtr2}
+         api-trace { on } api-segment {prefix xtr2}
 
 
 if [ "$#" == 0 ] || [ "$1" == "ip4" ] ; then
diff --git a/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh b/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh
index 70f1eeb..2be2e8c 100644
--- a/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh
@@ -2,7 +2,9 @@
 
 function rtr_single_iface_clean {
   echo "Clearing all VPP instances.."
-  pkill vpp
+  pkill vpp --signal 9
+  
+  rm /dev/shm/*
 
   echo "Cleaning RTR topology.."
   ip netns exec xtr-rtr-ns ifconfig vppbr1 down
@@ -77,19 +79,19 @@ function rtr_single_iface_setup {
     unix { log /tmp/vpp1.log cli-listen \
            localhost:5002 full-coredump \
            exec ${VPP_LITE_CONF}/vpp1.config } \
-    api-trace { on } chroot {prefix xtr1}
+    api-trace { on } api-segment {prefix xtr1}
 
   ${VPP_LITE_BIN} \
     unix { log /tmp/vpp2.log cli-listen \
            localhost:5003 full-coredump \
            exec ${VPP_LITE_CONF}/vpp2.config } \
-    api-trace { on } chroot {prefix xtr2}
+    api-trace { on } api-segment {prefix xtr2}
 
    ${VPP_LITE_BIN} \
     unix { log /tmp/rtr.log cli-listen \
            localhost:5004 full-coredump \
            exec ${VPP_LITE_CONF}/rtr.config } \
-    api-trace { on } chroot {prefix rtr}
+    api-trace { on } api-segment {prefix rtr}
 
   post_curl "add-mapping" ${ODL_CONFIG_FILE1}
   post_curl "add-mapping" ${ODL_CONFIG_FILE2}