[VVP] base module is allowed to not have params

- R-35413 was updated to exclude base modules.
- Also updating other tests in file to use same logic.

Issue-ID: VVP-365
Signed-off-by: stark, steven <steven.stark@att.com>
Change-Id: I1073981ab1c4d98c4d9669b712231a6a4c45f121

diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/pass/base.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/pass/base.yaml
index 2737b4b..cfb4f3a 100644 (file)
--- a/ice_validator/tests/fixtures/test_heat_template_structure/pass/base.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/pass/base.yaml
@@ -37,13 +37,3 @@
 heat_template_version: 2015-04-30
 
 description: test
-
-parameters:
-  a:
-    type: string
-    description: Name of key-pair to be used for compute instance
-
-outputs:
-  a:
-    description: a value
-    value: { get_param: a }

diff --git a/ice_validator/tests/test_heat_template_structure.py b/ice_validator/tests/test_heat_template_structure.py
index da2de5e..3b69faf 100644 (file)
--- a/ice_validator/tests/test_heat_template_structure.py
+++ b/ice_validator/tests/test_heat_template_structure.py
@@ -54,15 +54,8 @@ 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 yml for k in required_key_values]
-    ), "{} doesn't contain the {} section, but it is required".format(
-        yaml_file, required_key_values[0]
-    )
+    template = load_yaml(yaml_file)
+    assert "heat_template_version" in template, "This template must contain a heat_template_version section"
 
 
 @validates("R-39402")
@@ -70,31 +63,19 @@ def test_heat_template_structure_contains_description(yaml_file):
     """
     Check that all heat templates have the required sections
     """
-    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]
-    ), "{} doesn't contain the {} section, but it is required".format(
-        yaml_file, required_key_values[0]
-    )
+    template = load_yaml(yaml_file)
+    assert "description" in template, "This template must contain a description section"
 
 
 @validates("R-35414")
-def test_heat_template_structure_contains_parameters(yaml_file):
+def test_heat_template_structure_contains_parameters(heat_template):
     """
     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]
-    )
+    if is_base_module(heat_template):
+        pytest.skip("Not applicable to base modules")
+    template = load_yaml(heat_template)
+    assert "parameters" in template, "This template must contain a parameters section"
 
 
 @validates("R-23664")