diff options
| -rwxr-xr-x | testsuites/vstf/run_vstf.py | 6 | ||||
| -rwxr-xr-x | testsuites/vstf/testcase_cfg/vstf_heat_template.yaml | 6 | ||||
| -rwxr-xr-x | testsuites/vstf/vstf_collector.py (renamed from utils/infra_setup/heat_template/vstf_heat_template/vstf_collector.py) | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/testsuites/vstf/run_vstf.py b/testsuites/vstf/run_vstf.py index 319f0055..1aed7596 100755 --- a/testsuites/vstf/run_vstf.py +++ b/testsuites/vstf/run_vstf.py @@ -256,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() diff --git a/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml b/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml index a649771f..b69abfd7 100755 --- a/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml @@ -19,15 +19,15 @@ parameters: image_vstf_manager: type: string description: Name of image to use for servers - default: vstf-manager + default: bottlenecks_vstf_manager image_vstf_tester: type: string description: Name of image to use for servers - default: vstf-tester + default: bottlenecks_vstf_tester image_vstf_target: type: string description: Name of image to use for servers - default: vstf-target + default: bottlenecks_vstf_target #nova flavor-list to query available flavors flavor: type: string diff --git a/utils/infra_setup/heat_template/vstf_heat_template/vstf_collector.py b/testsuites/vstf/vstf_collector.py index b1d45434..7206e32d 100755 --- a/utils/infra_setup/heat_template/vstf_heat_template/vstf_collector.py +++ b/testsuites/vstf/vstf_collector.py @@ -11,10 +11,8 @@ import argparse import json
import requests
import logging
-__author__ = "qwyang0126@gmail.com"
-__date__ = "2016-01-11"
-LOG = logging.getLogger(__name__)
+LOG = logging.getLogger(__name__)
class Uploader(object):
def __init__(self, conf):
|