From 4bf47d044dcfd22742fdc9615c45e0568310582b Mon Sep 17 00:00:00 2001 From: beierlm Date: Tue, 19 Jan 2021 14:24:45 -0500 Subject: [PATCH] Correct VIM Status Check With the change in the osmclient output, the check for processing state no longer works. This code was introduced in master and has shown to be more resilient to changes in the osmclient. Change-Id: I91687866182e03124698d9fca3dd2d07100f06e0 Signed-off-by: beierlm --- robot-systest/run_test.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh index f7d4235..b752887 100755 --- a/robot-systest/run_test.sh +++ b/robot-systest/run_test.sh @@ -40,26 +40,27 @@ 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 PROCESSING after 50 seconds" + echo "VIM stuck for more than 50 seconds as: ${VIM_LIST}" osm vim-delete --force ${VIM_TARGET} sleep 5 break fi sleep 10 - STATUS=`osm vim-list --long | grep ${VIM_TARGET} | awk '{print $9}'` + VIM_LIST=`osm vim-list --long | grep ${VIM_TARGET}` + echo VIM status: ${VIM_LIST} + 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