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/test_contrail_instance_ip_resource_id.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/test_contrail_instance_ip_resource_id.py')
| -rw-r--r-- | ice_validator/tests/test_contrail_instance_ip_resource_id.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ice_validator/tests/test_contrail_instance_ip_resource_id.py b/ice_validator/tests/test_contrail_instance_ip_resource_id.py index 5e80075..2833d5b 100644 --- a/ice_validator/tests/test_contrail_instance_ip_resource_id.py +++ b/ice_validator/tests/test_contrail_instance_ip_resource_id.py @@ -36,10 +36,6 @@ # ============LICENSE_END============================================ # # -""" -resources: -{vm-type}_server_{vm-type_index} -""" import pytest from .structures import Heat @@ -64,8 +60,9 @@ def run_test(heat_template, regex_names, network_flavor): flavor = processor.get_network_flavor(resource) if flavor != network_flavor: continue + regex_name = processor.get_rid_match_tuple(rid)[0] - if regex_name in regex_names: + if regex_name and regex_name in regex_names: continue bad.append(rid) assert not bad, "%s resource ids %s must match one of %s" % ( @@ -101,7 +98,7 @@ def test_contrail_instance_ip_resource_id_external(yaml_file): run_test( yaml_file, - regex_names=("ip", "v6_ip"), + regex_names=("external"), network_flavor=ContrailV2InstanceIpProcessor.network_flavor_external, ) @@ -117,6 +114,6 @@ def test_contrail_instance_ip_resource_id_internal(yaml_file): """ run_test( yaml_file, - regex_names=("int_ip", "int_v6_ip"), + regex_names=("internal"), network_flavor=ContrailV2InstanceIpProcessor.network_flavor_internal, ) |