From 2b84f86b08967a996d693d3970fb2ac1c91e9b18 Mon Sep 17 00:00:00 2001 From: Idan Hefetz Date: Tue, 5 Dec 2017 10:10:42 +0000 Subject: [PATCH] tempest utility function Change-Id: Ie44e823a6cfeb274e8e4402f89e201cd690ff50a --- vitrage_tempest_tests/tests/common/general_utils.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/vitrage_tempest_tests/tests/common/general_utils.py b/vitrage_tempest_tests/tests/common/general_utils.py index 35d8919..40f6bfb 100644 --- a/vitrage_tempest_tests/tests/common/general_utils.py +++ b/vitrage_tempest_tests/tests/common/general_utils.py @@ -15,14 +15,14 @@ import six def first_match(list_of_dicts, **kwargs): - subset_dict = _subset_dict(**kwargs) + subset_dict = _remove_none_values(**kwargs) for d in list_of_dicts: if is_subset(subset_dict, d): return d 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)] @@ -35,9 +35,5 @@ def is_subset(subset, full): return six.viewitems(subset) <= six.viewitems(full_dict) -def _subset_dict(**kwargs): - subset_dict_final = dict() - for keyword, arg in kwargs.items(): - if arg is not None: - subset_dict_final[keyword] = arg - return subset_dict_final +def _remove_none_values(**kwargs): + return {k: v for k, v in kwargs.items() if v is not None}