From 6cc2bd1730f322c34ccd0424d2569fbcde172ad9 Mon Sep 17 00:00:00 2001 From: beierlm Date: Thu, 3 Dec 2020 11:44:47 -0500 Subject: [PATCH] Fix status check Changes from positional awk to simple grep for status as the 'column' for the status can change if there are spaces in project due to showing project id in parenthesis. Change-Id: Ibde61ebda21bdc8daff5747d31213baa0b44a221 Signed-off-by: beierlm --- robot-systest/run_test.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh index 33268e6..22803e4 100755 --- a/robot-systest/run_test.sh +++ b/robot-systest/run_test.sh @@ -46,13 +46,13 @@ create_vim(){ osm vim-create --name ${VIM_TARGET} --user ${OS_USERNAME} --password ${OS_PASSWORD} --tenant ${OS_PROJECT_NAME} \ --auth_url ${OS_AUTH_URL} --account_type openstack --description vim \ --config "{management_network_name: ${VIM_MGMT_NET}, dataplane_physical_net: ${DATAPLANE:-physnet2}}" || true - STATUS="PROCESSING" + STATUS="" i=0 while [[ ${STATUS} != "ENABLED" ]] do ((i++)) if [[ $i -eq 5 ]]; then - echo "VIM stuck in ${STATUS} after 50 seconds" + echo "VIM stuck for more than 50 seconds as: ${VIM_LIST}" osm vim-delete --force ${VIM_TARGET} sleep 5 break @@ -60,14 +60,13 @@ create_vim(){ sleep 10 VIM_LIST=`osm vim-list --long | grep ${VIM_TARGET}` echo VIM status: ${VIM_LIST} - STATUS=`echo ${VIM_LIST} | awk '{print $9}'` + STATUS=`echo ${VIM_LIST} | grep -io ENABLED` done if [[ ${STATUS} = "ENABLED" ]] ; then break fi ((attempts--)) done - if [ $attempts -lt 0 ] ; then echo "VIM failed to enter ENABLED state" exit 1 -- 2.25.1