diff options
author | 2016-06-30 14:12:54 +0200 | |
---|---|---|
committer | 2016-07-04 07:27:32 +0000 | |
commit | bbc47d487f06da2906116e5ade134e11c4221786 (patch) | |
tree | d52c4ded1b3774b449c8d89b961ab17b0d28e7c5 /ci/prepare_env.py | |
parent | 7388d059ff9f4efed594582ded843f795e56c9fa (diff) |
Change OpenStack clean behaviour
JIRA: FUNCTEST-236
The openstack snapshot generation is now triggered before running
a test case and removed from prepare_env
Change-Id: I4d1bc95dedd7f59d4b1d5866f288e1c1a70ec69e
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'ci/prepare_env.py')
-rw-r--r-- | ci/prepare_env.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 5754a62b..4f29260f 100644 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -12,20 +12,19 @@ # http://www.apache.org/licenses/LICENSE-2.0 # + import argparse import os import re import subprocess import sys -import yaml import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -import functest.utils.generate_defaults as gen_def import functest.utils.openstack_utils as os_utils +import yaml -""" arguments """ actions = ['start', 'check'] parser = argparse.ArgumentParser() parser.add_argument("action", help="Possible actions are: " @@ -241,12 +240,6 @@ def install_rally(): "OpenStack flavors.")) -def generate_os_defaults(): - print_separator() - logger.info("Generating OpenStack defaults...") - gen_def.main() - - def check_environment(): msg_not_active = "The Functest environment is not installed." if not os.path.isfile(ENV_FILE): @@ -274,7 +267,6 @@ def main(): source_rc_file() verify_deployment() install_rally() - generate_os_defaults() with open(ENV_FILE, "w") as env_file: env_file.write("1") |