diff --git a/aodh/storage/base.py b/aodh/storage/base.py index 5df6b9b1e..65ae1c7ab 100644 --- a/aodh/storage/base.py +++ b/aodh/storage/base.py @@ -22,30 +22,6 @@ import six import aodh -def dict_to_keyval(value, key_base=None): - """Expand a given dict to its corresponding key-value pairs. - - Generated keys are fully qualified, delimited using dot notation. - ie. key = 'key.child_key.grandchild_key[0]' - """ - val_iter, key_func = None, None - if isinstance(value, dict): - val_iter = six.iteritems(value) - key_func = lambda k: key_base + '.' + k if key_base else k - elif isinstance(value, (tuple, list)): - val_iter = enumerate(value) - key_func = lambda k: key_base + '[%d]' % k - - if val_iter: - for k, v in val_iter: - key_gen = key_func(k) - if isinstance(v, dict) or isinstance(v, (tuple, list)): - for key_gen, v in dict_to_keyval(v, key_gen): - yield key_gen, v - else: - yield key_gen, v - - def update_nested(original_dict, updates): """Updates the leaf nodes in a nest dict. diff --git a/aodh/tests/unit/test_storage.py b/aodh/tests/unit/test_storage.py deleted file mode 100644 index 4ed8a484d..000000000 --- a/aodh/tests/unit/test_storage.py +++ /dev/null @@ -1,34 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -from oslotest import base - -from aodh.storage import base as storage_base - - -class TestUtils(base.BaseTestCase): - - def test_dict_to_kv(self): - data = {'a': 'A', - 'b': 'B', - 'nested': {'a': 'A', - 'b': 'B', - }, - 'nested2': [{'c': 'A'}, {'c': 'B'}] - } - pairs = list(storage_base.dict_to_keyval(data)) - self.assertEqual([('a', 'A'), - ('b', 'B'), - ('nested.a', 'A'), - ('nested.b', 'B'), - ('nested2[0].c', 'A'), - ('nested2[1].c', 'B')], - sorted(pairs, key=lambda x: x[0]))