From 1fe5e7adb3e1d90910c18386ed64d0a787a7bf94 Mon Sep 17 00:00:00 2001 From: Kerim Gokarslan Date: Fri, 18 Aug 2017 16:05:05 -0700 Subject: [NFVBENCH-7] Return errors when unknown options are passed 1) Return all errors when unknown options are passed 2) Fixed pep8 warnings 3) Fixed image deletion Change-Id: If21ca07c797a602b9a60f3ccae665149ed1ac148 Signed-off-by: Kerim Gokarslan --- nfvbench/config.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'nfvbench/config.py') diff --git a/nfvbench/config.py b/nfvbench/config.py index 2a67b7e..a0587b6 100644 --- a/nfvbench/config.py +++ b/nfvbench/config.py @@ -49,17 +49,21 @@ def config_loads(cfg_text, from_cfg=None): def get_err_config(subset, superset): + result = {} for k, v in subset.items(): if k not in superset: - return {k: v} - if v is not None and superset[k] is not None: + result.update({k: v}) + elif v is not None and superset[k] is not None: if not isinstance(v, type(superset[k])): - return {k: v} + result.update({k: v}) + continue if isinstance(v, dict): res = get_err_config(v, superset[k]) if res: - return {k: res} - return None + result.update({k: res}) + if not result: + return None + return result def test_config(): -- cgit 1.2.3-korg