]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: add default osdspec_affinity to module fixture
authorJoshua Schmid <jschmid@suse.de>
Tue, 11 Aug 2020 07:53:23 +0000 (09:53 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 21 Aug 2020 11:04:01 +0000 (13:04 +0200)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit eb1b37cfc34db90db86ef8449f645d5a192656b9)

src/pybind/mgr/cephadm/tests/fixtures.py

index 045a3015dc0015eeed1aaae1eeacea9ec5912f02..ca15d4e3976a3b37f76ba17daabaf7f0e69c6ea3 100644 (file)
@@ -43,6 +43,7 @@ def with_cephadm_module(module_options=None, store=None):
     with mock.patch("cephadm.module.CephadmOrchestrator.get_ceph_option", get_ceph_option),\
             mock.patch("cephadm.services.osd.RemoveUtil._run_mon_cmd"), \
             mock.patch("cephadm.module.CephadmOrchestrator.get_osdmap"), \
+            mock.patch("cephadm.services.osd.OSDService.get_osdspec_affinity", return_value='test_spec'), \
             mock.patch("cephadm.module.CephadmOrchestrator.remote"):
 
         m = CephadmOrchestrator.__new__ (CephadmOrchestrator)