diff options
author | ahothan <ahothan@cisco.com> | 2017-08-23 12:15:14 -0700 |
---|---|---|
committer | ahothan <ahothan@cisco.com> | 2017-08-23 12:16:00 -0700 |
commit | 42837a4bfe8732986551c9518bb12d0f28ebb30e (patch) | |
tree | cd32d3ec37c28be672f7d5972d3edba13bc251f4 /nfvbench | |
parent | fc235fbbee490dd19bdadc99dfb6e39587d05bb3 (diff) |
NFVBENCH-8 config checking fails with Exception TypeError: string indices must be integers, not str1.0.2
Change-Id: Ic3263374efffc9ea2566e107b99f47fb3b0c6edf
Signed-off-by: ahothan <ahothan@cisco.com>
Diffstat (limited to 'nfvbench')
-rw-r--r-- | nfvbench/config.py | 20 | ||||
-rw-r--r-- | nfvbench/nfvbench.py | 8 |
2 files changed, 11 insertions, 17 deletions
diff --git a/nfvbench/config.py b/nfvbench/config.py index a0587b6..df91454 100644 --- a/nfvbench/config.py +++ b/nfvbench/config.py @@ -14,6 +14,7 @@ # from attrdict import AttrDict +from log import LOG import yaml @@ -30,6 +31,7 @@ def config_load(file_name, from_cfg=None): .format(file_name)) if from_cfg: + _validate_config(cfg, from_cfg) cfg = from_cfg + cfg return cfg @@ -44,11 +46,12 @@ def config_loads(cfg_text, from_cfg=None): # empty string cfg = AttrDict() if from_cfg: + _validate_config(cfg, from_cfg) return from_cfg + cfg return cfg -def get_err_config(subset, superset): +def _get_err_config(subset, superset): result = {} for k, v in subset.items(): if k not in superset: @@ -58,17 +61,16 @@ def get_err_config(subset, superset): result.update({k: v}) continue if isinstance(v, dict): - res = get_err_config(v, superset[k]) + res = _get_err_config(v, superset[k]) if res: result.update({k: res}) if not result: return None return result - -def test_config(): - cfg = config_load('a1.yaml') - cfg = config_load('a2.yaml', cfg) - cfg = config_loads('color: 500', cfg) - config_loads('') - config_loads('#') +def _validate_config(subset, superset): + err_cfg = _get_err_config(subset, superset) + if err_cfg: + err_msg = 'Unknown options found in config file/string: ' + str(err_cfg) + LOG.error(err_msg) + raise Exception(err_msg) diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py index dccd63c..e9594d5 100644 --- a/nfvbench/nfvbench.py +++ b/nfvbench/nfvbench.py @@ -21,7 +21,6 @@ from chain_runner import ChainRunner from collections import defaultdict from config import config_load from config import config_loads -from config import get_err_config import copy import credentials import datetime @@ -472,13 +471,6 @@ def main(): LOG.info('Loading configuration string: ' + opts.config) config = config_loads(opts.config, config) - # Making sure no unknown option is given - err_config = get_err_config(config, default_cfg) - if err_config: - err_msg = 'Unknown options found in config file/string: ' + err_config - LOG.error(err_msg) - raise Exception(err_msg) - # traffic profile override options override_custom_traffic(config, opts.frame_sizes, opts.unidir) |