X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_network_format.py;h=f146f75f4952a6393d885745d75d9ffaca94a1b1;hb=e5d7862c7c6c02847b8b4f95d2af0c5e9a454828;hp=28144d3d1b4bfe6c9318a2699bcd6f560bde7479;hpb=cc21b8b08b6dbcec577bfb26ff397ac899da8002;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index 28144d3..f146f75 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,35 +35,104 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 import pytest
-import yaml
-from .utils.network_roles import get_network_role_from_port
+import re
 
+from tests import cached_yaml as yaml
 
-def test_network_format(heat_template):
-    '''
-    Make sure all network properties use the allowed naming
-    conventions
-    '''
-    with open(heat_template) as fh:
+from .helpers import validates
+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$"
+    )
+
+    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:
             continue
-        if v.get("type") != "OS::Neutron::Port":
+        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), (
+        "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 isinstance(v, dict):
+            continue
+        if "properties" not in v:
+            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:
             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 set(invalid_ports)
+    assert not networks, "Networks detected without subnet {}".format(networks)