X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=19312935d3810448d2fe210d2dea383bdf4cec6d;hb=9cae9f39066d07694d94de67761ddbc700f34af0;hp=42d42e2b1e6c7da880cf53d5be80f6c59fc25eff;hpb=4f7e0f0d057c7b92c979e9e1d7a55f84a2ff7091;p=bottlenecks.git

diff --git a/run_tests.sh b/run_tests.sh
index 42d42e2b..19312935 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -33,10 +33,10 @@ function check_testcase(){
     check_suite="$1"
     case $check_suite in
          "-rubbos")
-             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/rubbos/testcase_cfg
+             SUITE_PREFIX=$SUITE_PREFIX_CONFIG/rubbos/testcase_cfg
          ;;
          "-vstf")
-             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/vstf/testcase_cfg
+             SUITE_PREFIX=$SUITE_PREFIX_CONFIG/vstf/testcase_cfg
          ;;
     esac
 
@@ -50,7 +50,7 @@ function check_testcase(){
     if [ "${TEST_CASE}" != "" ]; then
        testcase_exec=(${TEST_CASE// /})
        for i in "${testcase_exec[@]}"; do
-           if [[ " ${all_test_cases[*]} " != *" $i "* ]]; then
+           if [[ " ${all_testcases[*]} " != *" $i "* ]]; then
                error "unknown test case: $i. available test cases are: ${all_test_cases[@]}"
            fi
        done
@@ -78,7 +78,7 @@ function run_test(){
                 check_testcase -rubbos $i
                 #adjust config parameters, different test suite has different methods, take rubbos as an example
                 #run test case, different test suite has different methods
-                file={$BASEDIR}/testsuites/rubbos/testcase_cfg/{$i}.yaml
+                file=${BASEDIR}/testsuites/rubbos/testcase_cfg/${i}.yaml
                 python /home/opnfv/bottlenecks/testsuites/rubbos/run_rubbos.py -c $file
             done
         ;;
@@ -95,6 +95,8 @@ function run_test(){
                 check_testcase -vstf $i
                 #adjust config parameters
                 #run test case
+                file=${BASEDIR}/testsuites/vstf/testcase_cfg/${i}.yaml
+                python /home/opnfv/bottlenecks/testsuites/vstf/run_vstf.py -c $file
             done
         ;;
     esac
@@ -138,6 +140,10 @@ if [ "${SUITE}" != "" ]; then
     info "Tests to execute: ${SUITE}"
 fi
 
+# Source credentials
+info "Sourcing Credentials openstack.creds to run the tests.."
+source /home/opnfv/bottlenecks/config/openstack.creds
+
 #run tests
 if [ "${SUITE}" != "" ]; then
     for i in "${suite_exec[@]}"; do