summaryrefslogtreecommitdiffstats
path: root/tests/data_plane/vpp_lite_topo/topologies
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2016-06-07 21:06:25 +0200
committerFlorin Coras <fcoras@cisco.com>2016-06-07 21:06:25 +0200
commit136439647bd4a41490e3a30077cefdfb2659e395 (patch)
treebd1a8ee80ddd40c827dfa8a78e29b65bf3487210 /tests/data_plane/vpp_lite_topo/topologies
parent4bf6318c1de924c63e22479cc38549ce3af3e420 (diff)
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>
Diffstat (limited to 'tests/data_plane/vpp_lite_topo/topologies')
-rw-r--r--tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh10
1 files changed, 6 insertions, 4 deletions
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}