bugfix for image cleanup and python script calling by subprocess shell

[bottlenecks.git] / testsuites / vstf / run_vstf.py

diff --git a/testsuites/vstf/run_vstf.py b/testsuites/vstf/run_vstf.py
index b9c782d..1aed759 100755 (executable)
--- 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:"
@@ -255,9 +256,9 @@ def main():
     target_image_created = False
     stack_created = False
 
-    manager_image_created = vstf_create_images(imagefile=manager_file, image_name="vstf-manager")
-    tester_image_created = vstf_create_images(imagefile=agent_file, image_name="vstf-tester")
-    target_image_created = vstf_create_images(imagefile=agent_file, image_name="vstf-target")
+    manager_image_created = vstf_create_images(imagefile=manager_file, image_name="bottlenecks_vstf_manager")
+    tester_image_created = vstf_create_images(imagefile=agent_file, image_name="bottlenecks_vstf_tester")
+    target_image_created = vstf_create_images(imagefile=agent_file, image_name="bottlenecks_vstf_target")
     keyPath = Bottlenecks_repo_dir + "/utils/infra_setup/bottlenecks_key/bottlenecks_key.pub"
     vstf_create_keypairs(key_path=keyPath)
     vstf_create_flavors()
@@ -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()