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
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__)
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:
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)
"""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')
create_rally_deployment()
create_verifier()
cmd = ("rally verify list-verifiers | awk '/" +
- CONST.__getattribute__('tempest_verifier_name') +
+ getattr(config.CONF, 'tempest_verifier_name') +
"/ {print $2}'")
proc = subprocess.Popen(cmd, shell=True,
stdout=subprocess.PIPE,
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}'")
proc = subprocess.Popen(cmd, shell=True,
stdout=subprocess.PIPE,
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')
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'))
-
-
-def configure_tempest(deployment_dir, network_name=None, image_id=None,
- flavor_id=None, compute_cnt=None):
- """
- Calls rally verify and updates the generated tempest.conf with
- given parameters
- """
- conf_file = configure_verifier(deployment_dir)
- configure_tempest_update_params(conf_file, network_name, image_id,
- flavor_id, compute_cnt)
-
-
-def configure_tempest_defcore(deployment_dir, network_name, image_id,
- flavor_id, image_id_alt, flavor_id_alt,
- tenant_id):
- # pylint: disable=too-many-arguments
- """
- Add/update needed parameters into tempest.conf file
- """
- conf_file = configure_verifier(deployment_dir)
- configure_tempest_update_params(conf_file, network_name, 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)
-
-
-def generate_test_accounts_file(tenant_id):
- """
- Add needed tenant and user params into test_accounts.yaml
- """
+ os.path.join(res_dir, 'tempest.conf'))
- LOGGER.debug("Add needed params into test_accounts.yaml...")
- accounts_list = [
- {
- 'tenant_name':
- CONST.__getattribute__('tempest_identity_tenant_name'),
- 'tenant_id': str(tenant_id),
- 'username': CONST.__getattribute__('tempest_identity_user_name'),
- 'password':
- CONST.__getattribute__('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, config):
+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 = config.sections()
+ sections = rconfig.sections()
for section in conf_yaml:
if section not in sections:
- config.add_section(section)
+ rconfig.add_section(section)
sub_conf = conf_yaml.get(section)
for key, value in sub_conf.items():
- config.set(section, key, value)
+ rconfig.set(section, key, value)
with open(conf_file, 'wb') as config_file:
- config.write(config_file)
+ rconfig.write(config_file)
-def configure_tempest_update_params(tempest_conf_file, network_name=None,
- image_id=None, flavor_id=None,
- compute_cnt=1):
+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', network_name)
- config.set('compute', 'volume_device_name',
- CONST.__getattribute__('tempest_volume_device_name'))
-
+ 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:
- 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',
- CONST.__getattribute__('OS_REGION_NAME'))
- identity_api_version = os.getenv(
- "OS_IDENTITY_API_VERSION", os.getenv("IDENTITY_API_VERSION"))
+ 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'
- config.set('identity-feature-enabled', 'api_v2', False)
+ 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 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'))
+
+ rconfig.set('network-feature-enabled', 'api_extensions', 'all')
+
+ 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 '
'into tempest.conf file')
- update_tempest_conf_file(tempest_conf_file, config)
+ 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):
Code Review / functest.git / blobdiff