summaryrefslogtreecommitdiffstats
path: root/nfvbench/nfvbench.py
diff options
context:
space:
mode:
authorahothan <ahothan@cisco.com>2017-08-28 08:04:52 -0700
committerahothan <ahothan@cisco.com>2017-08-28 08:04:52 -0700
commitfd72e102b0d6b6b62f72a06ad950e7959c54d7ef (patch)
tree14df0210eac0791b06df88370e5014808437637c /nfvbench/nfvbench.py
parent4d3864c3972250654c3750764c2cf18e13c631d8 (diff)
NFVBENCH-11 Cannot override extra_specs in flavor using -c1.0.3
Add a whitelist for keys that can't be verified Change-Id: I8d56cb850fb133eec0097ae80f6ee5f827e651c6 Signed-off-by: ahothan <ahothan@cisco.com>
Diffstat (limited to 'nfvbench/nfvbench.py')
-rw-r--r--nfvbench/nfvbench.py6
1 files changed, 4 insertions, 2 deletions
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)