From 1a76069685ea573c9fa94abac263b30625548440 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jaime=20Caama=C3=B1o=20Ruiz?= Date: Wed, 7 Feb 2018 11:58:40 +0100 Subject: [PATCH] Harden check for running ovs in sfc full deploy MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I195d527ff6f101208dbf21b2a3b089ab56194abb Signed-off-by: Jaime Caamaño Ruiz --- csit/suites/sfc/Full_Deploy/docker-ovs.sh | 25 ++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/csit/suites/sfc/Full_Deploy/docker-ovs.sh b/csit/suites/sfc/Full_Deploy/docker-ovs.sh index 263d0c35a5..50ab7dd806 100755 --- a/csit/suites/sfc/Full_Deploy/docker-ovs.sh +++ b/csit/suites/sfc/Full_Deploy/docker-ovs.sh @@ -133,6 +133,22 @@ connect_namespace_to_container () { delete_netns_link } +check_status () { + CHECKED_CONTAINER="$1" + CHECKED_PROGRAM="$2" + CHECKED_STATUS="$3" + + STATUS="" + retry=0 + while [ "$STATUS" != "$CHECKED_STATUS" -a $retry -le 60 ]; do + sleep 1 + STATUS=`sudo docker exec "$CHECKED_CONTAINER" supervisorctl status "$CHECKED_PROGRAM" |\ + awk '{print $2}'` + retry=$[$retry+1] + done + [ "$STATUS" == "$CHECKED_STATUS" ] || exit 1 +} + spawn_node () { NODE="$1" TUN="$2" @@ -149,11 +165,10 @@ spawn_node () { exit 1 fi - STATUS="" - while [ "$STATUS" != "EXITED" ]; do - STATUS=`sudo docker exec "$CONTAINER" supervisorctl status configure-ovs |\ - awk '{print $2}'` - done + check_status "$CONTAINER" ovsdb-server RUNNING + check_status "$CONTAINER" ovs-vswitchd RUNNING + check_status "$CONTAINER" configure-ovs EXITED + CONTAINER_GW=`sudo docker inspect -f '{{ .NetworkSettings.Gateway }}' "$CONTAINER"` CONTAINER_IP=`sudo docker inspect -f '{{ .NetworkSettings.IPAddress }}' "$CONTAINER"` -- 2.36.6