X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_port_resource_ids.py;h=16483000d9b063f4dd95853454a61e79339ab403;hb=HEAD;hp=1b98bff40954fc37f9b4beb2ea43bbbe881bf831;hpb=ab01f96b1405bc037853847138a121581bb98f05;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_port_resource_ids.py b/ice_validator/tests/test_port_resource_ids.py
index 1b98bff..1648300 100644
--- a/ice_validator/tests/test_port_resource_ids.py
+++ b/ice_validator/tests/test_port_resource_ids.py
@@ -52,14 +52,14 @@ from .utils.vm_types import get_vm_type_for_nova_server
 
 
 @validates("R-20453", "R-26351", "R-26506", "R-681859")
-def test_port_resource_ids(heat_template):
+def test_port_resource_ids(yaml_file):
     """
     Check that all resource ids for ports follow the right
     naming convention to include the {vm_type} of the
     nova server it is associated to and also contains the
     {network_role} of the network it is associated with
     """
-    with open(heat_template) as fh:
+    with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
     # skip if resources are not defined
@@ -108,14 +108,28 @@ def test_port_resource_ids(heat_template):
 
                 if property_uses_get_resource(v, "network"):
                     continue
+
+                if port_resource.get("type", "") != "OS::Neutron::Port":
+                    continue
+
                 network_role = get_network_role_from_port(port_resource)
                 if not network_role:
+                    invalid_ports.append(
+                        (port_id, "Unable to determine network role for port.")
+                    )
                     continue
                 network_role = network_role.lower()
 
                 network_type = get_network_type_from_port(port_resource)
                 if not network_type:
+                    invalid_ports.append(
+                        (
+                            port_id,
+                            "Unable to determine network type for port (internal or external).",
+                        )
+                    )
                     continue
+
                 if network_type == "external":
                     expected_r_id = r"{}_\d+_{}_port_\d+".format(vm_type, network_role)
                 else: