Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
change if bad to assert not bad, message
[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
dde4176
..
dbb0d04
100644
(file)
--- a/
ice_validator/tests/test_heat_parameter_section.py
+++ b/
ice_validator/tests/test_heat_parameter_section.py
@@
-1,8
+1,8
@@
# -*- coding: utf8 -*-
# -*- coding: utf8 -*-
-# ============LICENSE_START====================================================
===
+# ============LICENSE_START====================================================
# org.onap.vvp/validation-scripts
# ===================================================================
# org.onap.vvp/validation-scripts
# ===================================================================
-# Copyright © 201
8
AT&T Intellectual Property. All rights reserved.
+# Copyright © 201
7
AT&T Intellectual Property. All rights reserved.
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
@@
-35,40
+35,22
@@
#
# ============LICENSE_END============================================
#
#
# ============LICENSE_END============================================
#
-# 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_]+$")
+"""parameters
+"""
-def test_parameter_valid_keys(yaml_file):
- """
- Make sure each parameter is a dict and only contain
- valid keys
- """
- key_values = ["type", "label", "description", "hidden", "constraints", "immutable"]
+import re
- with open(yaml_file) as fh:
- yml = yaml.load(fh)
+import pytest
+from tests import cached_yaml as yaml
- # skip if parameters are not defined
- if "parameters" not in yml:
- pytest.skip("No parameters specified in the heat template")
+from .helpers import validates
- invalid_params = []
- for v1 in yml["parameters"].values():
- if not isinstance(v1, dict):
- continue
- detected_keys = set(v1) & set(key_values)
- if set(v1) != set(detected_keys):
- invalid_params.append(str(v1))
+VERSION = "1.0.0"
- assert not set(invalid_params)
+# one or more (alphanumeric or underscore)
+RE_VALID_PARAMETER_NAME = re.compile(r"[\w_]+$")
@validates("R-90526")
@validates("R-90526")
@@
-83,14
+65,17
@@
def test_default_values(yaml_file):
if "parameters" not in yml:
pytest.skip("No parameters specified in the heat template")
if "parameters" not in yml:
pytest.skip("No parameters specified in the heat template")
- invalid_params =
[]
- for
v1 in yml["parameters"].value
s():
+ invalid_params =
set()
+ for
param, v1 in yml["parameters"].item
s():
if not isinstance(v1, dict):
continue
if any(k == "default" for k in v1):
if not isinstance(v1, dict):
continue
if any(k == "default" for k in v1):
- invalid_params.a
ppend(str(v1)
)
+ invalid_params.a
dd(param
)
- assert not set(invalid_params)
+ msg = "The following parameters specify a default: {}".format(
+ ", ".join(invalid_params)
+ )
+ assert not invalid_params, msg
@validates("R-25877")
@validates("R-25877")