Skip to content

Commit

Permalink
Cleanup dead code
Browse files Browse the repository at this point in the history
CMK-2458

Change-Id: I95618441ff0fd231a11241089136a4435e3def4f
  • Loading branch information
LarsMichelsen committed Aug 1, 2019
1 parent 3109f75 commit 1a3cd55
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 51 deletions.
23 changes: 0 additions & 23 deletions cmk_base/discovered_labels.py
Expand Up @@ -151,26 +151,3 @@ class DiscoveredServiceLabels(ABCDiscoveredLabels):
def add_label(self, label):
# type: (ServiceLabel) -> None
self._labels[label.name] = label.value


class DiscoveredServiceLabelsOfHost(object):
"""Manages the discovered labels of all services of one host
During the service discovery in Checkmk base code, this class
is used to collect all discovered labels.
"""
__slots__ = ["_service_labels"]

def __init__(self, **kwargs):
super(DiscoveredServiceLabelsOfHost, self).__init__()
self._service_labels = kwargs # type: Dict[Text, DiscoveredServiceLabels]

def add_labels(self, service_desc, service_labels):
# type: (Text, DiscoveredServiceLabels) -> None
self._service_labels[service_desc] = service_labels

def to_dict(self):
return {
service_descr: service_labels.to_dict()
for service_descr, service_labels in self._service_labels.items()
}
28 changes: 0 additions & 28 deletions tests/unit/cmk_base/test_discovery.py
Expand Up @@ -6,7 +6,6 @@
import cmk_base.discovery as discovery
from cmk_base.check_api_utils import Service
from cmk_base.discovered_labels import (
DiscoveredServiceLabelsOfHost,
DiscoveredServiceLabels,
ServiceLabel,
)
Expand Down Expand Up @@ -51,30 +50,3 @@ def test_discovered_service_eq():
assert s1 not in {s3}
assert s1 not in {s4}
assert s1 in {s5}


def test_discovered_service_labels_of_host():
def discovery_function():
yield Service(item=u"itäm1",
parameters=None,
service_labels=DiscoveredServiceLabels(ServiceLabel(u"bla", u"blüb"),))
yield Service(item=u"itäm1",
parameters=None,
service_labels=DiscoveredServiceLabels(ServiceLabel(u"bla", u"bläb"),))
yield Service(item=u"itäm2",
parameters=None,
service_labels=DiscoveredServiceLabels(ServiceLabel(u"blä", u"bläb"),))

labels = DiscoveredServiceLabelsOfHost()

for service in discovery_function():
labels.add_labels(service.item, service.service_labels)

assert labels.to_dict() == {
u"itäm1": {
u"bla": u"bläb",
},
u"itäm2": {
u"blä": u"bläb",
},
}

0 comments on commit 1a3cd55

Please sign in to comment.