[checkmk-commits] Remove module level config.is_snmp_host

Module: check_mk Branch: master Commit: 072bac2b4da5f6f88b59276a93c875760c62dbfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=072bac2b4da5f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 15:02:54 2019 +0200 Remove module level config.is_snmp_host Change-Id: Id8347b0d6036cf1cc7507a56bc2e05117c3721a7 --- cmk_base/config.py | 9 +++------ cmk_base/data_sources/__init__.py | 16 ++++++++-------- cmk_base/ip_lookup.py | 6 ++++-- cmk_base/snmp.py | 5 ++++- tests/unit/cmk_base/test_config.py | 1 - 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 70c995e..3322fb7 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -830,11 +830,6 @@ def is_tcp_host(hostname): # TODO: Replace call sites with HostConfig access and remove this -def is_snmp_host(hostname): - return get_config_cache().get_host_config(hostname).is_snmp_host - - -# TODO: Replace call sites with HostConfig access and remove this def is_ping_host(hostname): return get_config_cache().get_host_config(hostname).is_ping_host @@ -1057,8 +1052,9 @@ def is_snmpv2or3_without_bulkwalk_host(hostname): return in_binary_hostlist(hostname, snmpv2c_hosts) +# TODO: Replace call sites with HostConfig access and remove this def is_usewalk_host(hostname): - return in_binary_hostlist(hostname, usewalk_hosts) + return get_config_cache().get_host_config(hostname).is_usewalk_host def is_inline_snmp_host(hostname): @@ -2756,6 +2752,7 @@ class HostConfig(object): # Basic types self.is_tcp_host = self._config_cache.in_binary_hostlist(hostname, tcp_hosts) self.is_snmp_host = self._config_cache.in_binary_hostlist(hostname, snmp_hosts) + self.is_usewalk_host = self._config_cache.in_binary_hostlist(hostname, usewalk_hosts) if "piggyback" in self.tags: self.is_piggyback_host = True diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 60f7d5c..4602f4d 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -109,7 +109,7 @@ class DataSources(object): def _initialize_data_sources(self): self._sources = {} - if config.is_cluster(self._hostname): + if self._host_config.is_cluster: # Cluster hosts do not have any actual data sources # Instead all data is provided by the nodes return @@ -119,17 +119,17 @@ class DataSources(object): self._initialize_management_board_data_sources() def _initialize_agent_based_data_sources(self): - if config.is_all_agents_host(self._hostname): + if self._host_config.is_all_agents_host: source = self._get_agent_data_source(ignore_special_agents=True) source.set_main_agent_data_source() self._add_source(source) self._add_sources(self._get_special_agent_data_sources()) - elif config.is_all_special_agents_host(self._hostname): + elif self._host_config.is_all_special_agents_host: self._add_sources(self._get_special_agent_data_sources()) - elif config.is_tcp_host(self._hostname): + elif self._host_config.is_tcp_host: source = self._get_agent_data_source() source.set_main_agent_data_source() self._add_source(source) @@ -138,7 +138,7 @@ class DataSources(object): self._add_source(PiggyBackDataSource(self._hostname, self._ipaddress)) def _initialize_snmp_data_sources(self): - if config.is_snmp_host(self._hostname): + if self._host_config.is_snmp_host: self._add_source(SNMPDataSource(self._hostname, self._ipaddress)) def _initialize_management_board_data_sources(self): @@ -162,13 +162,13 @@ class DataSources(object): self._sources[source.id()] = source def describe_data_sources(self): - if config.is_all_agents_host(self._hostname): + if self._host_config.is_all_agents_host: return "Contact Check_MK Agent and use all enabled special agents" - elif config.is_all_special_agents_host(self._hostname): + elif self._host_config.is_all_special_agents_host: return "Use all enabled special agents" - elif config.is_tcp_host(self._hostname): + elif self._host_config.is_tcp_host: return "Contact either Check_MK Agent or use a single special agent" return "No agent" diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index 6c3f998..36621e4 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -75,9 +75,11 @@ def lookup_ip_address(hostname, family=None): if config.fake_dns: return config.fake_dns + host_config = config.get_config_cache().get_host_config(hostname) + # Honor simulation mode und usewalk hosts. Never contact the network. - elif config.simulation_mode or _enforce_localhost or \ - (config.is_usewalk_host(hostname) and config.is_snmp_host(hostname)): + if config.simulation_mode or _enforce_localhost or \ + (host_config.is_usewalk_host and host_config.is_snmp_host): if family == 4: return "127.0.0.1" diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index 9a69677..8fda89c 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -826,11 +826,14 @@ def do_snmpget(*args): raise MKBailOut("You need to specify an OID.") oid = args[0][0] + config_cache = config.get_config_cache() + hostnames = args[0][1:] if not hostnames: hostnames = [] for host in config.all_active_realhosts(): - if config.is_snmp_host(host): + host_config = config_cache.get_host_config(host) + if host_config.is_snmp_host: hostnames.append(host) for hostname in hostnames: diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 5046d52..229cf03 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -173,7 +173,6 @@ def test_is_ping_host(monkeypatch, hostname, tags, result): ]) def test_is_snmp_host(monkeypatch, hostname, tags, result): config_cache = _setup_host(monkeypatch, hostname, tags) - assert config.is_snmp_host(hostname) == result assert config_cache.get_host_config(hostname).is_snmp_host == result