[checkmk-commits] Rename tag_groups_of_host to tags_of_host

Module: check_mk Branch: master Commit: c542bc2b0df122e844958a89e26e8c2b54cffce2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c542bc2b0df122… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 15:12:12 2019 +0200 Rename tag_groups_of_host to tags_of_host Change-Id: I03138d92f8ed901a03aada35351976a0c9b06819 --- cmk_base/config.py | 3 +-- cmk_base/core_config.py | 2 +- cmk_base/dump_host.py | 5 +++-- tests/unit/cmk_base/test_config.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 9411c37..af569be 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -2938,8 +2938,7 @@ class ConfigCache(object): empty list.""" return self._hosttags.get(hostname, []) - # TODO: Rename to tags_of_host - def tag_groups_of_host(self, hostname): + def tags_of_host(self, hostname): """Returns the dict of all configured tag groups and values of a host""" return host_tags.get(hostname, {}) diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index c71f30d..294be85 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -393,7 +393,7 @@ def get_host_attributes(hostname, config_cache): # "__TAG_" instead. We may deprecate this is one day. attrs["_TAGS"] = " ".join(sorted(config_cache.tag_list_of_host(hostname))) - attrs.update(_get_tag_attributes(config_cache.tag_groups_of_host(hostname))) + attrs.update(_get_tag_attributes(config_cache.tags_of_host(hostname))) if "alias" not in attrs: attrs["alias"] = config.alias_of(hostname, hostname) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 87c057e..aa8bb10 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -78,8 +78,9 @@ def dump_host(hostname): (addresses if addresses is not None else "No IP") + "\n") tag_template = tty.bold + "[" + tty.normal + "%s" + tty.bold + "]" + tty.normal - tags = [(tag_template % ":".join(t)) - for t in sorted(config_cache.tag_groups_of_host(hostname).items())] + tags = [ + (tag_template % ":".join(t)) for t in sorted(config_cache.tags_of_host(hostname).items()) + ] console.output(tty.yellow + "Tags: " + tty.normal + ", ".join(tags) + "\n") if config.is_cluster(hostname): parents_list = config.nodes_of(hostname) diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 526fb82..f572b33 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -243,11 +243,11 @@ def test_host_tags_of_host(monkeypatch): cfg = config.HostConfig("xyz") assert cfg.tag_groups == {} - assert config.get_config_cache().tag_groups_of_host("xyz") == {} + assert config.get_config_cache().tags_of_host("xyz") == {} cfg = config.HostConfig("test-host") assert cfg.tag_groups == {"tag_group": "abc"} - assert config.get_config_cache().tag_groups_of_host("test-host") == {"tag_group": "abc"} + assert config.get_config_cache().tags_of_host("test-host") == {"tag_group": "abc"} def test_service_tag_rules_default():