diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2016-06-11 23:38:56 -0400 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2016-06-12 02:18:22 -0400 |
| commit | 48cc9dbc2c4300faa953441a060d46663c92734f (patch) | |
| tree | ad60a7bcc93e1d76ef56e7f53a7552b097b00e92 | |
| parent | 111458fd781a24e39f8a2f98bc780629b8f32df4 (diff) | |
bugfix for vstf stack name
JIRA: BOTTLENECK-70
Change-Id: I768be0a0b30df266f6f130bf616d6d808cf1849c
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
| -rwxr-xr-x | testsuites/vstf/run_vstf.py | 3 | ||||
| -rw-r--r-- | utils/infra_setup/heat_template/vstf_heat_template/launch_vstf.sh | 6 | ||||
| -rw-r--r-- | utils/infra_setup/heat_template/vstf_heat_template/vstf_test.sh | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/testsuites/vstf/run_vstf.py b/testsuites/vstf/run_vstf.py index b9c782dc..319f0055 100755 --- a/testsuites/vstf/run_vstf.py +++ b/testsuites/vstf/run_vstf.py @@ -195,6 +195,7 @@ def get_instances(nova_client): def vstf_run(launch_file=None, test_file=None): print "================run vstf===============" + heat = _get_heat_client() nova = _get_nova_client() print(nova.servers.list()) print "## neutruon net-list:" @@ -272,7 +273,7 @@ def main(): time.sleep(300) launchfile = Bottlenecks_repo_dir + "/utils/infra_setup/heat_template/vstf_heat_template/launch_vstf.sh" - testfile = Bottlenecks_repo_dir + "/utils/infra_setup/heat_template/vstf_heat_template/test_vstf.sh" + testfile = Bottlenecks_repo_dir + "/utils/infra_setup/heat_template/vstf_heat_template/vstf_test.sh" vstf_run(launch_file=launchfile, test_file=testfile) vstf_env_cleanup() diff --git a/utils/infra_setup/heat_template/vstf_heat_template/launch_vstf.sh b/utils/infra_setup/heat_template/vstf_heat_template/launch_vstf.sh index f2a0aeaa..ec615ec2 100644 --- a/utils/infra_setup/heat_template/vstf_heat_template/launch_vstf.sh +++ b/utils/infra_setup/heat_template/vstf_heat_template/launch_vstf.sh @@ -9,7 +9,7 @@ ############################################################################## set -x -STACK_NAME="vstf" +STACK_NAME="bottlenecks_vstf_stack" VM_MANAGER_USER="root" VM_MANAGER_PASSWD="root" VM_TARGET_USER="root" @@ -19,8 +19,8 @@ VM_TESTER_PASSWD="root" RABBITMQ_PORT="5672" #load func -source ./ssh.sh -source ./scp.sh +#source ./ssh.sh +#source ./scp.sh function fn_parser_ipaddress(){ #parser and get output ipaddress diff --git a/utils/infra_setup/heat_template/vstf_heat_template/vstf_test.sh b/utils/infra_setup/heat_template/vstf_heat_template/vstf_test.sh index d13a6de6..94e42e23 100644 --- a/utils/infra_setup/heat_template/vstf_heat_template/vstf_test.sh +++ b/utils/infra_setup/heat_template/vstf_heat_template/vstf_test.sh @@ -11,7 +11,7 @@ set -x VM_MANAGER_USER="root" VM_MANAGER_PASSWD="root" -STACK_NAME="vstf" +STACK_NAME="bottlenecks_vstf_stack" function fn_parser_ipaddress(){ #parser and get output ipaddress |