summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
bf46bcd)
Use the new VIRL image to test.
Add the debug information for the test.
Change-Id: I8343a17d38dffbf84039e39a06fc5c5a65aaf201
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>
echo "Starting simulation on VIRL server"
VIRL_TOPOLOGY=double-ring-nested.xenial
echo "Starting simulation on VIRL server"
VIRL_TOPOLOGY=double-ring-nested.xenial
-VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6
+VIRL_RELEASE=csit-ubuntu-16.04.1_2017-07-26_1.9
function stop_virl_simulation {
ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\
function stop_virl_simulation {
ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\
-#kill the l4fwd
-sudo killall -9 l4fwd 2>/dev/null
-
-sleep 2
-
-pid=`pgrep l4fwd`
-if [ "$pid" != "" ]; then
- echo "terminate the l4fwd failed!"
- exit 1
+# Try to kill the l4fwd
+sudo pgrep l4fwd
+if [ $? -eq "0" ]; then
+ success=false
+ sudo pkill l4fwd
+ echo "RC = $?"
+ for attempt in {1..5}; do
+ echo "Checking if l4fwd is still alive, attempt nr ${attempt}"
+ sudo pgrep l4fwd
+ if [ $? -eq "1" ]; then
+ echo "l4fwd is dead"
+ success=true
+ break
+ fi
+ echo "l4fwd is still alive, waiting 1 second"
+ sleep 1
+ done
+ if [ "$success" = false ]; then
+ echo "The command sudo pkill l4fwd failed"
+ sudo pkill -9 l4fwd
+ echo "RC = $?"
+ exit 1
+ fi
+else
+ echo "l4fwd is not running"
fi
#mount the hugepages again
fi
#mount the hugepages again