From 8b13de4224400f8c2d1f4eb12aedb122c24cf86f Mon Sep 17 00:00:00 2001 From: xudan Date: Tue, 27 Mar 2018 03:12:57 -0400 Subject: Decoupling Functest Docker config items from source code There are some special Docker setting item when creating Functest Containers. 1. Remove the extra settings which are required by Functest Danube. 2. Remove the settings for pushing results to DB because Dovetail plans to disable this function. 3. Move the other special Functest settings to config files. JIRA: DOVETAIL-639 Change-Id: Ibc4090b5c0aafdf9ed64e65a9a92e34a12a16df5 Signed-off-by: xudan --- dovetail/utils/dovetail_config.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'dovetail/utils') diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py index b152cc8a..316be312 100644 --- a/dovetail/utils/dovetail_config.py +++ b/dovetail/utils/dovetail_config.py @@ -64,3 +64,15 @@ class DovetailConfig(object): def update_cmds(cls): if cls.dovetail_config['report_dest'].startswith("http"): cls.dovetail_config['bottlenecks']['cmds'][0] += ' --report' + + @classmethod + def get_opts(cls, valid_type): + if 'opts' in cls.dovetail_config[valid_type].keys(): + return cls.dovetail_config[valid_type]['opts'] + return "" + + @classmethod + def get_envs(cls, valid_type): + if 'envs' in cls.dovetail_config[valid_type].keys(): + return cls.dovetail_config[valid_type]['envs'] + return "" -- cgit 1.2.3-korg