X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Ftempest%2Fconf_utils.py;h=6121ab9707ae8124935846b5d16f5d4e61fa3a2a;hb=632556645e8b3a4487c59e311e2cd43147c8d082;hp=03e9631a9f21e1b0f4bb5dfb271273041ccef61e;hpb=ac2c2e12aad1c4e84dd8df29beeef85611f5cbc8;p=functest.git diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 03e9631a9..6121ab970 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -7,17 +7,21 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # + +"""Tempest configuration utilities.""" + import ConfigParser import logging import fileinput import os -import pkg_resources import shutil import subprocess +import pkg_resources import yaml -from functest.utils.constants import CONST +from functest.utils import config +from functest.utils import env import functest.utils.functest_utils as ft_utils @@ -27,59 +31,49 @@ RALLY_CONF_PATH = "/etc/rally/rally.conf" RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename( 'functest', 'ci/rally_aarch64_patch.conf') GLANCE_IMAGE_PATH = os.path.join( - CONST.__getattribute__('dir_functest_images'), - CONST.__getattribute__('openstack_image_file_name')) -TEMPEST_RESULTS_DIR = os.path.join(CONST.__getattribute__('dir_results'), - 'tempest') + getattr(config.CONF, 'dir_functest_images'), + getattr(config.CONF, 'openstack_image_file_name')) TEMPEST_CUSTOM = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/test_list.txt') TEMPEST_BLACKLIST = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.txt') -TEMPEST_DEFCORE = pkg_resources.resource_filename( - 'functest', - 'opnfv_tests/openstack/tempest/custom_tests/defcore_req.txt') -TEMPEST_RAW_LIST = os.path.join(TEMPEST_RESULTS_DIR, 'test_raw_list.txt') -TEMPEST_LIST = os.path.join(TEMPEST_RESULTS_DIR, 'test_list.txt') -REFSTACK_RESULTS_DIR = os.path.join(CONST.__getattribute__('dir_results'), - 'refstack') 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 = CONST.__getattribute__('INSTALLER_TYPE') -CI_INSTALLER_IP = CONST.__getattribute__('INSTALLER_IP') +CI_INSTALLER_TYPE = env.get('INSTALLER_TYPE') """ logging configuration """ -logger = logging.getLogger(__name__) +LOGGER = logging.getLogger(__name__) def create_rally_deployment(): + """Create new rally deployment""" # set the architecture to default - pod_arch = os.getenv("POD_ARCH", None) + pod_arch = env.get("POD_ARCH") arch_filter = ['aarch64'] if pod_arch and pod_arch in arch_filter: - logger.info("Apply aarch64 specific to rally config...") - with open(RALLY_AARCH64_PATCH_PATH, "r") as f: - rally_patch_conf = f.read() + LOGGER.info("Apply aarch64 specific to rally config...") + 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, if "cirros|testvm" in line: print rally_patch_conf - logger.info("Creating Rally environment...") + LOGGER.info("Creating Rally environment...") cmd = "rally deployment destroy opnfv-rally" ft_utils.execute_command(cmd, error_msg=( "Deployment %s does not exist." - % CONST.__getattribute__('rally_deployment_name')), - verbose=False) + % getattr(config.CONF, 'rally_deployment_name')), verbose=False) cmd = ("rally deployment create --fromenv --name={0}" - .format(CONST.__getattribute__('rally_deployment_name'))) + .format(getattr(config.CONF, 'rally_deployment_name'))) error_msg = "Problem while creating Rally deployment" ft_utils.execute_command_raise(cmd, error_msg=error_msg) @@ -89,17 +83,17 @@ def create_rally_deployment(): def create_verifier(): - logger.info("Create verifier from existing repo...") + """Create new verifier""" + LOGGER.info("Create verifier from existing repo...") cmd = ("rally verify delete-verifier --id '{0}' --force").format( - CONST.__getattribute__('tempest_verifier_name')) + getattr(config.CONF, 'tempest_verifier_name')) ft_utils.execute_command(cmd, error_msg=( "Verifier %s does not exist." - % CONST.__getattribute__('tempest_verifier_name')), - verbose=False) + % getattr(config.CONF, 'tempest_verifier_name')), verbose=False) cmd = ("rally verify create-verifier --source {0} " "--name {1} --type tempest --system-wide" - .format(CONST.__getattribute__('dir_repo_tempest'), - CONST.__getattribute__('tempest_verifier_name'))) + .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') @@ -111,14 +105,14 @@ def get_verifier_id(): create_rally_deployment() create_verifier() cmd = ("rally verify list-verifiers | awk '/" + - CONST.__getattribute__('tempest_verifier_name') + + getattr(config.CONF, 'tempest_verifier_name') + "/ {print $2}'") - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - deployment_uuid = p.stdout.readline().rstrip() + proc = subprocess.Popen(cmd, shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + deployment_uuid = proc.stdout.readline().rstrip() if deployment_uuid == "": - logger.error("Tempest verifier not found.") + LOGGER.error("Tempest verifier not found.") raise Exception('Error with command:%s' % cmd) return deployment_uuid @@ -128,14 +122,14 @@ def get_verifier_deployment_id(): Returns deployment id for active Rally deployment """ cmd = ("rally deployment list | awk '/" + - CONST.__getattribute__('rally_deployment_name') + + getattr(config.CONF, 'rally_deployment_name') + "/ {print $2}'") - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - deployment_uuid = p.stdout.readline().rstrip() + proc = subprocess.Popen(cmd, shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + deployment_uuid = proc.stdout.readline().rstrip() if deployment_uuid == "": - logger.error("Rally deployment not found.") + LOGGER.error("Rally deployment not found.") raise Exception('Error with command:%s' % cmd) return deployment_uuid @@ -147,7 +141,7 @@ def get_verifier_repo_dir(verifier_id): if not verifier_id: verifier_id = get_verifier_id() - return os.path.join(CONST.__getattribute__('dir_rally_inst'), + return os.path.join(getattr(config.CONF, 'dir_rally_inst'), 'verification', 'verifier-{}'.format(verifier_id), 'repo') @@ -163,63 +157,32 @@ def get_verifier_deployment_dir(verifier_id, deployment_id): if not deployment_id: deployment_id = get_verifier_deployment_id() - return os.path.join(CONST.__getattribute__('dir_rally_inst'), + return os.path.join(getattr(config.CONF, 'dir_rally_inst'), 'verification', 'verifier-{}'.format(verifier_id), 'for-deployment-{}'.format(deployment_id)) -def backup_tempest_config(conf_file): +def backup_tempest_config(conf_file, res_dir): """ Copy config file to tempest results directory """ - if not os.path.exists(TEMPEST_RESULTS_DIR): - os.makedirs(TEMPEST_RESULTS_DIR) + if not os.path.exists(res_dir): + os.makedirs(res_dir) shutil.copyfile(conf_file, - os.path.join(TEMPEST_RESULTS_DIR, 'tempest.conf')) + os.path.join(res_dir, 'tempest.conf')) -def configure_tempest(deployment_dir, image_id=None, flavor_id=None, - compute_cnt=None): +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, image_id, flavor_id, - compute_cnt) - - -def configure_tempest_defcore(deployment_dir, image_id, flavor_id, - image_id_alt, flavor_id_alt, tenant_id): - """ - Add/update needed parameters into tempest.conf file - """ - conf_file = configure_verifier(deployment_dir) - configure_tempest_update_params(conf_file, image_id, flavor_id) - - logger.debug("Updating selected tempest.conf parameters for defcore...") - config = ConfigParser.RawConfigParser() - config.read(conf_file) - config.set('DEFAULT', 'log_file', '{}/tempest.log'.format(deployment_dir)) - config.set('oslo_concurrency', 'lock_path', - '{}/lock_files'.format(deployment_dir)) - generate_test_accounts_file(tenant_id=tenant_id) - config.set('auth', 'test_accounts_file', TEST_ACCOUNTS_FILE) - config.set('scenario', 'img_dir', '{}'.format(deployment_dir)) - config.set('scenario', 'img_file', 'tempest-image') - config.set('compute', 'image_ref', image_id) - config.set('compute', 'image_ref_alt', image_id_alt) - config.set('compute', 'flavor_ref', flavor_id) - config.set('compute', 'flavor_ref_alt', flavor_id_alt) - - with open(conf_file, 'wb') as config_file: - config.write(config_file) - - confpath = pkg_resources.resource_filename( - 'functest', - 'opnfv_tests/openstack/refstack_client/refstack_tempest.conf') - shutil.copyfile(conf_file, confpath) + configure_tempest_update_params(conf_file, res_dir, network_name, image_id, + flavor_id, compute_cnt) def generate_test_accounts_file(tenant_id): @@ -227,104 +190,103 @@ 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...") + LOGGER.debug("Add needed params into test_accounts.yaml...") accounts_list = [ { - 'tenant_name': - CONST.__getattribute__('tempest_identity_tenant_name'), + 'tenant_name': getattr( + config.CONF, 'tempest_identity_tenant_name'), 'tenant_id': str(tenant_id), - 'username': CONST.__getattribute__('tempest_identity_user_name'), - 'password': - CONST.__getattribute__('tempest_identity_user_password') + 'username': getattr(config.CONF, 'tempest_identity_user_name'), + 'password': getattr(config.CONF, 'tempest_identity_user_password') } ] - with open(TEST_ACCOUNTS_FILE, "w") as f: - yaml.dump(accounts_list, f, default_flow_style=False) + with open(TEST_ACCOUNTS_FILE, "w") as tfile: + yaml.dump(accounts_list, tfile, default_flow_style=False) -def configure_tempest_update_params(tempest_conf_file, image_id=None, +def update_tempest_conf_file(conf_file, rconfig): + """Update defined paramters into tempest config file""" + with open(TEMPEST_CONF_YAML) as yfile: + conf_yaml = yaml.safe_load(yfile) + if conf_yaml: + sections = rconfig.sections() + for section in conf_yaml: + if section not in sections: + rconfig.add_section(section) + sub_conf = conf_yaml.get(section) + for key, value in sub_conf.items(): + rconfig.set(section, key, value) + + with open(conf_file, 'wb') as config_file: + 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): + # pylint: disable=too-many-branches, too-many-arguments """ Add/update needed parameters into tempest.conf file """ - logger.debug("Updating selected tempest.conf parameters...") - config = ConfigParser.RawConfigParser() - config.read(tempest_conf_file) - config.set( - 'compute', - 'fixed_network_name', - CONST.__getattribute__('tempest_private_net_name')) - config.set('compute', 'volume_device_name', - CONST.__getattribute__('tempest_volume_device_name')) - + LOGGER.debug("Updating selected tempest.conf parameters...") + rconfig = ConfigParser.RawConfigParser() + rconfig.read(tempest_conf_file) + rconfig.set('compute', 'fixed_network_name', network_name) + if CI_INSTALLER_TYPE == 'fuel': + # backward compatibility till Fuel jobs set the right env var + rconfig.set('compute', 'volume_device_name', 'vdc') + else: + rconfig.set( + 'compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME')) if image_id is not None: - config.set('compute', 'image_ref', image_id) + rconfig.set('compute', 'image_ref', image_id) if IMAGE_ID_ALT is not None: - config.set('compute', 'image_ref_alt', IMAGE_ID_ALT) - if CONST.__getattribute__('tempest_use_custom_flavors'): + rconfig.set('compute', 'image_ref_alt', IMAGE_ID_ALT) + if getattr(config.CONF, 'tempest_use_custom_flavors'): if flavor_id is not None: - config.set('compute', 'flavor_ref', flavor_id) + rconfig.set('compute', 'flavor_ref', flavor_id) if FLAVOR_ID_ALT is not None: - config.set('compute', 'flavor_ref_alt', FLAVOR_ID_ALT) + rconfig.set('compute', 'flavor_ref_alt', FLAVOR_ID_ALT) if compute_cnt > 1: # enable multinode tests - config.set('compute', 'min_compute_nodes', compute_cnt) - config.set('compute-feature-enabled', 'live_migration', True) + rconfig.set('compute', 'min_compute_nodes', compute_cnt) + rconfig.set('compute-feature-enabled', 'live_migration', True) - config.set('identity', 'region', 'RegionOne') - identity_api_version = os.getenv( - "OS_IDENTITY_API_VERSION", os.getenv("IDENTITY_API_VERSION")) - if (identity_api_version == '3'): + 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' + rconfig.set('identity-feature-enabled', 'api_v2', False) else: auth_version = 'v2' - config.set('identity', 'auth_version', auth_version) - config.set( + rconfig.set('identity', 'auth_version', auth_version) + rconfig.set( 'validation', 'ssh_timeout', - CONST.__getattribute__('tempest_validation_ssh_timeout')) - config.set('object-storage', 'operator_role', - CONST.__getattribute__('tempest_object_storage_operator_role')) - - if CONST.__getattribute__('OS_ENDPOINT_TYPE') is not None: - config.set('identity', 'v3_endpoint_type', - CONST.__getattribute__('OS_ENDPOINT_TYPE')) - - if (identity_api_version == '3'): - config.set('identity-feature-enabled', 'api_v2', False) - - if CONST.__getattribute__('OS_ENDPOINT_TYPE') is not None: - sections = config.sections() - services_list = ['compute', - 'volume', - 'image', - 'network', - 'data-processing', - 'object-storage', - 'orchestration'] + getattr(config.CONF, 'tempest_validation_ssh_timeout')) + 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: - config.add_section(service) - config.set(service, 'endpoint_type', - CONST.__getattribute__('OS_ENDPOINT_TYPE')) + rconfig.add_section(service) + rconfig.set(service, 'endpoint_type', + os.environ.get('OS_ENDPOINT_TYPE')) - logger.debug('Add/Update required params defined in tempest_conf.yaml ' + LOGGER.debug('Add/Update required params defined in tempest_conf.yaml ' 'into tempest.conf file') - with open(TEMPEST_CONF_YAML) as f: - conf_yaml = yaml.safe_load(f) - if conf_yaml: - sections = config.sections() - for section in conf_yaml: - if section not in sections: - config.add_section(section) - sub_conf = conf_yaml.get(section) - for key, value in sub_conf.items(): - config.set(section, key, value) - - with open(tempest_conf_file, 'wb') as config_file: - config.write(config_file) + update_tempest_conf_file(tempest_conf_file, rconfig) - backup_tempest_config(tempest_conf_file) + backup_tempest_config(tempest_conf_file, res_dir) def configure_verifier(deployment_dir): @@ -333,18 +295,18 @@ def configure_verifier(deployment_dir): """ 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...") + LOGGER.debug("Verifier is already configured.") + LOGGER.debug("Reconfiguring the current verifier...") cmd = "rally verify configure-verifier --reconfigure" else: - logger.info("Configuring the verifier...") + LOGGER.info("Configuring the verifier...") cmd = "rally verify configure-verifier" ft_utils.execute_command(cmd) - logger.debug("Looking for tempest.conf file...") + LOGGER.debug("Looking for tempest.conf file...") if not os.path.isfile(tempest_conf_file): - logger.error("Tempest configuration file %s NOT found." - % tempest_conf_file) + LOGGER.error("Tempest configuration file %s NOT found.", + tempest_conf_file) raise Exception("Tempest configuration file %s NOT found." % tempest_conf_file) else: