mgr/cephadm: add test coverage for action chosen in _check_daemons

Add a test that verifies that the special cases for the
extra_entrypoint_args and extra_container_args are handled.  While all
containers take these params we test them for the custom container as
this is where they'd be most commonly used.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/pybind/mgr/cephadm/tests/services/test_custom_container.py b/src/pybind/mgr/cephadm/tests/services/test_custom_container.py
index a7e2a60e2810d4e7f8c9c7027b99dea99a9b4f16..9663ace755050cd4400668d2ed4ba6560de1c462 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/services/test_custom_container.py
+++ b/src/pybind/mgr/cephadm/tests/services/test_custom_container.py
@@ -1,5 +1,8 @@
+import contextlib
 import json
-from unittest.mock import patch
+from unittest.mock import patch, ANY
+
+import pytest
 
 from cephadm.module import CephadmOrchestrator
 from ceph.deployment.service_spec import CustomContainerSpec
@@ -150,3 +153,47 @@ class TestCustomContainer:
                     error_ok=True,
                     use_current_daemon_image=False,
                 )
+
+
+@pytest.mark.parametrize(
+    'newargs',
+    [
+        {'cargs': ['--secret=foo,target=/etc/foo.x']},
+        {'eargs': ['flip flop']},
+        {'eargs': ['flip flop'], "cargs": None},
+    ],
+)
+def test_custom_cont_choose_next_action(
+    cephadm_module, mock_cephadm, newargs
+):
+    cargs1 = cargs2 = ['--secret=foo,type=env']
+    eargs1 = eargs2 = ['flim flam']
+    if 'cargs' in newargs:
+        cargs2 = newargs['cargs']
+    if 'eargs' in newargs:
+        eargs2 = newargs['eargs']
+    spec = CustomContainerSpec(
+        service_id='tsettinu',
+        image='quay.io/foobar/barbaz:latest',
+        entrypoint='/usr/local/bin/blat.sh',
+        ports=[9090],
+        extra_container_args=cargs1,
+        extra_entrypoint_args=eargs1,
+    )
+    # use a second spec to avoid messing around with ArgumentSpec types
+    spec2 = CustomContainerSpec(
+        service_id='tsettinu',
+        image='quay.io/foobar/barbaz:latest',
+        entrypoint='/usr/local/bin/blat.sh',
+        ports=[9090],
+        extra_container_args=cargs2,
+        extra_entrypoint_args=eargs2,
+    )
+    with contextlib.ExitStack() as stack:
+        stack.enter_context(with_host(cephadm_module, 'test'))
+        stack.enter_context(with_service(cephadm_module, spec))
+        cephadm_module.apply([spec2])
+        # manually invoke _check_daemons to trigger a call to
+        # _daemon_action so we can check what action was chosen
+        mock_cephadm.serve(cephadm_module)._check_daemons()
+        mock_cephadm._daemon_action.assert_called_with(ANY, action='redeploy')