X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_volume_templates.py;h=634da5c58fa729e68e3a580aac98267857771b17;hb=da26f1709fa5406ee3efebdb82d2c43fcf0122a1;hp=d30ee19237fb541251bf1b37bb789812320466d6;hpb=cc21b8b08b6dbcec577bfb26ff397ac899da8002;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_volume_templates.py b/ice_validator/tests/test_volume_templates.py
index d30ee19..634da5c 100644
--- a/ice_validator/tests/test_volume_templates.py
+++ b/ice_validator/tests/test_volume_templates.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,33 +35,60 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
+from tests import cached_yaml as yaml
 
-import yaml
+from .helpers import validates
+from .utils.nested_files import get_list_of_nested_files
+
+import os
 import pytest
 
 
-def test_volume_templates_only_contains_cinder(volume_template):
-    '''
+@validates("R-270358")
+def test_volume_templates_contains_cinder_or_resource_group(volume_template):
+    """
     Check that all templates marked as volume templates are
     in fact volume templates
-    '''
+    """
+    acceptable_resources = []
+    dirname = os.path.dirname(volume_template)
+    list_of_files = get_list_of_nested_files(volume_template, dirname)
+
+    list_of_files.append(volume_template)
+
+    for file in list_of_files:
+        with open(file) as fh:
+            yml = yaml.load(fh)
+        resources = yml.get("resources") or {}
+        for k, v in resources.items():
+            if not isinstance(v, dict):
+                continue
+            if "type" not in v:
+                continue
+            if v["type"] in ["OS::Cinder::Volume", "OS::Heat::ResourceGroup"]:
+                acceptable_resources.append(k)
+
+    assert acceptable_resources, (
+        "No OS::Cinder::Volume or OS::Heat::ResourceGroup resources "
+        "found in volume module"
+    )
+
+
+@validates("R-55306")
+def test_no_vf_module_index_in_cinder(volume_template):
+    """
+    vf_module_index is prohibited in volume templates
+    """
+
     with open(volume_template) 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")
-
-    non_volumes = []
-    for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "type" not in v:
-            continue
-        if v["type"] not in ["OS::Cinder::Volume",
-                             "OS::Heat::ResourceGroup"]:
-            non_volumes.append(k)
+    if "parameters" not in yml:
+        pytest.skip("No parameters specified in the heat template")
 
-    assert not set(non_volumes)
+    parameters = yml.get("parameters")
+    if parameters and isinstance(parameters, dict):
+        assert (
+            "vf_module_index" not in parameters
+        ), "{} must not use vf_module_index as a parameter".format(volume_template)