X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Ftempest%2Fconf_utils.py;h=338fa51ca0572d908194ebd4d066518d9f334fc1;hb=1da4b519f8e73d3be9e37f9d72367654bf662e63;hp=57a3fcd6c8a08c4dde23c8b0decf2ff6cc96f615;hpb=95c0371e3fe3d515a96d941bf303a853a3f2787b;p=functest.git diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 57a3fcd6c..338fa51ca 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -10,23 +10,21 @@ """Tempest configuration utilities.""" -import ConfigParser +from __future__ import print_function + import logging import fileinput import os -import shutil import subprocess import pkg_resources +from six.moves import configparser import yaml from functest.utils import config from functest.utils import env -import functest.utils.functest_utils as ft_utils -IMAGE_ID_ALT = None -FLAVOR_ID_ALT = None RALLY_CONF_PATH = "/etc/rally/rally.conf" RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename( 'functest', 'ci/rally_aarch64_patch.conf') @@ -39,9 +37,6 @@ TEMPEST_BLACKLIST = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.txt') TEMPEST_CONF_YAML = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml') -TEST_ACCOUNTS_FILE = pkg_resources.resource_filename( - 'functest', - 'opnfv_tests/openstack/tempest/custom_tests/test_accounts.yaml') CI_INSTALLER_TYPE = env.get('INSTALLER_TYPE') @@ -49,7 +44,7 @@ CI_INSTALLER_TYPE = env.get('INSTALLER_TYPE') LOGGER = logging.getLogger(__name__) -def create_rally_deployment(): +def create_rally_deployment(environ=None): """Create new rally deployment""" # set the architecture to default pod_arch = env.get("POD_ARCH") @@ -60,42 +55,50 @@ def create_rally_deployment(): with open(RALLY_AARCH64_PATCH_PATH, "r") as pfile: rally_patch_conf = pfile.read() - for line in fileinput.input(RALLY_CONF_PATH, inplace=1): - print line, + for line in fileinput.input(RALLY_CONF_PATH): + print(line, end=' ') if "cirros|testvm" in line: - print rally_patch_conf + print(rally_patch_conf) LOGGER.info("Creating Rally environment...") - cmd = "rally deployment destroy opnfv-rally" - ft_utils.execute_command(cmd, error_msg=( - "Deployment %s does not exist." - % getattr(config.CONF, 'rally_deployment_name')), verbose=False) + try: + cmd = ['rally', 'deployment', 'destroy', + '--deployment', + str(getattr(config.CONF, 'rally_deployment_name'))] + output = subprocess.check_output(cmd) + LOGGER.info("%s\n%s", " ".join(cmd), output) + except subprocess.CalledProcessError: + pass - cmd = ("rally deployment create --fromenv --name={0}" - .format(getattr(config.CONF, 'rally_deployment_name'))) - error_msg = "Problem while creating Rally deployment" - ft_utils.execute_command_raise(cmd, error_msg=error_msg) + cmd = ['rally', 'deployment', 'create', '--fromenv', + '--name', str(getattr(config.CONF, 'rally_deployment_name'))] + output = subprocess.check_output(cmd, env=environ) + LOGGER.info("%s\n%s", " ".join(cmd), output) - cmd = "rally deployment check" - error_msg = "OpenStack not responding or faulty Rally deployment." - ft_utils.execute_command_raise(cmd, error_msg=error_msg) + cmd = ['rally', 'deployment', 'check'] + output = subprocess.check_output(cmd) + LOGGER.info("%s\n%s", " ".join(cmd), output) def create_verifier(): """Create new verifier""" LOGGER.info("Create verifier from existing repo...") - cmd = ("rally verify delete-verifier --id '{0}' --force").format( - getattr(config.CONF, 'tempest_verifier_name')) - ft_utils.execute_command(cmd, error_msg=( - "Verifier %s does not exist." - % getattr(config.CONF, 'tempest_verifier_name')), verbose=False) - cmd = ("rally verify create-verifier --source {0} " - "--name {1} --type tempest --system-wide" - .format(getattr(config.CONF, 'dir_repo_tempest'), - getattr(config.CONF, 'tempest_verifier_name'))) - ft_utils.execute_command_raise(cmd, - error_msg='Problem while creating verifier') + cmd = ['rally', 'verify', 'delete-verifier', + '--id', str(getattr(config.CONF, 'tempest_verifier_name')), + '--force'] + try: + output = subprocess.check_output(cmd) + LOGGER.info("%s\n%s", " ".join(cmd), output) + except subprocess.CalledProcessError: + pass + + cmd = ['rally', 'verify', 'create-verifier', + '--source', str(getattr(config.CONF, 'dir_repo_tempest')), + '--name', str(getattr(config.CONF, 'tempest_verifier_name')), + '--type', 'tempest', '--system-wide'] + output = subprocess.check_output(cmd) + LOGGER.info("%s\n%s", " ".join(cmd), output) def get_verifier_id(): @@ -163,48 +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 configure_tempest(deployment_dir, res_dir, network_name=None, - image_id=None, flavor_id=None, compute_cnt=None): - # pylint: disable=too-many-arguments - """ - Calls rally verify and updates the generated tempest.conf with - given parameters - """ - conf_file = configure_verifier(deployment_dir) - configure_tempest_update_params(conf_file, res_dir, network_name, image_id, - flavor_id, compute_cnt) - - -def generate_test_accounts_file(tenant_id): - """ - Add needed tenant and user params into test_accounts.yaml - """ - - LOGGER.debug("Add needed params into test_accounts.yaml...") - accounts_list = [ - { - 'tenant_name': getattr( - config.CONF, 'tempest_identity_tenant_name'), - 'tenant_id': str(tenant_id), - 'username': getattr(config.CONF, 'tempest_identity_user_name'), - 'password': getattr(config.CONF, 'tempest_identity_user_password') - } - ] - - with open(TEST_ACCOUNTS_FILE, "w") as tfile: - yaml.dump(accounts_list, tfile, default_flow_style=False) - - def update_tempest_conf_file(conf_file, rconfig): """Update defined paramters into tempest config file""" with open(TEMPEST_CONF_YAML) as yfile: @@ -222,33 +183,33 @@ def update_tempest_conf_file(conf_file, rconfig): rconfig.write(config_file) -def configure_tempest_update_params(tempest_conf_file, res_dir, - network_name=None, image_id=None, - flavor_id=None, compute_cnt=1): +def configure_tempest_update_params( + tempest_conf_file, network_name=None, image_id=None, flavor_id=None, + compute_cnt=1, image_alt_id=None, flavor_alt_id=None): # pylint: disable=too-many-branches, too-many-arguments """ Add/update needed parameters into tempest.conf file """ LOGGER.debug("Updating selected tempest.conf parameters...") - rconfig = ConfigParser.RawConfigParser() + rconfig = configparser.RawConfigParser() rconfig.read(tempest_conf_file) rconfig.set('compute', 'fixed_network_name', network_name) rconfig.set('compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME')) if image_id is not None: rconfig.set('compute', 'image_ref', image_id) - if IMAGE_ID_ALT is not None: - rconfig.set('compute', 'image_ref_alt', IMAGE_ID_ALT) - if getattr(config.CONF, 'tempest_use_custom_flavors'): - if flavor_id is not None: - rconfig.set('compute', 'flavor_ref', flavor_id) - if FLAVOR_ID_ALT is not None: - rconfig.set('compute', 'flavor_ref_alt', FLAVOR_ID_ALT) + if image_alt_id is not None: + rconfig.set('compute', 'image_ref_alt', image_alt_id) + if flavor_id is not None: + rconfig.set('compute', 'flavor_ref', flavor_id) + if flavor_alt_id is not None: + rconfig.set('compute', 'flavor_ref_alt', flavor_alt_id) if compute_cnt > 1: # enable multinode tests rconfig.set('compute', 'min_compute_nodes', compute_cnt) rconfig.set('compute-feature-enabled', 'live_migration', True) - - rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME')) + rconfig.set('compute-feature-enabled', 'shelve', False) + if os.environ.get('OS_REGION_NAME'): + rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME')) identity_api_version = os.environ.get("OS_IDENTITY_API_VERSION", '3') if identity_api_version == '3': auth_version = 'v3' @@ -262,43 +223,36 @@ def configure_tempest_update_params(tempest_conf_file, res_dir, rconfig.set('object-storage', 'operator_role', getattr(config.CONF, 'tempest_object_storage_operator_role')) - if os.environ.get('OS_ENDPOINT_TYPE') is not None: - rconfig.set('identity', 'v3_endpoint_type', - os.environ.get('OS_ENDPOINT_TYPE')) - - if os.environ.get('OS_ENDPOINT_TYPE') is not None: - sections = rconfig.sections() - services_list = [ - 'compute', 'volume', 'image', 'network', 'data-processing', - 'object-storage', 'orchestration'] - for service in services_list: - if service not in sections: - rconfig.add_section(service) - rconfig.set(service, 'endpoint_type', - os.environ.get('OS_ENDPOINT_TYPE')) + rconfig.set( + 'identity', 'v3_endpoint_type', + os.environ.get('OS_INTERFACE', 'public')) + + sections = rconfig.sections() + services_list = [ + 'compute', 'volume', 'image', 'network', 'data-processing', + 'object-storage', 'orchestration'] + for service in services_list: + if service not in sections: + rconfig.add_section(service) + rconfig.set( + service, 'endpoint_type', os.environ.get('OS_INTERFACE', 'public')) LOGGER.debug('Add/Update required params defined in tempest_conf.yaml ' '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): """ Execute rally verify configure-verifier, which generates tempest.conf """ - tempest_conf_file = os.path.join(deployment_dir, "tempest.conf") - if os.path.isfile(tempest_conf_file): - LOGGER.debug("Verifier is already configured.") - LOGGER.debug("Reconfiguring the current verifier...") - cmd = "rally verify configure-verifier --reconfigure" - else: - LOGGER.info("Configuring the verifier...") - cmd = "rally verify configure-verifier" - ft_utils.execute_command(cmd) + cmd = ['rally', 'verify', 'configure-verifier', '--reconfigure', + '--id', str(getattr(config.CONF, 'tempest_verifier_name'))] + output = subprocess.check_output(cmd) + LOGGER.info("%s\n%s", " ".join(cmd), output) LOGGER.debug("Looking for tempest.conf file...") + tempest_conf_file = os.path.join(deployment_dir, "tempest.conf") if not os.path.isfile(tempest_conf_file): LOGGER.error("Tempest configuration file %s NOT found.", tempest_conf_file)