X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_network_format.py;h=23e46f9d3bff90d53d2387a11361fc82c1fb6e03;hp=17d000c165bbd658fa4bf7e6b3c2f37f3d2de4ac;hb=1d281ce111a76c2b056bcaa572c1e929c90237cf;hpb=655f39713cca2595a812ccd60cc738301aef8b2f

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index 17d000c..23e46f9 100644
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -35,38 +35,78 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
+from itertools import chain
 
-import pytest
-import yaml
-from .utils.network_roles import get_network_role_from_port,\
-                                 property_uses_get_resource
+import re
 
+from tests import cached_yaml as yaml
+from tests.structures import Heat
 
-def test_network_format(heat_template):
-    '''
-    Make sure all network properties use the allowed naming
-    conventions
-    '''
-    with open(heat_template) as fh:
+from tests.helpers import validates
+
+RE_INTERNAL_NETWORK_RID = re.compile(r"int_(?P<network_role>.+)_network$")
+NETWORK_RESOURCE_TYPES = ["OS::Neutron::Net", "OS::ContrailV2::VirtualNetwork"]
+
+
+@validates("R-16968")
+def test_network_resource_id_format(yaml_file):
+    heat = Heat(yaml_file)
+    network_ids = chain.from_iterable(
+        heat.get_resource_by_type(t) for t in NETWORK_RESOURCE_TYPES
+    )
+    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 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))
+    )
+
+
+@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 = []
 
-    invalid_ports = []
-    for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
+    for k, v in yml.get("resources", {}).items():
+        if not has_properties(v) or v.get("type") not in ["OS::Neutron::Net"]:
             continue
-        if "properties" not in v:
-            continue
-        if property_uses_get_resource(v, "network"):
-            continue
-        if v.get("type") != "OS::Neutron::Port":
+        # 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.get("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