From: John Mulligan <jmulligan@redhat.com>
Date: Sat, 4 Nov 2023 21:57:59 +0000 (-0400)
Subject: cephadm: ensure the iscsi test can create iscsi daemon class
X-Git-Tag: v19.0.0~110^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f80cf438b3f774e46da55b4cdc1b0417692eeed7;p=ceph.git

cephadm: ensure the iscsi test can create iscsi daemon class

Ensure that the iscsi test can call CephIscsi.create inside other
functions by passing a required, but fake, gateway config file.

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

diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py
index f57bd11cab20..3f6ed70a39cd 100644
--- a/src/cephadm/tests/test_cephadm.py
+++ b/src/cephadm/tests/test_cephadm.py
@@ -1773,6 +1773,11 @@ if ! grep -qs /var/lib/ceph/9b9d7609-f4d5-4aba-94c8-effa764d96c9/iscsi.daemon_id
         """
         fsid = '9b9d7609-f4d5-4aba-94c8-effa764d96c9'
         with with_cephadm_ctx(['--image=ceph/ceph'], list_networks={}) as ctx:
+            ctx.config_blobs = {
+                'files': {
+                    'iscsi-gateway.cfg': 'portal',
+                },
+            }
             ctx.fsid = fsid
             c = _cephadm.get_container(
                 ctx, _cephadm.DaemonIdentity(fsid, 'iscsi', 'something')