Code Review
/
nfvbench.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[NFVBENCH-7] Return errors when unknown options are passed
[nfvbench.git]
/
nfvbench
/
config.py
diff --git
a/nfvbench/config.py
b/nfvbench/config.py
index
2a67b7e
..
a0587b6
100644
(file)
--- 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):
def get_err_config(subset, superset):
+ result = {}
for k, v in subset.items():
if k not in superset:
for k, v in subset.items():
if k not in superset:
- re
turn {k: v}
- if v is not None and superset[k] is not None:
+ re
sult.update({k: v})
+
el
if v is not None and superset[k] is not None:
if not isinstance(v, type(superset[k])):
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:
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():
def test_config():