Verify that the VIM was ENABLED before start the tests when using -c option

[osm/tests.git] / robot-systest / run_test.sh

diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index f5753cc..407a453 100755 (executable)
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -37,6 +37,18 @@ 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}}" || true
+    STATUS="PROCESSING"
+    i=0
+    while [[ ${STATUS} != "ENABLED" ]]
+    do
+        ((i++))
+        if [[ $i -eq 5 ]]; then
+            echo "VIM stuck in PROCESSING after 100 seconds"
+            exit 1
+        fi
+        sleep 20
+        STATUS=`osm vim-list --long | grep ${VIM_TARGET} | awk '{print $9}'`
+    done
 }
 
 PARAMS=""
@@ -52,7 +64,7 @@ while (( "$#" )); do
             shift 2
             ;;
         -o|--osmclientversion)
-            OSMCLIENT=$2 install_osmclient
+            OSMCLIENT=$2 && install_osmclient
             shift 2
             ;;
         -c|--createvim)
@@ -98,8 +110,9 @@ done
 
 eval set -- "$PARAMS"
 
-if [[ -n "$stackName" ]]; then
-    export OSM_HOSTNAME=osm${stackName}_nbi
+if [[ -n "$BRANCH_NAME" ]]; then
+    PACKAGES=$BRANCH_NAME && download_packages
+    OSMCLIENT=$BRANCH_NAME && install_osmclient
 fi
 
 if [[ -z "${TEST}" ]]; then