bugfix for braces and testcase name

Change-Id: Ic8731de1f9c62465a28225df4dd5b4b079cb6f49
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

diff --git a/run_tests.sh b/run_tests.sh
index 38e5c16..1931293 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -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,7 +95,7 @@ function run_test(){
                 check_testcase -vstf $i
                 #adjust config parameters
                 #run test case
-                file={$BASEDIR}/testsuites/vstf/testcase_cfg/{$i}.yaml
+                file=${BASEDIR}/testsuites/vstf/testcase_cfg/${i}.yaml
                 python /home/opnfv/bottlenecks/testsuites/vstf/run_vstf.py -c $file
             done
         ;;

diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py
index 32221f7..904cd8a 100755 (executable)
--- a/testsuites/rubbos/run_rubbos.py
+++ b/testsuites/rubbos/run_rubbos.py
@@ -25,7 +25,7 @@ from novaclient.client import Client as NovaClient
 parser = argparse.ArgumentParser()
 parser.add_argument("-c", "--conf",
                     help="configuration files for the testcase, in yaml format",
-                    default="/home/opnfv/bottlenecks/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml")
+                    default="/home/opnfv/bottlenecks/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml")
 args = parser.parse_args()
 
 #--------------------------------------------------

diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml
similarity index 100%
rename from testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml
rename to testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml

diff --git a/testsuites/rubbos/testsuite_story/rubbos_story1 b/testsuites/rubbos/testsuite_story/rubbos_story1
index c3b1e92..af143e3 100755 (executable)
--- a/testsuites/rubbos/testsuite_story/rubbos_story1
+++ b/testsuites/rubbos/testsuite_story/rubbos_story1
@@ -1 +1 @@
-rubbos_1-1-1
+rubbos_1-1-0-1

diff --git a/testsuites/rubbos/testsuite_story/rubbos_story2 b/testsuites/rubbos/testsuite_story/rubbos_story2
index 40eb5f0..b35fbdd 100755 (executable)
--- a/testsuites/rubbos/testsuite_story/rubbos_story2
+++ b/testsuites/rubbos/testsuite_story/rubbos_story2
@@ -1,2 +1,2 @@
-rubbos_1-1-1
-rubbos_1-1-2
+rubbos_1-1-0-1
+rubbos_1-2-0-1