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
[VVP] Additional check for RG params
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_nested_template_parameters.py
diff --git
a/ice_validator/tests/test_nested_template_parameters.py
b/ice_validator/tests/test_nested_template_parameters.py
index
26a0fb3
..
016ebc9
100644
(file)
--- a/
ice_validator/tests/test_nested_template_parameters.py
+++ b/
ice_validator/tests/test_nested_template_parameters.py
@@
-35,7
+35,6
@@
#
# ============LICENSE_END============================================
#
#
# ============LICENSE_END============================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
"""nested template parameters
#
"""nested template parameters
@@
-68,18
+67,26
@@
def validate_parms(dirname, basename, nested, nested_props, prop_type):
" of %s resource %s"
% (nested_filename, list(missing), prop_type, basename, rid)
)
" of %s resource %s"
% (nested_filename, list(missing), prop_type, basename, rid)
)
+ else:
+ additional = props - parms
+ if additional:
+ bad.append(
+ "%s properties %s not defined as "
+ "parameters in %s"
+ % (rid, list(additional), nested_filepath)
+ )
return bad
@validates("R-11041")
return bad
@validates("R-11041")
-def test_nested_template_parameters(
heat_templat
e):
+def test_nested_template_parameters(
yaml_fil
e):
"""
All parameters defined in a VNFs Nested YAML file
**MUST** be passed in as properties of the resource calling
the nested yaml file.
"""
"""
All parameters defined in a VNFs Nested YAML file
**MUST** be passed in as properties of the resource calling
the nested yaml file.
"""
- dirname, basename = os.path.split(
heat_templat
e)
- heat = Heat(filepath=
heat_templat
e)
+ dirname, basename = os.path.split(
yaml_fil
e)
+ heat = Heat(filepath=
yaml_fil
e)
if not heat.resources:
pytest.skip("No resources found")
nested_type = nested_files.get_type_nested_files(heat.yml, dirname)
if not heat.resources:
pytest.skip("No resources found")
nested_type = nested_files.get_type_nested_files(heat.yml, dirname)