X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_network_format.py;h=b291c535a3059f3af1b9dc066cf60180be64d673;hb=5706da0c7f430c01a0cebb534f1a965ee9b5cca7;hp=514e83eb4d41d0b97157f3847d7b7feab0889f39;hpb=ab01f96b1405bc037853847138a121581bb98f05;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index 514e83e..b291c53 100644
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -36,89 +36,33 @@
 # ============LICENSE_END============================================
 #
 #
+from itertools import chain
 
-import pytest
 import re
 
 from tests import cached_yaml as yaml
+from tests.structures import Heat
 
-from .helpers import validates
-from .utils.network_roles import get_network_role_from_port, property_uses_get_resource
+from tests.helpers import validates
 
-RE_INTERNAL_NETWORK_RID = re.compile(  # match pattern
-    r"int_(?P<network_role>.+)_network$"
-)
+RE_INTERNAL_NETWORK_RID = re.compile(r"int_(?P<network_role>.+)_network$")
 NETWORK_RESOURCE_TYPES = ["OS::Neutron::Net", "OS::ContrailV2::VirtualNetwork"]
 
 
-@validates("R-62983", "R-86182")
-def test_network_format(heat_template):
-    """
-    Make sure all network properties use the allowed naming
-    conventions
-    """
-    with open(heat_template) as fh:
-        yml = yaml.load(fh)
-
-    # skip if resources are not defined
-    if "resources" not in yml:
-        pytest.skip("No resources specified in the heat template")
-
-    invalid_ports = []
-    for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
-            continue
-        if property_uses_get_resource(v, "network"):
-            continue
-        if v.get("type") != "OS::Neutron::Port":
-            continue
-        if not get_network_role_from_port(v):
-            invalid_ports.append(k)
-
-    assert not set(invalid_ports), (
-        "Missing 'network' property or improperly "
-        "formatted network parameter name on the "
-        "following OS::Neutron::Ports: "
-        "{}".format(", ".join(invalid_ports))
-    )
-
-
-@validates("R-16968", "R-35666")
+@validates("R-16968")
 def test_network_resource_id_format(yaml_file):
-    """
-    Make sure all network resource ids use the allowed naming
-    convention
-    """
-    RE_INTERNAL_NETWORK_RID = re.compile(  # match pattern
-        r"int_(?P<network_role>.+)_network$"
+    heat = Heat(yaml_file)
+    network_ids = chain.from_iterable(
+        heat.get_resource_by_type(t) for t in NETWORK_RESOURCE_TYPES
     )
-
-    with open(yaml_file) as fh:
-        yml = yaml.load(fh)
-
-    # skip if resources are not defined
-    if "resources" not in yml:
-        pytest.skip("No resources specified in the heat template")
-
-    invalid_networks = []
-    for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
-            continue
-        if property_uses_get_resource(v, "network"):
-            continue
-        if v.get("type") not in NETWORK_RESOURCE_TYPES:
-            continue
-        match = RE_INTERNAL_NETWORK_RID.match(k)
-        if not match:
-            invalid_networks.append(k)
-
-    assert not set(invalid_networks), (
+    invalid_networks = {
+        r_id for r_id in network_ids if not RE_INTERNAL_NETWORK_RID.match(r_id)
+    }
+    assert not invalid_networks, (
         "Heat templates must only create internal networks "
-        "and follow format int_{network-role}_network"
+        "and their resource IDs must follow the format "
+        "int_{{network-role}}_network. The following network's resource IDs "
+        "have invalid resource ID formats: "
         "{}".format(", ".join(invalid_networks))
     )
 
@@ -133,34 +77,23 @@ def test_network_has_subnet(yaml_file):
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
-    # skip if resources are not defined
-    if "resources" not in yml:
-        pytest.skip("No resources specified in the heat template")
-
     networks = []
 
     for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
+        if not has_properties(v) or v.get("type") not in ["OS::Neutron::Net"]:
             continue
         # need to check if contrail networks also require subnet
         # and it is defined the same as neutron networks
         # if v.get("type") not in NETWORK_RESOURCE_TYPES:
-        if v.get("type") not in ["OS::Neutron::Net"]:
-            continue
         networks.append(k)
 
     for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
-            continue
-        if v.get("type") != "OS::Neutron::Subnet":
-            continue
         network_prop = v.get("properties", {}).get("network", {}).get("get_resource")
-
-        if not network_prop:
+        if (
+            not has_properties(v)
+            and v.get("type") != "OS::Neutron::Subnet"
+            and not network_prop
+        ):
             continue
         x = 0
         for network in networks:
@@ -170,3 +103,10 @@ def test_network_has_subnet(yaml_file):
             x += 1
 
     assert not networks, "Networks detected without subnet {}".format(networks)
+
+
+def has_properties(resource):
+    """
+    checks resource is a Neutron Subnet
+    """
+    return isinstance(resource, dict) and "properties" in resource