define the vstf test running workflow and add vstf into unified test entrance

JIRA: BOTTLENECK-47

the run_vstf.py file will be completed later which mainly focuses on instances creation
and vstf configuration info for each testcase, the configuration info for each testcase in define under
/vstf/testcase_cfg directory

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

diff --git a/run_tests.sh b/run_tests.sh
index 093f724..2257e75 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -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

diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py
index 9f4e117..0a4acd9 100755 (executable)
--- a/testsuites/rubbos/run_rubbos.py
+++ b/testsuites/rubbos/run_rubbos.py
@@ -164,7 +164,7 @@ def rubbos_create_flavors(name="bottlenecks_rubbos_flavor", ram=4096, vcpus=2, d
     nova = _get_nova_client()
     nova.flavors.create(name=name, ram=ram, vcpus=vcpus, disk=disk)
 
-def rubbos_create_instance(template_file, rubbos_parameters=None, stack_name="bottlenecks_rubbos_stack"):
+def rubbos_create_instances(template_file, rubbos_parameters=None, stack_name="bottlenecks_rubbos_stack"):
     print "========== Create rubbos instances =========="
     heat = _get_heat_client()
 

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

diff --git a/testsuites/vstf/run_vstf.py b/testsuites/vstf/run_vstf.py
new file mode 100755 (executable)
index 0000000..558bd27
--- /dev/null
+++ b/testsuites/vstf/run_vstf.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+#TO DO: complete run_vstf

diff --git a/testsuites/vstf/run_vstf.sh b/testsuites/vstf/testcase_cfg/vstf_Ti.yaml
similarity index 100%
rename from testsuites/vstf/run_vstf.sh
rename to testsuites/vstf/testcase_cfg/vstf_Ti.yaml

diff --git a/testsuites/vstf/testcase_cfg/vstf_Tn.yaml b/testsuites/vstf/testcase_cfg/vstf_Tn.yaml
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/testsuites/vstf/testcase_cfg/vstf_Tu1.yaml b/testsuites/vstf/testcase_cfg/vstf_Tu1.yaml
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/testsuites/vstf/testcase_cfg/vstf_Tu3.yaml b/testsuites/vstf/testcase_cfg/vstf_Tu3.yaml
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/testsuites/vstf/testsuite_story/vstf_story1 b/testsuites/vstf/testsuite_story/vstf_story1
index e69de29..5a6ba9c 100755 (executable)
--- a/testsuites/vstf/testsuite_story/vstf_story1
+++ b/testsuites/vstf/testsuite_story/vstf_story1
@@ -0,0 +1,2 @@
+vstf_Tu1
+vstf_Tu3

diff --git a/testsuites/vstf/testsuite_story/vstf_story2 b/testsuites/vstf/testsuite_story/vstf_story2
index e69de29..eacb1bc 100755 (executable)
--- a/testsuites/vstf/testsuite_story/vstf_story2
+++ b/testsuites/vstf/testsuite_story/vstf_story2
@@ -0,0 +1 @@
+vstf_Tn