[VVP] Support pluggable data sources for preload data

[vvp/validation-scripts.git] / ice_validator / tests / test_volume_module_naming.py

diff --git a/ice_validator/tests/test_volume_module_naming.py b/ice_validator/tests/test_volume_module_naming.py
index 770ad26..459c132 100644 (file)
--- a/ice_validator/tests/test_volume_module_naming.py
+++ b/ice_validator/tests/test_volume_module_naming.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
@@ -36,7 +36,8 @@
 # ============LICENSE_END============================================
 import os
 
-from tests.parametrizers import get_nested_files
+from tests.helpers import validates
+from tests.utils.nested_files import get_nested_files
 from tests.structures import Heat, Resource
 
 
@@ -45,7 +46,7 @@ def non_nested_files(filenames):
     return set(filenames).difference(set(nested_files))
 
 
-# No requirement ID yet available
+@validates("R-589037")
 def test_detected_volume_module_follows_naming_convention(template_dir):
     all_files = [os.path.join(template_dir, f) for f in os.listdir(template_dir)]
     yaml_files = [f for f in all_files if f.endswith(".yaml") or f.endswith(".yml")]
@@ -74,6 +75,6 @@ def test_detected_volume_module_follows_naming_convention(template_dir):
             errors.append(yaml_file)
         msg = (
             "Volume modules detected, but they do not follow the expected "
-            + " naming convention {{module_name}}_volume.[yaml|yml]: {}"
+            + " naming convention {{module_label}}_volume.[yaml|yml]: {}"
         ).format(", ".join(errors))
         assert not errors, msg