aboutsummaryrefslogtreecommitdiffstats
path: root/ice_validator/tests
diff options
context:
space:
mode:
authorLovett, Trevor <trevor.lovett@att.com>2019-07-24 13:34:59 -0500
committerLovett, Trevor (tl2972) <tl2972@att.com>2019-07-24 13:35:11 -0500
commit9e39bf74ce93945b322c554349e85afca3a79852 (patch)
treeb7a01323c99e07f6c196ccf0eee6fc62e422e5c4 /ice_validator/tests
parent3140095996787a4bd322a9c0448e590a918f7093 (diff)
[VVP] Fixed issue in unused parameter detection
Issue-ID: VVP-247 Change-Id: I02e2da52fdfa31a1d056b9839063373453c8ace7 Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>
Diffstat (limited to 'ice_validator/tests')
-rw-r--r--ice_validator/tests/helpers.py2
-rw-r--r--ice_validator/tests/utils/nested_iterables.py164
2 files changed, 19 insertions, 147 deletions
diff --git a/ice_validator/tests/helpers.py b/ice_validator/tests/helpers.py
index fd78c75..6a6fb73 100644
--- a/ice_validator/tests/helpers.py
+++ b/ice_validator/tests/helpers.py
@@ -218,7 +218,7 @@ def traverse(data, search_key, func, path=None):
elif isinstance(data, list):
for value in data:
curr_path = path + [value]
- if isinstance(value, dict):
+ if isinstance(value, (dict, list)):
traverse(value, search_key, func, curr_path)
elif value == search_key:
func(curr_path, value)
diff --git a/ice_validator/tests/utils/nested_iterables.py b/ice_validator/tests/utils/nested_iterables.py
index 44ca2bc..a868e5a 100644
--- a/ice_validator/tests/utils/nested_iterables.py
+++ b/ice_validator/tests/utils/nested_iterables.py
@@ -36,6 +36,7 @@
# ============LICENSE_END============================================
#
#
+from tests.helpers import traverse
def is_pseudo_param(parameter):
@@ -43,24 +44,15 @@ def is_pseudo_param(parameter):
return parameter in pseudo_parameters
-def parse_nested_dict(d, key=""):
- """
- parse the nested dictionary and return values of
- given key of function parameter only
- """
- nested_elements = []
- for k, v in d.items():
- if isinstance(v, dict):
- sub_dict = parse_nested_dict(v, key)
- nested_elements.extend(sub_dict)
- else:
- if key:
- if k == key:
- nested_elements.append(v)
- else:
- nested_elements.append(v)
+class ParameterCollector:
+ def __init__(self):
+ self.params = set()
- return nested_elements
+ def __call__(self, _, value):
+ if isinstance(value, str):
+ self.params.add(value)
+ elif isinstance(value, list) and len(value) >= 1:
+ self.params.add(value[0])
def find_all_get_param_in_yml(yml):
@@ -68,32 +60,9 @@ def find_all_get_param_in_yml(yml):
Recursively find all referenced parameters in a parsed yaml body
and return a list of parameters
"""
-
- if not hasattr(yml, "items"):
- return []
- params = []
- for k, v in yml.items():
- 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):
- params.append(v)
- for item in v if isinstance(v, list) else [v]:
- if isinstance(item, dict):
- params.extend(find_all_get_param_in_yml(item))
- continue
- elif k == "list_join":
- for item in v if isinstance(v, list) else [v]:
- if isinstance(item, list):
- for d in item:
- params.extend(find_all_get_param_in_yml(d))
- continue
- if isinstance(v, dict):
- params.extend(find_all_get_param_in_yml(v))
- elif isinstance(v, list):
- for d in v:
- params.extend(find_all_get_param_in_yml(d))
- return params
+ collector = ParameterCollector()
+ traverse(yml, "get_param", collector)
+ return {p for p in collector.params if not is_pseudo_param(p)}
def find_all_get_resource_in_yml(yml):
@@ -101,22 +70,9 @@ def find_all_get_resource_in_yml(yml):
Recursively find all referenced resources
in a parsed yaml body and return a list of resource ids
"""
- if not hasattr(yml, "items"):
- return []
- resources = []
- for k, v in yml.items():
- if k == "get_resource":
- if isinstance(v, list):
- resources.append(v[0])
- else:
- resources.append(v)
- continue
- if isinstance(v, dict):
- resources.extend(find_all_get_resource_in_yml(v))
- elif isinstance(v, list):
- for d in v:
- resources.extend(find_all_get_resource_in_yml(d))
- return resources
+ collector = ParameterCollector()
+ traverse(yml, "get_resource", collector)
+ return collector.params
def find_all_get_file_in_yml(yml):
@@ -124,90 +80,6 @@ def find_all_get_file_in_yml(yml):
Recursively find all get_file in a parsed yaml body
and return the list of referenced files/urls
"""
- if not hasattr(yml, "items"):
- return []
- resources = []
- for k, v in yml.items():
- if k == "get_file":
- if isinstance(v, list):
- resources.append(v[0])
- else:
- resources.append(v)
- continue
- if isinstance(v, dict):
- resources.extend(find_all_get_file_in_yml(v))
- elif isinstance(v, list):
- for d in v:
- resources.extend(find_all_get_file_in_yml(d))
- return resources
-
-
-def find_all_get_resource_in_resource(resource):
- """
- Recursively find all referenced resources
- in a heat resource and return a list of resource ids
- """
- if not hasattr(resource, "items"):
- return []
-
- resources = []
- for k, v in resource.items():
- if k == "get_resource":
- if isinstance(v, list):
- resources.append(v[0])
- else:
- resources.append(v)
- continue
- if isinstance(v, dict):
- resources.extend(find_all_get_resource_in_resource(v))
- elif isinstance(v, list):
- for d in v:
- resources.extend(find_all_get_resource_in_resource(d))
- return resources
-
-
-def get_associated_resources_per_resource(resources):
- """
- Recursively find all referenced resources for each resource
- in a list of resource ids
- """
- if not hasattr(resources, "items"):
- return None
-
- resources_dict = {}
- resources_dict["resources"] = {}
- ref_resources = []
-
- for res_key, res_value in resources.items():
- get_resources = []
-
- for k, v in res_value:
- if k == "get_resource" and isinstance(v, dict):
- get_resources = find_all_get_resource_in_resource(v)
-
- # if resources found, add to dict
- if get_resources:
- ref_resources.extend(get_resources)
- resources_dict["resources"][res_key] = {
- "res_value": res_value,
- "get_resources": get_resources,
- }
-
- resources_dict["ref_resources"] = set(ref_resources)
-
- return resources_dict
-
-
-def flatten(items):
- """
- flatten items from any nested iterable
- """
-
- merged_list = []
- for item in items:
- if isinstance(item, list):
- sub_list = flatten(item)
- merged_list.extend(sub_list)
- else:
- merged_list.append(item)
- return merged_list
+ collector = ParameterCollector()
+ traverse(yml, "get_file", collector)
+ return collector.params