mirror of
https://github.com/ceph/ceph
synced 2025-01-02 00:52:22 +00:00
mgr/cephadm: When test osd active, it need to add "mock call" to make sure execute correctly
Signed-off-by: jianglong01 <jianglong01@qianxin.com>
This commit is contained in:
parent
ca52b49351
commit
73dd266dc8
@ -1244,8 +1244,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):
|
||||
@ -1277,5 +1286,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=''),
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user