[checkmk-commits] Renamed discovered_host_labels to discovered_labels

Module: check_mk Branch: master Commit: eecd917435e2ca30b7d7866217f80b5e195683b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eecd917435e2ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Apr 14 19:12:08 2019 +0200 Renamed discovered_host_labels to discovered_labels Change-Id: I2508ec119cf6f31b2c6644a3392f8fadfcd71917 --- cmk_base/config.py | 2 +- cmk_base/{discovered_host_labels.py => discovered_labels.py} | 0 cmk_base/inventory.py | 2 +- .../{test_discovered_host_labels.py => test_discovered_labels.py} | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 9fdc120..2d77fb2 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -54,7 +54,7 @@ import cmk_base.utils import cmk_base.check_api_utils as check_api_utils import cmk_base.cleanup import cmk_base.piggyback as piggyback -from cmk_base.discovered_host_labels import DiscoveredHostLabelsStore +from cmk_base.discovered_labels import DiscoveredHostLabelsStore # TODO: Prefix helper functions with "_". diff --git a/cmk_base/discovered_host_labels.py b/cmk_base/discovered_labels.py similarity index 100% rename from cmk_base/discovered_host_labels.py rename to cmk_base/discovered_labels.py diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 6ca87b4..c1ca54b 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -49,7 +49,7 @@ import cmk_base.data_sources as data_sources import cmk_base.cleanup import cmk_base.decorator import cmk_base.check_api as check_api -from cmk_base.discovered_host_labels import DiscoveredHostLabels, DiscoveredHostLabelsStore +from cmk_base.discovered_labels import DiscoveredHostLabels, DiscoveredHostLabelsStore #. # .--Inventory-----------------------------------------------------------. diff --git a/tests/unit/cmk_base/test_discovered_host_labels.py b/tests/unit/cmk_base/test_discovered_labels.py similarity index 96% rename from tests/unit/cmk_base/test_discovered_host_labels.py rename to tests/unit/cmk_base/test_discovered_labels.py index 4c7a171..e648713 100644 --- a/tests/unit/cmk_base/test_discovered_host_labels.py +++ b/tests/unit/cmk_base/test_discovered_labels.py @@ -5,7 +5,7 @@ import collections import pytest # type: ignore import cmk.utils.paths from cmk.utils.structured_data import StructuredDataTree -from cmk_base.discovered_host_labels import DiscoveredHostLabels, DiscoveredHostLabelsStore +from cmk_base.discovered_labels import DiscoveredHostLabels, DiscoveredHostLabelsStore @pytest.fixture()