Module: check_mk
Branch: master
Commit: 6e270d6c1324863ab68cffe9412a7bb87f43f8e0
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e270d6c132486…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Apr 15 22:47:05 2019 +0200
Cleanup all direct config.is_ipv6_host calls
Change-Id: I9f51e9504bfba1cef6a7242db2b9c3f55e134302
---
cmk_base/config.py | 5 -----
cmk_base/core_config.py | 4 ++--
cmk_base/core_nagios.py | 14 +++++++++-----
cmk_base/ip_lookup.py | 8 ++++++--
tests/unit/cmk_base/test_config.py | 1 -
5 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/cmk_base/config.py b/cmk_base/config.py
index 259b8b4..9766cb5 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_ipv6_host(hostname):
- return get_config_cache().get_host_config(hostname).is_ipv6_host
-
-
-# TODO: Replace call sites with HostConfig access and remove this
def is_ipv4_host(hostname):
return get_config_cache().get_host_config(hostname).is_ipv4_host
diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py
index bbd4d20..69e3968 100644
--- a/cmk_base/core_config.py
+++ b/cmk_base/core_config.py
@@ -413,7 +413,7 @@ def get_host_attributes(hostname, config_cache):
else:
attrs["_ADDRESS_4"] = ""
- if config.is_ipv6_host(hostname):
+ if host_config.is_ipv6_host:
attrs["_ADDRESS_6"] = _ip_address_of(host_config, 6)
if attrs["_ADDRESS_6"] is None:
attrs["_ADDRESS_6"] = ""
@@ -492,7 +492,7 @@ def get_cluster_attributes(config_cache, host_config, nodes):
node_ips_4.append(fallback_ip_for(node_config, 4))
node_ips_6 = []
- if config.is_ipv6_host(host_config.hostname):
+ if host_config.is_ipv6_host:
for h in sorted_nodes:
node_config = config_cache.get_host_config(h)
addr = _ip_address_of(node_config, 6)
diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py
index b8cf94b..b57dfde 100644
--- a/cmk_base/core_nagios.py
+++ b/cmk_base/core_nagios.py
@@ -981,10 +981,12 @@ def precompile_hostchecks():
if not os.path.exists(cmk.utils.paths.precompiled_hostchecks_dir):
os.makedirs(cmk.utils.paths.precompiled_hostchecks_dir)
+ config_cache = config.get_config_cache()
+
console.verbose("Precompiling host checks...\n")
for host in config.all_active_hosts():
try:
- _precompile_hostcheck(host)
+ _precompile_hostcheck(config_cache, host)
except Exception as e:
if cmk.utils.debug.enabled():
raise
@@ -1008,8 +1010,9 @@ def stripped_python_file(filename):
return a
-def _precompile_hostcheck(hostname):
+def _precompile_hostcheck(config_cache, hostname):
import cmk_base.check_table as check_table
+ host_config = config_cache.get_host_config(hostname)
console.verbose("%s%s%-16s%s:", tty.bold, tty.blue, hostname, tty.normal,
stream=sys.stderr)
@@ -1118,10 +1121,11 @@ if '-d' in sys.argv:
needed_ipaddresses, needed_ipv6addresses, = {}, {}
if config.is_cluster(hostname):
for node in config.nodes_of(hostname):
+ node_config = config_cache.get_host_config(node)
if config.is_ipv4_host(node):
needed_ipaddresses[node] = ip_lookup.lookup_ipv4_address(node)
- if config.is_ipv6_host(node):
+ if node_config.is_ipv6_host:
needed_ipv6addresses[node] = ip_lookup.lookup_ipv6_address(node)
try:
@@ -1131,7 +1135,7 @@ if '-d' in sys.argv:
pass
try:
- if config.is_ipv6_host(hostname):
+ if host_config.is_ipv6_host:
needed_ipv6addresses[hostname] = ip_lookup.lookup_ipv6_address(hostname)
except:
pass
@@ -1139,7 +1143,7 @@ if '-d' in sys.argv:
if config.is_ipv4_host(hostname):
needed_ipaddresses[hostname] = ip_lookup.lookup_ipv4_address(hostname)
- if config.is_ipv6_host(hostname):
+ if host_config.is_ipv6_host:
needed_ipv6addresses[hostname] = ip_lookup.lookup_ipv6_address(hostname)
output.write("config.ipaddresses = %r\n\n" % needed_ipaddresses)
diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py
index 1811e7d..16fa58a 100644
--- a/cmk_base/ip_lookup.py
+++ b/cmk_base/ip_lookup.py
@@ -226,13 +226,17 @@ def update_dns_cache():
if e.errno != errno.ENOENT:
raise
+ config_cache = config.get_config_cache()
+
console.verbose("Updating DNS cache...\n")
for hostname in config.all_active_hosts():
+ host_config = config_cache.get_host_config(hostname)
+
# Use intelligent logic. This prevents DNS lookups for hosts
# with statically configured addresses, etc.
for family in [4, 6]:
- if (family == 4 and config.is_ipv4_host(hostname)) \
- or (family == 6 and config.is_ipv6_host(hostname)):
+ if (family == 4 and host_config.is_ipv4_host) \
+ or (family == 6 and host_config.is_ipv6_host):
console.verbose("%s (IPv%d)..." % (hostname, family))
try:
if family == 4:
diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py
index 9e7a550..d660dd3 100644
--- a/tests/unit/cmk_base/test_config.py
+++ b/tests/unit/cmk_base/test_config.py
@@ -37,7 +37,6 @@ def test_is_ipv4_host(monkeypatch, hostname, tags, result):
])
def test_is_ipv6_host(monkeypatch, hostname, tags, result):
config_cache = _setup_host(monkeypatch, hostname, tags)
- assert config.is_ipv6_host(hostname) == result
assert config_cache.get_host_config(hostname).is_ipv6_host == result