X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_initial_configuration.py;h=13cc2c7f5f20ee2c4044f14b6753a7c0fa50fdef;hp=e4d8b01504304b549eb3fd60a8f465961a674d8a;hb=d8ffed96caada0308ac2ee3f4daf90b7aacb5137;hpb=ded5c74ea07eb1541587de1042444fa6b590ddde

diff --git a/ice_validator/tests/test_initial_configuration.py b/ice_validator/tests/test_initial_configuration.py
index e4d8b01..13cc2c7 100644
--- a/ice_validator/tests/test_initial_configuration.py
+++ b/ice_validator/tests/test_initial_configuration.py
@@ -176,20 +176,10 @@ def test_05_all_get_param_have_defined_parameter(yaml_file):
 
 @validates("R-90152")
 @pytest.mark.base
-def test_06_heat_template_resource_section_has_resources(heat_template):
-
-    found_resource = False
-
-    with open(heat_template) as fh:
-        yml = yaml.load(fh)
-
-    resources = yml.get("resources")
-    if resources:
-        for k1, v1 in yml["resources"].items():
-            if not isinstance(v1, dict):
-                continue
-
-            found_resource = True
-            break
-
-    assert found_resource, "Heat templates must contain at least one resource"
+def test_06_heat_template_resource_section_has_resources(yaml_file):
+    template = load_yaml(yaml_file)
+    if "resources" not in template:
+        pytest.skip("No resources section")
+    assert (
+        len(template["resources"]) > 0
+    ), "If resources section present, then there must be at least 1 resource defined."