Module: check_mk
Branch: master
Commit: 815d6e8c985089e6972525ef8b52a257acf71662
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=815d6e8c985089…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Apr 4 12:58:26 2019 +0200
Fixed issue in recent refactoring
Change-Id: I8f98916659b62d3f9f5eb81ff4a98828560ef6a5
---
cmk_base/data_sources/__init__.py | 4 ++--
tests/unit/cmk_base/test_data_sources_unit.py | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py
index bef1f14..60f7d5c 100644
--- a/cmk_base/data_sources/__init__.py
+++ b/cmk_base/data_sources/__init__.py
@@ -98,7 +98,7 @@ class DataSources(object):
self._ipaddress = ipaddress
config_cache = config.get_config_cache()
- self._host_config = config.HostConfig(config_cache, hostname)
+ self._host_config = config_cache.get_host_config(hostname)
self._initialize_data_sources()
@@ -134,7 +134,7 @@ class DataSources(object):
source.set_main_agent_data_source()
self._add_source(source)
- if self._host_config.is_piggyback_host:
+ if "no-piggyback" not in self._host_config.tags:
self._add_source(PiggyBackDataSource(self._hostname, self._ipaddress))
def _initialize_snmp_data_sources(self):
diff --git a/tests/unit/cmk_base/test_data_sources_unit.py
b/tests/unit/cmk_base/test_data_sources_unit.py
index 9da2bee..9ce3420 100644
--- a/tests/unit/cmk_base/test_data_sources_unit.py
+++ b/tests/unit/cmk_base/test_data_sources_unit.py
@@ -238,9 +238,6 @@ def test_data_sources_of_hosts(clear_config_caches, monkeypatch,
hostname, setti
config.get_config_cache().initialize()
- print config.get_config_cache.get_host_config(hostname).is_piggyback_host
-
-
sources = cmk_base.data_sources.DataSources(hostname, "127.0.0.1")
source_names = [s.__class__.__name__ for s in sources.get_data_sources()]
assert settings["sources"] == source_names, "Wrong sources for
%s" % hostname