X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_nova_servers_vm_types.py;h=a2d6a6e5ca616e893dcd90b405e64b37ea8edf46;hb=48a07b6942d3956666d30947372653feb702fdae;hp=48abe04b31a08bba88917c55a8382c1245f3cc67;hpb=f5edc06be0d8bedeb0904b348ba5e3e67c74f186;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_nova_servers_vm_types.py b/ice_validator/tests/test_nova_servers_vm_types.py
index 48abe04..a2d6a6e 100644
--- a/ice_validator/tests/test_nova_servers_vm_types.py
+++ b/ice_validator/tests/test_nova_servers_vm_types.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2019 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -37,19 +37,25 @@
 #
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-from .helpers import validates
 
 import pytest
-import yaml
-from .utils.vm_types import get_vm_types_for_resource
+import re
+
+from tests import cached_yaml as yaml
+
+from .helpers import validates
+
+from .utils.vm_types import get_vm_types_for_resource, get_vm_types
+
+from .utils.network_roles import get_network_roles
 
 
-@validates('R-57282', 'R-40499')
+@validates("R-57282")
 def test_vm_type_consistent_on_nova_servers(heat_template):
-    '''
+    """
     Make sure all nova servers have properly formatted properties
     for their name, image and flavor
-    '''
+    """
     with open(heat_template) as fh:
         yml = yaml.load(fh)
 
@@ -61,13 +67,119 @@ def test_vm_type_consistent_on_nova_servers(heat_template):
     for k, v in yml["resources"].items():
         if not isinstance(v, dict):
             continue
-        if v.get('type') != 'OS::Nova::Server':
+        if v.get("type") != "OS::Nova::Server":
             continue
-        if 'properties' not in v:
+        if "properties" not in v:
             continue
 
         vm_types = get_vm_types_for_resource(v)
         if len(vm_types) != 1:
             invalid_nova_servers.append(k)
 
-    assert not set(invalid_nova_servers)
+    assert not set(
+        invalid_nova_servers
+    ), "vm_types not consistant on the following resources: {}".format(
+        ",".join(invalid_nova_servers)
+    )
+
+
+@validates("R-48067", "R-00977")
+def test_vm_type_network_role_collision(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")
+
+    resources = yml["resources"]
+
+    vm_types = get_vm_types(resources)
+    network_roles = get_network_roles(resources)
+
+    collisions = []
+    for nr in network_roles:
+        for vt in vm_types:
+            if vt in nr:
+                collisions.append(
+                    (
+                        "vm_type ({}) cannot be a substring " "of network_role ({})"
+                    ).format(vt, nr)
+                )
+            elif nr in vt:
+                collisions.append(
+                    (
+                        "network_role ({}) cannot be a substring " "of vm_type ({})"
+                    ).format(nr, vt)
+                )
+
+    assert not collisions, ", ".join(collisions)
+
+
+@validates("R-50436", "R-45188", "R-40499")
+def test_nova_server_flavor_parameter(yaml_file):
+    check_nova_parameter_format("flavor", yaml_file)
+
+
+@validates("R-51430", "R-54171", "R-87817")
+def test_nova_server_name_parameter(yaml_file):
+    check_nova_parameter_format("name", yaml_file)
+
+
+@validates("R-71152", "R-57282", "R-58670")
+def test_nova_server_image_parameter(yaml_file):
+    check_nova_parameter_format("image", yaml_file)
+
+
+def check_nova_parameter_format(prop, yaml_file):
+
+    formats = {
+        "string": {
+            "name": re.compile(r"(.+?)_name_\d+$"),
+            "flavor": re.compile(r"(.+?)_flavor_name$"),
+            "image": re.compile(r"(.+?)_image_name$"),
+        },
+        "comma_delimited_list": {"name": re.compile(r"(.+?)_names$")},
+    }
+
+    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")
+
+    # skip if resources are not defined
+    if "parameters" not in yml:
+        pytest.skip("No parameters specified in the heat template")
+
+    invalid_parameters = []
+
+    for k, v in yml["resources"].items():
+        if not isinstance(v, dict):
+            continue
+        if v.get("type") != "OS::Nova::Server":
+            continue
+
+        prop_val = v.get("properties", {}).get(prop, {})
+        prop_param = prop_val.get("get_param", "") if isinstance(prop_val, dict) else ""
+
+        if not prop_param:
+            pytest.skip("{} doesn't have property {}".format(k, prop))
+        elif isinstance(prop_param, list):
+            prop_param = prop_param[0]
+
+        template_param_type = yml.get("parameters", {}).get(prop_param, {}).get("type")
+
+        if not template_param_type:
+            pytest.skip("could not determine param type for {}".format(prop_param))
+
+        format_match = formats.get(template_param_type, {}).get(prop)
+
+        if not format_match or not format_match.match(prop_param):
+            msg = (
+                "Invalid parameter format ({}) on Resource ID ({}) property" " ({})"
+            ).format(prop_param, k, prop)
+            invalid_parameters.append(msg)
+
+    assert not set(invalid_parameters), ", ".join(invalid_parameters)