diff options
| author |   stark, steven <steven.stark@att.com> | 2019-05-13 14:41:55 -0700 |
|---|---|---|
| committer | stark, steven <steven.stark@att.com> | 2019-05-13 14:41:55 -0700 |
| commit | 503041fb7ec395fe57e418d584c4a5d06f4c9877 (patch) | |
| tree | 5e7f56bd44ddf7324888cd59442da96321edc235 /ice_validator/tests/helpers.py | |
| parent | 43385d805115d53603a5643462aebb3fa1152de2 (diff) | |
[VVP] Adding tests for new reqs from VNFRQTS-630
Added tests for reqs:
R-100010, R-100030, R-100050, R-100070, R-100090, R-100110,
R-100130, R-100150, R-100200, R-100220, R-100240, R-100310,
R-100330, R-100360, R-100370, R-100260, R-100000, R-100190,
R-100350
Updated neutron param tests to re-use validation code for contrail tests
Change-Id: I84af725ca9de176dc690fffda01ffcad453213ea
Issue-ID: VVP-211
Signed-off-by: stark, steven <steven.stark@att.com>
Diffstat (limited to 'ice_validator/tests/helpers.py')
| -rw-r--r-- | ice_validator/tests/helpers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ice_validator/tests/helpers.py b/ice_validator/tests/helpers.py index afa8672..c73a118 100644 --- a/ice_validator/tests/helpers.py +++ b/ice_validator/tests/helpers.py @@ -310,17 +310,17 @@ def parameter_type_to_heat_type(parameter): def prop_iterator(resource, *props): - terminators = ["get_resource", "get_attr", "str_replace"] + terminators = ["get_resource", "get_attr", "str_replace", "get_param"] if "properties" in resource: resource = resource.get("properties") props = list(props) - if isinstance(resource, dict) and "get_param" in resource: - yield resource.get("get_param") + if isinstance(resource, dict) and any(x for x in terminators if x in resource): + yield resource else: prop = resource.get(props.pop(0)) if isinstance(prop, list): for x in prop: yield from prop_iterator(x, *props) - elif isinstance(prop, dict) and not any(x for x in terminators if x in prop): + elif isinstance(prop, dict): yield from prop_iterator(prop, *props) |