X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_heat_template_structure.py;h=192f45a23094fca42541415d6208f3f048625a19;hb=0c4e64d87728b89aa9cd4d41d738f5bfe64ceee3;hp=1e0b8c8c5fe0d92b9c45d5f2608b73a9cb764f8b;hpb=f5edc06be0d8bedeb0904b348ba5e3e67c74f186;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_heat_template_structure.py b/ice_validator/tests/test_heat_template_structure.py
index 1e0b8c8..192f45a 100644
--- a/ice_validator/tests/test_heat_template_structure.py
+++ b/ice_validator/tests/test_heat_template_structure.py
@@ -1,8 +1,8 @@
 # -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
+# ============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,89 +35,98 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
+
+"""Test heat template structure
+"""
+
+from tests import cached_yaml as yaml
 from .helpers import validates
-import yaml
 
+VERSION = "1.2.0"
 
-def test_heat_template_structure(yaml_file):
-    '''
-    Check that all heat templates only have the allowed sections
-    '''
-    key_values = ["heat_template_version", "description",
-                  "parameter_groups", "parameters", "resources",
-                  "outputs", "conditions"]
+# pylint: disable=invalid-name
+
+
+@validates("R-27078")
+def test_heat_template_structure_contains_heat_template_version(yaml_file):
+    """
+    Check that all heat templates have the required sections
+    """
+    required_key_values = ["heat_template_version"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
-    assert all([k in key_values for k in yml])
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        yaml_file, required_key_values[0]
+    )
 
 
-@validates('R-27078', 'R-39402', 'R-35414')
-def test_heat_template_structure_contains_required_sections(yaml_file):
-    '''
+@validates("R-39402")
+def test_heat_template_structure_contains_description(yaml_file):
+    """
     Check that all heat templates have the required sections
-    '''
-    required_key_values = ["heat_template_version", "description",
-                           "parameters", "resources"]
+    """
+    required_key_values = ["description"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
-    assert all([k in yml for k in required_key_values])
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        yaml_file, required_key_values[0]
+    )
 
 
-def test_heat_template_structure_sections_have_the_right_format(yaml_file):
-    '''
-    Check that all heat templates have sections of the right format.
-    Do note that it only tests for dicts or not dicts currently.
-    '''
-    key_values = ["heat_template_version", "description",
-                  "parameter_groups", "parameters", "resources",
-                  "outputs", "conditions"]
-    key_values_not_dicts = ["heat_template_version", "description"]
+@validates("R-35414")
+def test_heat_template_structure_contains_parameters(yaml_file):
+    """
+    Check that all heat templates have the required sections
+    """
+    required_key_values = ["parameters"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        yaml_file, required_key_values[0]
+    )
+
+
+@validates("R-23664")
+def test_heat_template_structure_contains_resources(heat_template):
+    """
+    Check that all heat templates have the required sections
+    """
+    required_key_values = ["resources"]
+
+    with open(heat_template) as fh:
+        yml = yaml.load(fh)
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        heat_template, required_key_values[0]
+    )
 
-    is_dict = 0
-    should_be_dict = 0
-    is_not_dict = 0
-    should_not_be_dict = 0
-    for key_value in key_values:
-        if key_value in yml:
-            if isinstance(yml[key_value], dict):
-                is_dict += 1
-                if key_value not in key_values_not_dicts:
-                    should_be_dict += 1
-            elif not isinstance(yml[key_value], list):
-                is_not_dict += 1
-                if key_value in key_values_not_dicts:
-                    should_not_be_dict += 1
-    assert (is_dict == should_be_dict and
-            is_not_dict == should_not_be_dict)
-
-
-@validates('R-11441')
+
+@validates("R-11441")
 def test_parameter_type(yaml_file):
-    types = [
-        'string',
-        'number',
-        'json',
-        'comma_delimited_list',
-        'boolean',
-    ]
+    """A VNF's Heat Orchestration Template's parameter type **MUST**
+    be one of the following values:
+    """
+    types = ["string", "number", "json", "comma_delimited_list", "boolean"]
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
-    for key, param in yml.get('parameters', {}).items():
-        assert isinstance(param, dict), '%s parameter %s is not dict' % (
-            yaml_file,
-            key)
-        assert 'type' in param, '%s parameter %s has no "type"' % (
-            yaml_file,
-            key)
-        typ = param['type']
+    for key, param in yml.get("parameters", {}).items():
+        assert isinstance(param, dict), "%s parameter %s is not dict" % (yaml_file, key)
+        if "type" not in param:
+            continue
+        typ = param["type"]
         assert typ in types, '%s parameter %s has invalid type "%s"' % (
             yaml_file,
             key,
-            typ)
+            typ,
+        )