X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=0892f92163e88b0f4516078aff0eca26bafb27b4;hb=9038727dee2e67f8facd75f8b498ca20a1e066c9;hp=42d42e2b1e6c7da880cf53d5be80f6c59fc25eff;hpb=4f7e0f0d057c7b92c979e9e1d7a55f84a2ff7091;p=bottlenecks.git

diff --git a/run_tests.sh b/run_tests.sh
index 42d42e2b..0892f921 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -26,17 +26,22 @@ examples:
 
 report=true
 
-arr_test_suite=(rubbos vstf)
+arr_test_suite=(rubbos vstf posca)
+
+Bottlenecks_key_dir="/home/opnfv/bottlenecks/utils/infra_setup"
 
 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
+         ;;
+         "-posca")
+             SUITE_PREFIX=$SUITE_PREFIX_CONFIG/posca/testcase_cfg
          ;;
     esac
 
@@ -50,7 +55,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
@@ -66,37 +71,52 @@ function run_test(){
 
     case $test_suite in
         "rubbos")
-            info "Running rubbos test suite"
+            info "Running rubbos test suite\n"
             test_file="/home/opnfv/bottlenecks/testsuites/rubbos/testsuite_story/rubbos_story1"
             if [[ -f $test_file ]]; then
                 testcases=($(cat $test_file))
             else
                 error "no rubbos test suite file"
             fi
+
             for i in "${testcases[@]}"; do
                 #check if the testcase is legal or not
                 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
         ;;
         "vstf")
             info "Running vstf test suite"
-            test_file="/home/opnfv/bottlenecks/testsuite/vstf/testsuite_story/vstf_story1"
+            test_file="/home/opnfv/bottlenecks/testsuites/vstf/testsuite_story/vstf_story1"
             if [[ -f $test_file ]]; then
                 testcases=($(cat $test_file))
             else
                 error "no vstf test suite file "
             fi
+
             for i in "${testcases[@]}"; do
                 #check if the testcase is legal or not
                 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
         ;;
+        "posca")
+            info "Composing up dockers"
+            docker-compose -f /home/opnfv/bottlenecks/docker/bottleneck-compose/docker-compose.yml up -d
+            info "Pulling tutum/influxdb for yardstick"
+            docker pull tutum/influxdb:0.13
+            info "Copying testing scripts to docker"
+            docker cp /home/opnfv/bottlenecks/run_posca.sh bottleneckcompose_bottlenecks_1:/home/opnfv/bottlenecks
+            sleep 5
+            info "Running posca test suite"
+            docker exec bottleneckcompose_bottlenecks_1 bash /home/opnfv/bottlenecks/run_posca.sh
+        ;;
     esac
 }
 
@@ -127,6 +147,18 @@ done
 BASEDIR=`dirname $0`
 source ${BASEDIR}/common.sh
 
+#Add random key generation
+if [ ! -d $Bottlenecks_key_dir/bottlenecks_key ]; then
+    mkdir $Bottlenecks_key_dir/bottlenecks_key
+else
+    rm -rf $Bottlenecks_key_dir/bottlenecks_key
+    mkdir $Bottlenecks_key_dir/bottlenecks_key
+fi
+chmod 700 $Bottlenecks_key_dir/bottlenecks_key
+
+ssh-keygen -t rsa -f $Bottlenecks_key_dir/bottlenecks_key/bottlenecks_key -q -N ""
+chmod 600 $Bottlenecks_key_dir/bottlenecks_key/*
+
 #check the test suite name is correct
 if [ "${SUITE}" != "" ]; then
     suite_exec=(${SUITE//,/ })
@@ -138,6 +170,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