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] pseudo-parameters nested parameters
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
utils
/
nested_iterables.py
diff --git
a/ice_validator/tests/utils/nested_iterables.py
b/ice_validator/tests/utils/nested_iterables.py
index
5966201
..
44ca2bc
100644
(file)
--- a/
ice_validator/tests/utils/nested_iterables.py
+++ b/
ice_validator/tests/utils/nested_iterables.py
@@
-38,6
+38,11
@@
#
#
+def is_pseudo_param(parameter):
+ pseudo_parameters = ["OS::stack_name", "OS::stack_id", "OS::project_id"]
+ return parameter in pseudo_parameters
+
+
def parse_nested_dict(d, key=""):
"""
parse the nested dictionary and return values of
def parse_nested_dict(d, key=""):
"""
parse the nested dictionary and return values of
@@
-63,13
+68,12
@@
def find_all_get_param_in_yml(yml):
Recursively find all referenced parameters in a parsed yaml body
and return a list of parameters
"""
Recursively find all referenced parameters in a parsed yaml body
and return a list of parameters
"""
- os_pseudo_parameters = ["OS::stack_name", "OS::stack_id", "OS::project_id"]
if not hasattr(yml, "items"):
return []
params = []
for k, v in yml.items():
if not hasattr(yml, "items"):
return []
params = []
for k, v in yml.items():
- if k == "get_param" and
v not in os_pseudo_parameters
:
+ if k == "get_param" and
not is_pseudo_param(v)
:
if isinstance(v, list) and not isinstance(v[0], dict):
params.append(v[0])
elif not isinstance(v, dict) and isinstance(v, str):
if isinstance(v, list) and not isinstance(v[0], dict):
params.append(v[0])
elif not isinstance(v, dict) and isinstance(v, str):