X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_contrail_instance_ip_resource_id.py;h=d08938eb83d79364a38bd06c8587302b1e1f3b87;hp=13f1b8e129c5ef7e57d08f0cff5497f89c507b54;hb=10535815da964c683e5f91030934652bfb3f53b8;hpb=912ea4cdf9721f66339c47bbfdcf4315ca7bd424 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 13f1b8e..d08938e 100644 --- a/ice_validator/tests/test_contrail_instance_ip_resource_id.py +++ b/ice_validator/tests/test_contrail_instance_ip_resource_id.py @@ -79,7 +79,7 @@ def run_test(heat_template, regex_names, network_flavor): @validates("R-53310", "R-46128") -def test_contrail_instance_ip_resource_id_external(heat_template): +def test_contrail_instance_ip_resource_id_external(yaml_file): """ A VNF's Heat Orchestration Template's Resource OS::ContrailV2::InstanceIp that is configuring an IPv4 Address on a port attached to an external @@ -100,14 +100,14 @@ def test_contrail_instance_ip_resource_id_external(heat_template): """ run_test( - heat_template, + yaml_file, regex_names=("ip", "v6_ip"), network_flavor=ContrailV2InstanceIpProcessor.network_flavor_external, ) @validates("R-62187", "R-87563") -def test_contrail_instance_ip_resource_id_internal(heat_template): +def test_contrail_instance_ip_resource_id_internal(yaml_file): """ internal {vm-type}_{vm-type_index}_int_{network-role}_vmi_{vmi_index} @@ -116,14 +116,14 @@ def test_contrail_instance_ip_resource_id_internal(heat_template): _v6_IP_{index} """ run_test( - heat_template, + yaml_file, regex_names=("int_ip", "int_v6_ip"), network_flavor=ContrailV2InstanceIpProcessor.network_flavor_internal, ) @validates("R-20947", "R-88540") -def test_contrail_instance_ip_resource_id_subint(heat_template): +def test_contrail_instance_ip_resource_id_subint(yaml_file): """ subint {vm-type}_{vm-type_index}_subint_{network-role}_vmi_{vmi_index} @@ -132,7 +132,7 @@ def test_contrail_instance_ip_resource_id_subint(heat_template): _v6_IP_{index} """ run_test( - heat_template, + yaml_file, regex_names=("subint_ip", "subint_v6_ip"), network_flavor=ContrailV2InstanceIpProcessor.network_flavor_subint, )