From 14f744bd87e0ce036a2be13f0ae693638c85b1c3 Mon Sep 17 00:00:00 2001 From: edan-att Date: Thu, 14 Sep 2017 16:52:18 +0300 Subject: Commit test list join for availability_zone These changes were imported from upstream @ commit e38076e29ef8c86c510fca3141954d10602040bb - Updated `nested_iterables` to parse list_join if available in the templates - Updated `test_volume_resource_ids` to allow volume ids to be provided as a parameter list - Appropriate fixture additions and changes Change-Id: Ia2187fe4eb7a389c8df01061be229246262d9a24 Issue-Id: VVP-29 Signed-off-by: Edan Binshtok --- ice_validator/tests/utils/nested_iterables.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ice_validator/tests/utils') diff --git a/ice_validator/tests/utils/nested_iterables.py b/ice_validator/tests/utils/nested_iterables.py index 47b0609..19290c0 100644 --- a/ice_validator/tests/utils/nested_iterables.py +++ b/ice_validator/tests/utils/nested_iterables.py @@ -79,6 +79,12 @@ def find_all_get_param_in_yml(yml): 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)) elif isinstance(v, list): -- cgit 1.2.3-korg