[checkmk-commits] Rename function for consistency

Module: check_mk Branch: master Commit: e5ff2561a4276e10d2beb320ba21cf9d574258f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5ff2561a4276e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 14:51:48 2019 +0200 Rename function for consistency Change-Id: I1f8ef0774f10bdb39f7f65092d36721bfad50230 --- cmk_base/config.py | 6 +++--- cmk_base/core_config.py | 2 +- tests/unit/cmk_base/test_config.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 5f80543..d614770 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -3033,13 +3033,13 @@ class ConfigCache(object): }) return labels - def get_extra_attributes_of_service(self, hostname, description): + def extra_attributes_of_service(self, hostname, description): # type: (str, Text) -> Dict[str, Any] attrs = { "check_interval": 1.0, # 1 minute } - for key, conflist in extra_service_conf.items(): - values = self.service_extra_conf(hostname, description, conflist) + for key, ruleset in extra_service_conf.iteritems(): + values = self.service_extra_conf(hostname, description, ruleset) if not values: continue diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 42f96c1..7ce2fda 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -325,7 +325,7 @@ def _extra_service_attributes(hostname, description, config_cache, checkname, pa description).iteritems(): attrs["_%s" % varname.upper()] = value - attrs.update(config_cache.get_extra_attributes_of_service(hostname, description)) + attrs.update(config_cache.extra_attributes_of_service(hostname, description)) # Add explicit custom_variables for varname, value in config_cache.get_explicit_service_custom_variables( diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py index 1ab27b0..8f88292 100644 --- a/tests/unit/cmk_base/test_config.py +++ b/tests/unit/cmk_base/test_config.py @@ -1052,7 +1052,7 @@ def test_config_cache_extra_attributes_of_service(monkeypatch, hostname, result) ], }) config_cache = ts.apply(monkeypatch) - assert config_cache.get_extra_attributes_of_service(hostname, "CPU load") == result + assert config_cache.extra_attributes_of_service(hostname, "CPU load") == result @pytest.mark.parametrize("hostname,result", [