diff options
author | Panagiotis Karalis <pkaralis@intracom-telecom.com> | 2018-06-29 16:14:22 +0300 |
---|---|---|
committer | Panagiotis Karalis <pkaralis@intracom-telecom.com> | 2018-07-12 11:40:02 +0300 |
commit | 6dbc1a9452d6c8451f759b7be73ac3986f6f4fd4 (patch) | |
tree | e4412d638be3979b6b97e79ac595a5df44163da0 /dovetail | |
parent | 29b70b6da1cbae16f6c6332e54ac146c8a2fc106 (diff) |
Enable OVP tests to run on a DPDK-enabled system
DPDK-enabled NFVIs require support for hugepages which
in turn is configured by means of extra_specs in flavors.
Currently, Functest enables hugepage support if the name
of the scenario contains the substring "ovs".
Dovetail allows end users to run all tests on DPDK-enabled systems
and the documentation has been updates accordingly.
JIRA: DOVETAIL-665
Change-Id: If4898da168f8b4c69a045ef3b00b8a8862f29b0c
Signed-off-by: Panagiotis Karalis <pkaralis@intracom-telecom.com>
Diffstat (limited to 'dovetail')
-rwxr-xr-x | dovetail/run.py | 8 | ||||
-rw-r--r-- | dovetail/test_runner.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index d32650bc..4f643758 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -32,7 +32,6 @@ from utils.dovetail_config import DovetailConfig as dt_cfg import utils.dovetail_logger as dt_logger import utils.dovetail_utils as dt_utils - EXIT_RUN_FAILED = 2 @@ -203,6 +202,12 @@ def env_init(logger): dt_utils.source_env(openrc) +def update_deploy_scenario(logger, **kwargs): + if 'deploy_scenario' in kwargs and kwargs['deploy_scenario'] is not None: + os.environ['DEPLOY_SCENARIO'] = kwargs['deploy_scenario'] + logger.info("DEPLOY_SCENARIO : %s", os.environ['DEPLOY_SCENARIO']) + + def check_hosts_file(logger): hosts_file = os.path.join(dt_cfg.dovetail_config['config_dir'], 'hosts.yaml') @@ -279,6 +284,7 @@ def main(*args, **kwargs): logger.info('================================================') logger.info('Build tag: {}'.format(dt_cfg.dovetail_config['build_tag'])) parse_cli(logger, **kwargs) + update_deploy_scenario(logger, **kwargs) env_init(logger) copy_userconfig_files(logger) copy_patch_files(logger) diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py index 40e55283..c49182b8 100644 --- a/dovetail/test_runner.py +++ b/dovetail/test_runner.py @@ -151,6 +151,8 @@ class DockerRunner(object): config_item['validate_testcase'] = testcase.validate_testcase() config_item['testcase'] = testcase.name() config_item['os_insecure'] = os.getenv("OS_INSECURE") + if 'DEPLOY_SCENARIO' in os.environ: + config_item['deploy_scenario'] = os.environ['DEPLOY_SCENARIO'] return config_item def _update_config(self, testcase): |