Merge pull request #5491 from sosiouxme/20170920-diagnostics-check

Automatic merge from submit-queue

health checks: add diagnostics check

Adds a health check that runs `oc adm diagnostics` with each individual diagnostic.

Also, moved `is_first_master` method into superclass for reuse. And look at `oo_first_master` and `ansible_host` instead of `masters` and `ansible_ssh_host`.

2 files changed, 53 insertions, 5 deletions

diff --git a/roles/openshift_health_checker/test/diagnostics_test.py b/roles/openshift_health_checker/test/diagnostics_test.py
new file mode 100644
index 000000000..800889fa7
--- /dev/null
+++ b/roles/openshift_health_checker/test/diagnostics_test.py
@@ -0,0 +1,50 @@
+import pytest
+
+from openshift_checks.diagnostics import DiagnosticCheck, OpenShiftCheckException
+
+
+@pytest.fixture()
+def task_vars():
+    return dict(
+        openshift=dict(
+            common=dict(config_base="/etc/origin/")
+        )
+    )
+
+
+def test_module_succeeds(task_vars):
+    check = DiagnosticCheck(lambda *_: {"result": "success"}, task_vars)
+    check.is_first_master = lambda: True
+    assert check.is_active()
+    check.exec_diagnostic("spam")
+    assert not check.failures
+
+
+def test_oc_not_there(task_vars):
+    def exec_module(*_):
+        return {"failed": True, "result": "[Errno 2] No such file or directory"}
+
+    check = DiagnosticCheck(exec_module, task_vars)
+    with pytest.raises(OpenShiftCheckException) as excinfo:
+        check.exec_diagnostic("spam")
+    assert excinfo.value.name == "OcNotFound"
+
+
+def test_module_fails(task_vars):
+    def exec_module(*_):
+        return {"failed": True, "result": "something broke"}
+
+    check = DiagnosticCheck(exec_module, task_vars)
+    check.exec_diagnostic("spam")
+    assert check.failures and check.failures[0].name == "OcDiagFailed"
+
+
+def test_names_executed(task_vars):
+    task_vars["openshift_check_diagnostics"] = diagnostics = "ConfigContexts,spam,,eggs"
+
+    def exec_module(module, args, *_):
+        assert "extra_args" in args
+        assert args["extra_args"][0] in diagnostics
+        return {"result": "success"}
+
+    DiagnosticCheck(exec_module, task_vars).run()
diff --git a/roles/openshift_health_checker/test/logging_check_test.py b/roles/openshift_health_checker/test/logging_check_test.py
index 1a1c190f6..59c703214 100644
--- a/roles/openshift_health_checker/test/logging_check_test.py
+++ b/roles/openshift_health_checker/test/logging_check_test.py
@@ -98,21 +98,19 @@ def test_oc_failure(problem, expect):
     assert expect in str(excinfo)
 
 
-groups_with_first_master = dict(masters=['this-host', 'other-host'])
-groups_with_second_master = dict(masters=['other-host', 'this-host'])
-groups_not_a_master = dict(masters=['other-host'])
+groups_with_first_master = dict(oo_first_master=['this-host'])
+groups_not_a_master = dict(oo_first_master=['other-host'], oo_masters=['other-host'])
 
 
 @pytest.mark.parametrize('groups, logging_deployed, is_active', [
     (groups_with_first_master, True, True),
     (groups_with_first_master, False, False),
     (groups_not_a_master, True, False),
-    (groups_with_second_master, True, False),
     (groups_not_a_master, True, False),
 ])
 def test_is_active(groups, logging_deployed, is_active):
     task_vars = dict(
-        ansible_ssh_host='this-host',
+        ansible_host='this-host',
         groups=groups,
         openshift_hosted_logging_deploy=logging_deployed,
     )