From 71c4b3b719289929c226cae60eb1b23ada16eeb2 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 12 Apr 2018 20:58:01 +0200 Subject: Fix role processing in Patrole MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Role has to be listed in tempest.conf before calling testr. It also saves the right config file. Change-Id: Ifd122f31d0bfe3e9b3f93c6d62526acce96953d3 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/tempest/conf_utils.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py') diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index be6480e42..6a3d2d6e8 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -14,7 +14,6 @@ import ConfigParser import logging import fileinput import os -import shutil import subprocess import pkg_resources @@ -167,16 +166,6 @@ def get_verifier_deployment_dir(verifier_id, deployment_id): 'for-deployment-{}'.format(deployment_id)) -def backup_tempest_config(conf_file, res_dir): - """ - Copy config file to tempest results directory - """ - if not os.path.exists(res_dir): - os.makedirs(res_dir) - shutil.copyfile(conf_file, - os.path.join(res_dir, 'tempest.conf')) - - def update_tempest_conf_file(conf_file, rconfig): """Update defined paramters into tempest config file""" with open(TEMPEST_CONF_YAML) as yfile: @@ -194,7 +183,7 @@ def update_tempest_conf_file(conf_file, rconfig): rconfig.write(config_file) -def configure_tempest_update_params(tempest_conf_file, res_dir, +def configure_tempest_update_params(tempest_conf_file, network_name=None, image_id=None, flavor_id=None, compute_cnt=1): # pylint: disable=too-many-branches, too-many-arguments @@ -253,8 +242,6 @@ def configure_tempest_update_params(tempest_conf_file, res_dir, 'into tempest.conf file') update_tempest_conf_file(tempest_conf_file, rconfig) - backup_tempest_config(tempest_conf_file, res_dir) - def configure_verifier(deployment_dir): """ -- cgit 1.2.3-korg