]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: When test osd active, it need to add "mock call" to make sure execute...
authorjianglong01 <jianglong01@qianxin.com>
Fri, 11 Jun 2021 02:56:30 +0000 (10:56 +0800)
committerSebastian Wagner <sewagner@redhat.com>
Thu, 17 Jun 2021 08:47:00 +0000 (10:47 +0200)
Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit 73dd266dc837b9a11d27ee17cbe75f8b6c36c799)

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

index 975659bd59d75a452ebd7a68c7f982e442f34c76..8633d5ef92158bfb7653a22b42477bbc03d0567e 100644 (file)
@@ -1278,8 +1278,17 @@ Traceback (most recent call last):
                 }]
             }
             _run_cephadm.return_value = (json.dumps(ceph_volume_lvm_list), '', 0)
+            _run_cephadm.reset_mock()
             assert cephadm_module._osd_activate(
                 ['test']).stdout == "Created osd(s) 1 on host 'test'"
+            assert _run_cephadm.mock_calls == [
+                mock.call('test', 'osd', 'ceph-volume',
+                          ['--', 'lvm', 'list', '--format', 'json'], no_fsid=False, image=''),
+                mock.call('test', 'osd.1', 'deploy',
+                          ['--name', 'osd.1', '--meta-json', mock.ANY,
+                              '--config-json', '-', '--osd-fsid', 'uuid'],
+                          stdin=mock.ANY, image=''),
+            ]
 
     @mock.patch("cephadm.serve.CephadmServe._run_cephadm")
     def test_osd_activate_datadevice_dbdevice(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
@@ -1311,5 +1320,14 @@ Traceback (most recent call last):
                 }]
             }
             _run_cephadm.return_value = (json.dumps(ceph_volume_lvm_list), '', 0)
+            _run_cephadm.reset_mock()
             assert cephadm_module._osd_activate(
                 ['test']).stdout == "Created osd(s) 1 on host 'test'"
+            assert _run_cephadm.mock_calls == [
+                mock.call('test', 'osd', 'ceph-volume',
+                          ['--', 'lvm', 'list', '--format', 'json'], no_fsid=False, image=''),
+                mock.call('test', 'osd.1', 'deploy',
+                          ['--name', 'osd.1', '--meta-json', mock.ANY,
+                              '--config-json', '-', '--osd-fsid', 'uuid'],
+                          stdin=mock.ANY, image=''),
+            ]