[VNFRQTS] update decorator for validation script

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

diff --git a/ice_validator/tests/test_heat_parameter_section.py b/ice_validator/tests/test_heat_parameter_section.py
index 7559ee6..2aab7d3 100644 (file)
--- a/ice_validator/tests/test_heat_parameter_section.py
+++ b/ice_validator/tests/test_heat_parameter_section.py
@@ -37,10 +37,14 @@
 #
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-
+from .helpers import validates
 import pytest
+import re
 import yaml
 
+# one or more (alphanumeric or underscore)
+RE_VALID_PARAMETER_NAME = re.compile(r'[\w_]+$')
+
 
 def test_parameter_valid_keys(yaml_file):
     '''
@@ -63,11 +67,12 @@ def test_parameter_valid_keys(yaml_file):
             continue
         detected_keys = set(v1) & set(key_values)
         if set(v1) != set(detected_keys):
-            invalid_params.append(v1)
+            invalid_params.append(str(v1))
 
     assert not set(invalid_params)
 
 
+@validates('R-90526')
 def test_default_values(yaml_file):
     '''
     Make sure no default values are set for any parameter.
@@ -84,6 +89,27 @@ def test_default_values(yaml_file):
         if not isinstance(v1, dict):
             continue
         if any(k == 'default' for k in v1):
-            invalid_params.append(v1)
+            invalid_params.append(str(v1))
 
     assert not set(invalid_params)
+
+
+@validates('R-25877')
+def test_parameter_names(yaml_file):
+    '''
+    A VNF's Heat Orchestration Template's parameter name
+    (i.e., <param name>) **MUST** contain only alphanumeric
+    characters and underscores ('_').
+    '''
+    with open(yaml_file) as fh:
+        yml = yaml.load(fh)
+
+    # skip if parameters are not defined
+    if "parameters" not in yml:
+        pytest.skip("No parameters specified in the heat template")
+
+    for key in yml['parameters']:
+        assert RE_VALID_PARAMETER_NAME.match(key), (
+                '%s parameter "%s" not alphanumeric or underscore' % (
+                        yaml_file,
+                        key))