Module: check_mk
Branch: master
Commit: 26d36811e4f88701ae7912dbad105f22d22f9f3b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d36811e4f887…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Apr 15 22:37:48 2019 +0200
Cleanup all direct config.is_ipv4v6_host calls
Change-Id: Ie628fccaa75314c1d37a488d8a177c2e96688155
---
cmk_base/config.py | 5 -----
cmk_base/core_nagios.py | 2 +-
cmk_base/dump_host.py | 2 +-
tests/unit/cmk_base/test_config.py | 1 -
4 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/cmk_base/config.py b/cmk_base/config.py
index f0f87ee..259b8b4 100644
--- a/cmk_base/config.py
+++ b/cmk_base/config.py
@@ -834,11 +834,6 @@ def parents_of(hostname):
# TODO: Replace call sites with HostConfig access and remove this
-def is_ipv4v6_host(hostname):
- return get_config_cache().get_host_config(hostname).is_ipv4v6_host
-
-
-# TODO: Replace call sites with HostConfig access and remove this
def is_ipv6_host(hostname):
return get_config_cache().get_host_config(hostname).is_ipv6_host
diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py
index eceecb6..b8cf94b 100644
--- a/cmk_base/core_nagios.py
+++ b/cmk_base/core_nagios.py
@@ -599,7 +599,7 @@ def _create_nagios_servicedefs(cfg, config_cache, hostname,
host_attrs):
host_attrs["address"], host_config.is_ipv6_primary
and 6 or 4, "PING",
host_attrs.get("_NODEIPS"))
- if config.is_ipv4v6_host(hostname):
+ if host_config.is_ipv4v6_host:
if host_config.is_ipv6_primary:
_add_ping_service(cfg, config_cache, hostname,
host_attrs["_ADDRESS_4"], 4, "PING IPv4",
host_attrs.get("_NODEIPS_4"))
diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py
index 8a67e68..17ec227 100644
--- a/cmk_base/dump_host.py
+++ b/cmk_base/dump_host.py
@@ -56,7 +56,7 @@ def dump_host(hostname):
ipaddress = _ip_address_for_dump_host(host_config)
addresses = ""
- if not config.is_ipv4v6_host(hostname):
+ if not host_config.is_ipv4v6_host:
addresses = ipaddress
else:
try:
diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py
index 725e512..9e7a550 100644
--- a/tests/unit/cmk_base/test_config.py
+++ b/tests/unit/cmk_base/test_config.py
@@ -50,7 +50,6 @@ def test_is_ipv6_host(monkeypatch, hostname, tags, result):
])
def test_is_ipv4v6_host(monkeypatch, hostname, tags, result):
config_cache = _setup_host(monkeypatch, hostname, tags)
- assert config.is_ipv4v6_host(hostname) == result
assert config_cache.get_host_config(hostname).is_ipv4v6_host == result