aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-02-22 17:43:35 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-02-22 19:41:31 +0100
commit9f7c63ffaf64b3ca81ae86a0b3477e5007916fcd (patch)
tree71d1e082404d4356a1f3491482c03bbb6a6914a5 /functest/opnfv_tests/openstack/tempest
parentd701e9737f83ff29faba830df426b5a75c9746b1 (diff)
Switch from CONST to CONF
It also removes constants.CONST and env.Environment which are now useless. Depends-On: I764a0a2a24447c941d1e726f3116593b29dd1c1e Depends-On: I6cfa832466dcefd737314633d807512e46267a69 Change-Id: Ife41c59d9f2e6ec4e49df38af962039f99554bc5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py128
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py50
2 files changed, 92 insertions, 86 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 875939ec..4fe05e46 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -20,7 +20,7 @@ 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
@@ -31,9 +31,10 @@ 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(
- getattr(CONST, 'dir_functest_images'),
- getattr(CONST, 'openstack_image_file_name'))
-TEMPEST_RESULTS_DIR = os.path.join(getattr(CONST, 'dir_results'), 'tempest')
+ getattr(config.CONF, 'dir_functest_images'),
+ getattr(config.CONF, 'openstack_image_file_name'))
+TEMPEST_RESULTS_DIR = os.path.join(
+ getattr(config.CONF, 'dir_results'), 'tempest')
TEMPEST_CUSTOM = pkg_resources.resource_filename(
'functest', 'opnfv_tests/openstack/tempest/custom_tests/test_list.txt')
TEMPEST_BLACKLIST = pkg_resources.resource_filename(
@@ -43,7 +44,8 @@ TEMPEST_DEFCORE = pkg_resources.resource_filename(
'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(getattr(CONST, 'dir_results'), 'refstack')
+REFSTACK_RESULTS_DIR = os.path.join(
+ getattr(config.CONF, '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(
@@ -77,11 +79,10 @@ def create_rally_deployment():
cmd = "rally deployment destroy opnfv-rally"
ft_utils.execute_command(cmd, error_msg=(
"Deployment %s does not exist."
- % getattr(CONST, 'rally_deployment_name')),
- verbose=False)
+ % getattr(config.CONF, 'rally_deployment_name')), verbose=False)
cmd = ("rally deployment create --fromenv --name={0}"
- .format(getattr(CONST, '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)
@@ -94,15 +95,15 @@ def create_verifier():
"""Create new verifier"""
LOGGER.info("Create verifier from existing repo...")
cmd = ("rally verify delete-verifier --id '{0}' --force").format(
- getattr(CONST, 'tempest_verifier_name'))
+ getattr(config.CONF, 'tempest_verifier_name'))
ft_utils.execute_command(cmd, error_msg=(
"Verifier %s does not exist."
- % getattr(CONST, 'tempest_verifier_name')),
+ % getattr(config.CONF, 'tempest_verifier_name')),
verbose=False)
cmd = ("rally verify create-verifier --source {0} "
"--name {1} --type tempest --system-wide"
- .format(getattr(CONST, 'dir_repo_tempest'),
- getattr(CONST, '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')
@@ -114,7 +115,7 @@ def get_verifier_id():
create_rally_deployment()
create_verifier()
cmd = ("rally verify list-verifiers | awk '/" +
- getattr(CONST, 'tempest_verifier_name') +
+ getattr(config.CONF, 'tempest_verifier_name') +
"/ {print $2}'")
proc = subprocess.Popen(cmd, shell=True,
stdout=subprocess.PIPE,
@@ -131,7 +132,7 @@ def get_verifier_deployment_id():
Returns deployment id for active Rally deployment
"""
cmd = ("rally deployment list | awk '/" +
- getattr(CONST, 'rally_deployment_name') +
+ getattr(config.CONF, 'rally_deployment_name') +
"/ {print $2}'")
proc = subprocess.Popen(cmd, shell=True,
stdout=subprocess.PIPE,
@@ -150,7 +151,7 @@ def get_verifier_repo_dir(verifier_id):
if not verifier_id:
verifier_id = get_verifier_id()
- return os.path.join(getattr(CONST, 'dir_rally_inst'),
+ return os.path.join(getattr(config.CONF, 'dir_rally_inst'),
'verification',
'verifier-{}'.format(verifier_id),
'repo')
@@ -166,7 +167,7 @@ def get_verifier_deployment_dir(verifier_id, deployment_id):
if not deployment_id:
deployment_id = get_verifier_deployment_id()
- return os.path.join(getattr(CONST, 'dir_rally_inst'),
+ return os.path.join(getattr(config.CONF, 'dir_rally_inst'),
'verification',
'verifier-{}'.format(verifier_id),
'for-deployment-{}'.format(deployment_id))
@@ -205,22 +206,22 @@ def configure_tempest_defcore(deployment_dir, 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))
+ rconfig = ConfigParser.RawConfigParser()
+ rconfig.read(conf_file)
+ rconfig.set('DEFAULT', 'log_file', '{}/tempest.log'.format(deployment_dir))
+ rconfig.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)
+ rconfig.set('auth', 'test_accounts_file', TEST_ACCOUNTS_FILE)
+ rconfig.set('scenario', 'img_dir', '{}'.format(deployment_dir))
+ rconfig.set('scenario', 'img_file', 'tempest-image')
+ rconfig.set('compute', 'image_ref', image_id)
+ rconfig.set('compute', 'image_ref_alt', image_id_alt)
+ rconfig.set('compute', 'flavor_ref', flavor_id)
+ rconfig.set('compute', 'flavor_ref_alt', flavor_id_alt)
with open(conf_file, 'wb') as config_file:
- config.write(config_file)
+ rconfig.write(config_file)
confpath = pkg_resources.resource_filename(
'functest',
@@ -236,10 +237,11 @@ def generate_test_accounts_file(tenant_id):
LOGGER.debug("Add needed params into test_accounts.yaml...")
accounts_list = [
{
- 'tenant_name': getattr(CONST, 'tempest_identity_tenant_name'),
+ 'tenant_name': getattr(
+ config.CONF, 'tempest_identity_tenant_name'),
'tenant_id': str(tenant_id),
- 'username': getattr(CONST, 'tempest_identity_user_name'),
- 'password': getattr(CONST, 'tempest_identity_user_password')
+ 'username': getattr(config.CONF, 'tempest_identity_user_name'),
+ 'password': getattr(config.CONF, 'tempest_identity_user_password')
}
]
@@ -247,21 +249,21 @@ def generate_test_accounts_file(tenant_id):
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,
@@ -271,47 +273,47 @@ def configure_tempest_update_params(tempest_conf_file, network_name=None,
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',
- getattr(CONST, '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',
+ getattr(config.CONF, 'tempest_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 getattr(CONST, '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', 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", os.environ.get("IDENTITY_API_VERSION"))
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',
- getattr(CONST, 'tempest_validation_ssh_timeout'))
- config.set('object-storage', 'operator_role',
- getattr(CONST, 'tempest_object_storage_operator_role'))
+ 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:
- config.set('identity', 'v3_endpoint_type',
- os.environ.get('OS_ENDPOINT_TYPE'))
+ rconfig.set('identity', 'v3_endpoint_type',
+ os.environ.get('OS_ENDPOINT_TYPE'))
if os.environ.get('OS_ENDPOINT_TYPE') is not None:
- sections = config.sections()
+ sections = rconfig.sections()
services_list = ['compute',
'volume',
'image',
@@ -321,13 +323,13 @@ def configure_tempest_update_params(tempest_conf_file, network_name=None,
'orchestration']
for service in services_list:
if service not in sections:
- config.add_section(service)
- config.set(service, 'endpoint_type',
- os.environ.get('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)
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index d474ec3a..a13b6dc5 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -25,7 +25,7 @@ import yaml
from functest.core import testcase
from functest.opnfv_tests.openstack.snaps import snaps_utils
from functest.opnfv_tests.openstack.tempest import conf_utils
-from functest.utils.constants import CONST
+from functest.utils import config
from functest.utils import env
import functest.utils.functest_utils as ft_utils
@@ -330,16 +330,17 @@ class TempestResourcesManager(object):
self.os_creds = kwargs.get('os_creds') or snaps_utils.get_credentials()
self.guid = '-' + str(uuid.uuid4())
self.creators = list()
- self.cirros_image_config = getattr(CONST, 'snaps_images_cirros', None)
+ self.cirros_image_config = getattr(
+ config.CONF, 'snaps_images_cirros', None)
def _create_project(self):
"""Create project for tests."""
project_creator = deploy_utils.create_project(
self.os_creds, ProjectConfig(
name=getattr(
- CONST, 'tempest_identity_tenant_name') + self.guid,
+ config.CONF, 'tempest_identity_tenant_name') + self.guid,
description=getattr(
- CONST, 'tempest_identity_tenant_description')))
+ config.CONF, 'tempest_identity_tenant_description')))
if project_creator is None or project_creator.get_project() is None:
raise Exception("Failed to create tenant")
self.creators.append(project_creator)
@@ -350,11 +351,11 @@ class TempestResourcesManager(object):
user_creator = deploy_utils.create_user(
self.os_creds, UserConfig(
name=getattr(
- CONST, 'tempest_identity_user_name') + self.guid,
+ config.CONF, 'tempest_identity_user_name') + self.guid,
password=getattr(
- CONST, 'tempest_identity_user_password'),
+ config.CONF, 'tempest_identity_user_password'),
project_name=getattr(
- CONST, 'tempest_identity_tenant_name') + self.guid))
+ config.CONF, 'tempest_identity_tenant_name') + self.guid))
if user_creator is None or user_creator.get_user() is None:
raise Exception("Failed to create user")
self.creators.append(user_creator)
@@ -367,13 +368,13 @@ class TempestResourcesManager(object):
tempest_segmentation_id = None
tempest_network_type = getattr(
- CONST, 'tempest_network_type', None)
+ config.CONF, 'tempest_network_type', None)
tempest_physical_network = getattr(
- CONST, 'tempest_physical_network', None)
+ config.CONF, 'tempest_physical_network', None)
tempest_segmentation_id = getattr(
- CONST, 'tempest_segmentation_id', None)
+ config.CONF, 'tempest_segmentation_id', None)
tempest_net_name = getattr(
- CONST, 'tempest_private_net_name') + self.guid
+ config.CONF, 'tempest_private_net_name') + self.guid
network_creator = deploy_utils.create_network(
self.os_creds, NetworkConfig(
@@ -384,10 +385,11 @@ class TempestResourcesManager(object):
segmentation_id=tempest_segmentation_id,
subnet_settings=[SubnetConfig(
name=getattr(
- CONST, 'tempest_private_subnet_name') + self.guid,
+ config.CONF,
+ 'tempest_private_subnet_name') + self.guid,
project_name=project_name,
cidr=getattr(
- CONST, 'tempest_private_subnet_cidr'))]))
+ config.CONF, 'tempest_private_subnet_cidr'))]))
if network_creator is None or network_creator.get_network() is None:
raise Exception("Failed to create private network")
self.creators.append(network_creator)
@@ -414,9 +416,9 @@ class TempestResourcesManager(object):
flavor_creator = OpenStackFlavor(
self.os_creds, FlavorConfig(
name=name,
- ram=getattr(CONST, 'openstack_flavor_ram'),
- disk=getattr(CONST, 'openstack_flavor_disk'),
- vcpus=getattr(CONST, 'openstack_flavor_vcpus'),
+ ram=getattr(config.CONF, 'openstack_flavor_ram'),
+ disk=getattr(config.CONF, 'openstack_flavor_disk'),
+ vcpus=getattr(config.CONF, 'openstack_flavor_vcpus'),
metadata=flavor_metadata))
flavor = flavor_creator.create()
if flavor is None:
@@ -439,7 +441,7 @@ class TempestResourcesManager(object):
if create_project:
LOGGER.debug("Creating project and user for Tempest suite")
project_name = getattr(
- CONST, 'tempest_identity_tenant_name') + self.guid
+ config.CONF, 'tempest_identity_tenant_name') + self.guid
result['project_id'] = self._create_project()
result['user_id'] = self._create_user()
result['tenant_id'] = result['project_id'] # for compatibility
@@ -448,26 +450,28 @@ class TempestResourcesManager(object):
result['tempest_net_name'] = self._create_network(project_name)
LOGGER.debug("Creating image for Tempest suite")
- image_name = getattr(CONST, 'openstack_image_name') + self.guid
+ image_name = getattr(config.CONF, 'openstack_image_name') + self.guid
result['image_id'] = self._create_image(image_name)
if use_custom_images:
LOGGER.debug("Creating 2nd image for Tempest suite")
- image_name = getattr(CONST, 'openstack_image_name_alt') + self.guid
+ image_name = getattr(
+ config.CONF, 'openstack_image_name_alt') + self.guid
result['image_id_alt'] = self._create_image(image_name)
- if (getattr(CONST, 'tempest_use_custom_flavors') == 'True' or
+ if (getattr(config.CONF, 'tempest_use_custom_flavors') == 'True' or
use_custom_flavors):
LOGGER.info("Creating flavor for Tempest suite")
- name = getattr(CONST, 'openstack_flavor_name') + self.guid
+ name = getattr(config.CONF, 'openstack_flavor_name') + self.guid
result['flavor_id'] = self._create_flavor(name)
if use_custom_flavors:
LOGGER.info("Creating 2nd flavor for Tempest suite")
scenario = env.get('DEPLOY_SCENARIO')
if 'ovs' in scenario or 'fdio' in scenario:
- setattr(CONST, 'openstack_flavor_ram', 1024)
- name = getattr(CONST, 'openstack_flavor_name_alt') + self.guid
+ setattr(config.CONF, 'openstack_flavor_ram', 1024)
+ name = getattr(
+ config.CONF, 'openstack_flavor_name_alt') + self.guid
result['flavor_id_alt'] = self._create_flavor(name)
return result