X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbench%2Fconfig.py;h=81393892bd1d8605e80608fa264c52a00df76a1d;hb=124ecd5d59869bad3a4f5f53f91f5b9c99051512;hp=2ed726dd667b2caacda2ab243db061084af49931;hpb=08c848d44a2a39828593b30c172a6e33773f4efc;p=nfvbench.git diff --git a/nfvbench/config.py b/nfvbench/config.py index 2ed726d..8139389 100644 --- a/nfvbench/config.py +++ b/nfvbench/config.py @@ -18,7 +18,7 @@ from log import LOG import yaml -def config_load(file_name, from_cfg=None, whitelist_keys=[]): +def config_load(file_name, from_cfg=None, whitelist_keys=None): """Load a yaml file into a config dict, merge with from_cfg if not None The config file content taking precedence in case of duplicate """ @@ -31,13 +31,15 @@ def config_load(file_name, from_cfg=None, whitelist_keys=[]): .format(file_name)) if from_cfg: + if not whitelist_keys: + whitelist_keys = [] _validate_config(cfg, from_cfg, whitelist_keys) cfg = from_cfg + cfg return cfg -def config_loads(cfg_text, from_cfg=None, whitelist_keys=[]): +def config_loads(cfg_text, from_cfg=None, whitelist_keys=None): """Same as config_load but load from a string """ try: @@ -46,10 +48,13 @@ def config_loads(cfg_text, from_cfg=None, whitelist_keys=[]): # empty string cfg = AttrDict() if from_cfg: + if not whitelist_keys: + whitelist_keys = [] _validate_config(cfg, from_cfg, whitelist_keys) return from_cfg + cfg return cfg + def _validate_config(subset, superset, whitelist_keys): def get_err_config(subset, superset): result = {}