openstack/vitrage
Code Issues Proposed changes

tempest utility function

Browse Source 
Change-Id: Ie44e823a6cfeb274e8e4402f89e201cd690ff50a
This commit is contained in:
Idan Hefetz 2017-12-05 10:10:42 +00:00
parent 793d2450b6
commit 7dc4f2424e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vitrage_tempest_tests/tests/common/general_utils.py
View File

@ -15,14 +15,14 @@ import six
def first_match(list_of_dicts, **kwargs): def first_match(list_of_dicts, **kwargs):
subset_dict = _subset_dict(**kwargs) subset_dict = _remove_none_values(**kwargs)
for d in list_of_dicts: for d in list_of_dicts:
if is_subset(subset_dict, d): if is_subset(subset_dict, d):
return d return d
def all_matches(list_of_dicts, **kwargs): def all_matches(list_of_dicts, **kwargs):
subset_dict = _subset_dict(**kwargs) subset_dict = _remove_none_values(**kwargs)
return [d for d in list_of_dicts if is_subset(subset_dict, d)] return [d for d in list_of_dicts if is_subset(subset_dict, d)]
@ -35,9 +35,5 @@ def is_subset(subset, full):
return six.viewitems(subset) <= six.viewitems(full_dict) return six.viewitems(subset) <= six.viewitems(full_dict)
def _subset_dict(**kwargs): def _remove_none_values(**kwargs):
subset_dict_final = dict() return {k: v for k, v in kwargs.items() if v is not None}
for keyword, arg in kwargs.items():
if arg is not None:
subset_dict_final[keyword] = arg
return subset_dict_final