X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_contrail_vmi_resource_id.py;h=9cabfb4d1afc260ea66bf95d920b988db1557c77;hb=00d850be4e8492c4bfc52e93ff374ad2e827ed94;hp=9e9641d282abcca763bd90cfa8aa67a75a425600;hpb=48a07b6942d3956666d30947372653feb702fdae;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_contrail_vmi_resource_id.py b/ice_validator/tests/test_contrail_vmi_resource_id.py
index 9e9641d..9cabfb4 100644
--- a/ice_validator/tests/test_contrail_vmi_resource_id.py
+++ b/ice_validator/tests/test_contrail_vmi_resource_id.py
@@ -35,7 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 """
@@ -82,7 +81,7 @@ def run_test(heat_template, regex_name, network_flavor):
 
 
 @validates("R-96253")
-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::VirtualMachineInterface that is attaching to an
@@ -92,14 +91,14 @@ def test_contrail_instance_ip_resource_id_external(heat_template):
     {vm-type}_{vm-type_index}_{network-role}_vmi_{vmi_index}
     """
     run_test(
-        heat_template,
+        yaml_file,
         regex_name="vmi_external",
         network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_external,
     )
 
 
 @validates("R-50468")
-def test_contrail_instance_ip_resource_id_internal(heat_template):
+def test_contrail_instance_ip_resource_id_internal(yaml_file):
     """
     A VNF's Heat Orchestration Template's Resource
     OS::ContrailV2::VirtualMachineInterface that is attaching to an
@@ -109,24 +108,7 @@ def test_contrail_instance_ip_resource_id_internal(heat_template):
     {vm-type}_{vm-type_index}_int_{network-role}_vmi_{vmi_index}
     """
     run_test(
-        heat_template,
+        yaml_file,
         regex_name="vmi_internal",
         network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_internal,
     )
-
-
-@validates("R-54458")
-def test_contrail_instance_ip_resource_id_subint(heat_template):
-    """
-    A VNF's Heat Orchestration Template's Resource
-    OS::ContrailV2::VirtualMachineInterface that is attaching to an
-    sub-interface network
-    Resource ID **MUST** use the naming convention
-
-    {vm-type}_{vm-type_index}_subint_{network-role}_vmi_{vmi_index}
-    """
-    run_test(
-        heat_template,
-        regex_name="vmi_subint",
-        network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_subint,
-    )