[checkmk-commits] Dynamic configuration: First steps

Module: check_mk Branch: master Commit: b9b7214df62165e9362e09bb676b8da452904213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9b7214df62165… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 20:15:06 2018 +0100 Dynamic configuration: First steps * The dcd is now deployed by OMD for all Check_MK sites * A basic dcd implementation is available as python package under the name "cmk.cee.dcd" * Some unit tests have been added * Integration tests for the OMD integration have been added * Logging is already configurable, just like for the other daemons CMK-1140 Change-Id: Ie1a86beaf7cb99b65c89279b3db414940d7019f9 --- tests/integration/omd/test_dcd_integration.py | 32 +++++++++++++++++++++++++++ tests/integration/omd/test_init_scripts.py | 2 ++ tests/unit/cmk/gui/test_watolib.py | 1 + 3 files changed, 35 insertions(+) diff --git a/tests/integration/omd/test_dcd_integration.py b/tests/integration/omd/test_dcd_integration.py new file mode 100644 index 0000000..720c94b --- /dev/null +++ b/tests/integration/omd/test_dcd_integration.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import subprocess + +import cmk + + +def test_dcd_exists(site): + assert site.file_exists("bin/dcd") + + +def test_dcd_path(site): + p = site.execute(["which", "dcd"], stdout=subprocess.PIPE) + path = p.stdout.read().strip() + assert path == "/omd/sites/%s/bin/dcd" % site.id + + +def test_dcd_version(site): + p = site.execute(["dcd", "-V"], stderr=subprocess.PIPE) + version = p.stderr.read() + assert version.startswith("dcd version %s" % cmk.__version__) + + +def test_dcd_daemon(site): + p = site.execute(["omd", "status", "--bare", "dcd"], stdout=subprocess.PIPE) + assert p.wait() == 0 + assert p.stdout.read() == "dcd 0\nOVERALL 0\n" + + +def test_dcd_logrotate(site): + assert site.file_exists("etc/logrotate.d/dcd") diff --git a/tests/integration/omd/test_init_scripts.py b/tests/integration/omd/test_init_scripts.py index 18e553b..74a0a4a 100644 --- a/tests/integration/omd/test_init_scripts.py +++ b/tests/integration/omd/test_init_scripts.py @@ -4,6 +4,7 @@ import os import stat + def test_init_scripts(site): scripts = [ "apache", @@ -22,6 +23,7 @@ def test_init_scripts(site): if site.version.edition() == "enterprise": scripts += [ "cmc", + "dcd", "liveproxyd", "mknotifyd", ] diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index ce42537..87fcf9e 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -33,6 +33,7 @@ def test_registered_config_domains(): 'apache', 'ca-certificates', 'check_mk', + 'dcd', 'diskspace', 'ec', 'liveproxyd',