X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_contrail_instance_ip_resource_id.py;h=2833d5b978ce395ddb0084455a6c812d5af12406;hb=00c64458942602efe5a3b712540b98ac94fb60f4;hp=c7c8c574dd79d12d7fa2337dd2a110d50b107d7c;hpb=1f4df7c7ad27b23773ad9cdbe4db1632ce388cf1;p=vvp%2Fvalidation-scripts.git

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 c7c8c57..2833d5b 100644
--- a/ice_validator/tests/test_contrail_instance_ip_resource_id.py
+++ b/ice_validator/tests/test_contrail_instance_ip_resource_id.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START====================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2019 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -35,40 +35,34 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-
-"""
-resources:
-{vm-type}_server_{vm-type_index}
-"""
 import pytest
 
 from .structures import Heat
-from .structures import ContrailV2InstanceIp
+from .structures import ContrailV2InstanceIpProcessor
 from .helpers import validates
 
-VERSION = "1.1.0"
+VERSION = "2.0.0"
 
 
 def run_test(heat_template, regex_names, network_flavor):
     """run test
     """
     heat = Heat(filepath=heat_template)
-    heat_object_class = ContrailV2InstanceIp
-    resource_type = heat_object_class.resource_type
+    processor = ContrailV2InstanceIpProcessor
+    resource_type = processor.resource_type
     resources = heat.get_resource_by_type(resource_type=resource_type)
     if not resources:
         pytest.skip("No %s resources found" % resource_type)
     bad = []
-    heat_object = heat_object_class()
-    rid_patterns = heat_object.get_rid_patterns()
+    rid_patterns = processor.get_rid_patterns()
     for rid, resource in resources.items():
-        flavor = heat_object.get_network_flavor(resource)
+        flavor = processor.get_network_flavor(resource)
         if flavor != network_flavor:
             continue
-        regex_name = heat_object.get_rid_match_tuple(rid)[0]
-        if regex_name in regex_names:
+
+        regex_name = processor.get_rid_match_tuple(rid)[0]
+        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" % (
@@ -82,7 +76,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
@@ -103,14 +97,14 @@ def test_contrail_instance_ip_resource_id_external(heat_template):
     """
 
     run_test(
-        heat_template,
-        regex_names=("ip", "v6_ip"),
-        network_flavor=ContrailV2InstanceIp.network_flavor_external,
+        yaml_file,
+        regex_names=("external"),
+        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}
@@ -119,23 +113,7 @@ def test_contrail_instance_ip_resource_id_internal(heat_template):
             _v6_IP_{index}
     """
     run_test(
-        heat_template,
-        regex_names=("int_ip", "int_v6_ip"),
-        network_flavor=ContrailV2InstanceIp.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=ContrailV2InstanceIp.network_flavor_subint,
+        yaml_file,
+        regex_names=("internal"),
+        network_flavor=ContrailV2InstanceIpProcessor.network_flavor_internal,
     )