X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_network_format.py;h=de8115d1f68ed8c042d595e9ded27fb0f57b62a6;hb=98d86269d797a390b9e47d41383d0744ea858837;hp=7fb343a2f442e892f4a56a47ed5449b38e32f4b1;hpb=60d5ad7d00eadd6395eca186e6fa76a43df3c6cf;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index 7fb343a..de8115d 100644
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -35,41 +35,101 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 import pytest
+import re
+
 from tests import cached_yaml as yaml
 
 from .helpers import validates
-from .utils.network_roles import get_network_role_from_port, \
-    property_uses_get_resource
+from .utils.network_roles import property_uses_get_resource
+
+RE_INTERNAL_NETWORK_RID = re.compile(  # match pattern
+    r"int_(?P<network_role>.+)_network$"
+)
+NETWORK_RESOURCE_TYPES = ["OS::Neutron::Net", "OS::ContrailV2::VirtualNetwork"]
+
 
+@validates("R-16968", "R-35666")
+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$"
+    )
 
-@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:
+    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_ports = []
+    invalid_networks = []
     for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
+        if not has_properties(v):
             continue
         if property_uses_get_resource(v, "network"):
             continue
-        if v.get("type") != "OS::Neutron::Port":
+        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), (
+        "Heat templates must only create internal networks "
+        "and follow format int_{{network-role}}_network"
+        "{}".format(", ".join(invalid_networks))
+    )
+
+
+@validates("R-16241")
+def test_network_has_subnet(yaml_file):
+    """
+    if creating internal network, make sure there is a
+    corresponding subnet that references it
+    """
+
+    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 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:
+        networks.append(k)
+
+    for k, v in yml["resources"].items():
+        network_prop = v.get("properties", {}).get("network", {}).get("get_resource")
+        if (
+            not has_properties(v) and v.get("type") != "OS::Neutron::Subnet"
+            and not network_prop
+        ):
             continue
-        if not get_network_role_from_port(v):
-            invalid_ports.append(k)
+        x = 0
+        for network in networks:
+            if network == network_prop:
+                networks.pop(x)
+                break
+            x += 1
+
+    assert not networks, "Networks detected without subnet {}".format(networks)
+
 
-    assert not set(invalid_ports)
+def has_properties(resource):
+    """
+    checks resource is a Neutron Subnet
+    """
+    return isinstance(resource, dict) and "properties" in resource