X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Futils%2Fnested_iterables.py;h=eea6e197e7df932657132d78b4804073e0541710;hb=refs%2Fchanges%2F29%2F44229%2F1;hp=47b060984f9d9a463ba12b2067cbe16a59217aae;hpb=cc21b8b08b6dbcec577bfb26ff397ac899da8002;p=vvp%2Fvalidation-scripts.git diff --git a/ice_validator/tests/utils/nested_iterables.py b/ice_validator/tests/utils/nested_iterables.py index 47b0609..eea6e19 100644 --- a/ice_validator/tests/utils/nested_iterables.py +++ b/ice_validator/tests/utils/nested_iterables.py @@ -73,11 +73,19 @@ def find_all_get_param_in_yml(yml): params = [] for k, v in yml.items(): if k == 'get_param' and v not in os_pseudo_parameters: + if isinstance(v, list) and not isinstance(v[0], dict): + params.append(v[0]) + elif not isinstance(v, dict) and isinstance(v, str): + params.append(v) for item in (v if isinstance(v, list) else [v]): if isinstance(item, dict): params.extend(find_all_get_param_in_yml(item)) - elif isinstance(item, str): - params.append(item) + continue + elif k == 'list_join': + for item in (v if isinstance(v, list) else [v]): + if isinstance(item, list): + for d in item: + params.extend(find_all_get_param_in_yml(d)) continue if isinstance(v, dict): params.extend(find_all_get_param_in_yml(v))