Merge "Remove unnecessary check for pytest.skip"

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

diff --git a/ice_validator/tests/test_contrail_vmi_resource_id.py b/ice_validator/tests/test_contrail_vmi_resource_id.py
index 4d1efb8..ed8f87d 100644 (file)
--- a/ice_validator/tests/test_contrail_vmi_resource_id.py
+++ b/ice_validator/tests/test_contrail_vmi_resource_id.py
@@ -92,7 +92,7 @@ def test_contrail_instance_ip_resource_id_external(yaml_file):
     """
     run_test(
         yaml_file,
-        regex_name="vmi_external",
+        regex_name="external",
         network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_external,
     )
 
@@ -109,23 +109,6 @@ def test_contrail_instance_ip_resource_id_internal(yaml_file):
     """
     run_test(
         yaml_file,
-        regex_name="vmi_internal",
+        regex_name="internal",
         network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_internal,
     )
-
-
-@validates("R-54458")
-def test_contrail_instance_ip_resource_id_subint(yaml_file):
-    """
-    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(
-        yaml_file,
-        regex_name="vmi_subint",
-        network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_subint,
-    )