summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
4bf6318)
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>
ODL_PORT="8181"
# path to vpp executable
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"
if [ ! -f "${VPP_LITE_BIN}" ] ; then
echo "Error: VPP binary not found. You can set VPP_LITE_BIN in config.sh"
unix { log /tmp/vpp1.log cli-listen \
localhost:5002 full-coredump \
exec $VPP_LITE_CONF/${VPP1_CONF} } \
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}} \
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
if [ "$#" == 0 ] || [ "$1" == "ip4" ] ; then
function rtr_single_iface_clean {
echo "Clearing all VPP instances.."
function rtr_single_iface_clean {
echo "Clearing all VPP instances.."
+ pkill vpp --signal 9
+
+ rm /dev/shm/*
echo "Cleaning RTR topology.."
ip netns exec xtr-rtr-ns ifconfig vppbr1 down
echo "Cleaning RTR topology.."
ip netns exec xtr-rtr-ns ifconfig vppbr1 down
unix { log /tmp/vpp1.log cli-listen \
localhost:5002 full-coredump \
exec ${VPP_LITE_CONF}/vpp1.config } \
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 } \
${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 } \
${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}
post_curl "add-mapping" ${ODL_CONFIG_FILE1}
post_curl "add-mapping" ${ODL_CONFIG_FILE2}