diff options
author | 2017-12-05 10:20:55 +0000 | |
---|---|---|
committer | 2017-12-12 21:43:12 +0100 | |
commit | 8f0134178d24b7b478beb22395c448cf76e381f2 (patch) | |
tree | c10a4d82cf2cce3465aa834956bc6dc16839dc2a /functest/utils/functest_utils.py | |
parent | 5ed771a9a0dbc09610ecc900c0c3e86edc08eee6 (diff) |
All patching config files in memory
It adds the yaml content as Config attribute and allow patching it
without modifying the file (and reimport constants or config).
It also removes obsolete data in config_patch.yaml and moves several
functions in the right modules (Config)
JIRA: ARMBAND-334
Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I5c9a574d3283828063154c977cdfbc2abfdc6777
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/utils/functest_utils.py')
-rw-r--r-- | functest/utils/functest_utils.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index bbb6b631..6c502ebc 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -317,19 +317,6 @@ def get_functest_config(parameter): return get_parameter_from_yaml(parameter, yaml_) -def merge_dicts(dict1, dict2): - for k in set(dict1.keys()).union(dict2.keys()): - if k in dict1 and k in dict2: - if isinstance(dict1[k], dict) and isinstance(dict2[k], dict): - yield (k, dict(merge_dicts(dict1[k], dict2[k]))) - else: - yield (k, dict2[k]) - elif k in dict1: - yield (k, dict1[k]) - else: - yield (k, dict2[k]) - - def get_functest_yaml(): with open(constants.CONST.__getattribute__('CONFIG_FUNCTEST_YAML')) as f: functest_yaml = yaml.safe_load(f) |