diff options
| author |   edan-att <eb578m@att.com> | 2017-09-14 16:52:18 +0300 |
|---|---|---|
| committer |   Edan Binshtok <eb578m@intl.att.com> | 2017-09-14 17:06:32 +0300 |
| commit | 14f744bd87e0ce036a2be13f0ae693638c85b1c3 (patch) | |
| tree | d273f49ef65e342657c05abe71b809fb572695a0 /ice_validator/tests/test_volume_resource_ids.py | |
| parent | cc21b8b08b6dbcec577bfb26ff397ac899da8002 (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/test_volume_resource_ids.py')
| -rw-r--r-- | ice_validator/tests/test_volume_resource_ids.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ice_validator/tests/test_volume_resource_ids.py b/ice_validator/tests/test_volume_resource_ids.py index 3f0acda..a6a7334 100644 --- a/ice_validator/tests/test_volume_resource_ids.py +++ b/ice_validator/tests/test_volume_resource_ids.py @@ -97,7 +97,10 @@ def test_volume_resource_ids(heat_template): v3.get('get_resource')) if not volume_id: continue - volume_id = volume_id.lower() + if isinstance(volume_id, list): + volume_id = volume_id[0].lower() + else: + volume_id = volume_id.lower() if vm_type+"_" not in volume_id: invalid_volumes.append(volume_id) @@ -137,7 +140,10 @@ def test_volume_resource_ids(heat_template): properties['volume_id'].get('get_resource')) if not volume_id: continue - volume_id = volume_id.lower() + if isinstance(volume_id, list): + volume_id = volume_id[0].lower() + else: + volume_id = volume_id.lower() # do not test the case when the instance_uuid and # volume_id are not defined |