From fd72e102b0d6b6b62f72a06ad950e7959c54d7ef Mon Sep 17 00:00:00 2001 From: ahothan Date: Mon, 28 Aug 2017 08:04:52 -0700 Subject: NFVBENCH-11 Cannot override extra_specs in flavor using -c Add a whitelist for keys that can't be verified Change-Id: I8d56cb850fb133eec0097ae80f6ee5f827e651c6 Signed-off-by: ahothan --- nfvbench/nfvbench.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nfvbench/nfvbench.py') diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py index e9594d5..b36d328 100644 --- a/nfvbench/nfvbench.py +++ b/nfvbench/nfvbench.py @@ -461,15 +461,17 @@ def main(): config.name = '' if opts.config: + # do not check extra_specs in flavor as it can contain any key/value pairs + whitelist_keys = ['extra_specs'] # override default config options with start config at path parsed from CLI # check if it is an inline yaml/json config or a file name if os.path.isfile(opts.config): LOG.info('Loading configuration file: ' + opts.config) - config = config_load(opts.config, config) + config = config_load(opts.config, config, whitelist_keys) config.name = os.path.basename(opts.config) else: LOG.info('Loading configuration string: ' + opts.config) - config = config_loads(opts.config, config) + config = config_loads(opts.config, config, whitelist_keys) # traffic profile override options override_custom_traffic(config, opts.frame_sizes, opts.unidir) -- cgit 1.2.3-korg