Merge "[VVP] adding base test failure message to report"

[vvp/validation-scripts.git] / ice_validator / tests / test_contrail_instance_ip_resource_id.py

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 e1c1977..5e80075 100644 (file)
--- a/ice_validator/tests/test_contrail_instance_ip_resource_id.py
+++ b/ice_validator/tests/test_contrail_instance_ip_resource_id.py
@@ -35,7 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 """
 resources:
@@ -80,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
@@ -101,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}
@@ -117,23 +116,7 @@ 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):
-    """
-    subint
-    {vm-type}_{vm-type_index}_subint_{network-role}_vmi_{vmi_index}
-            _IP_{index}
-    {vm-type}_{vm-type_index}_subint_{network-role}_vmi_{vmi_index}
-            _v6_IP_{index}
-    """
-    run_test(
-        heat_template,
-        regex_names=("subint_ip", "subint_v6_ip"),
-        network_flavor=ContrailV2InstanceIpProcessor.network_flavor_subint,
-    )