aboutsummaryrefslogtreecommitdiffstats
path: root/ice_validator/tests/utils
diff options
context:
space:
mode:
authoredan-att <eb578m@att.com>2017-09-14 16:52:18 +0300
committerEdan Binshtok <eb578m@intl.att.com>2017-09-14 17:06:32 +0300
commit14f744bd87e0ce036a2be13f0ae693638c85b1c3 (patch)
treed273f49ef65e342657c05abe71b809fb572695a0 /ice_validator/tests/utils
parentcc21b8b08b6dbcec577bfb26ff397ac899da8002 (diff)
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 <eb578m@intl.att.com>
Diffstat (limited to 'ice_validator/tests/utils')
-rw-r--r--ice_validator/tests/utils/nested_iterables.py6
1 files changed, 6 insertions, 0 deletions
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):