From 388914e01ae15819c6521f8ed6de5344f5cda787 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 23 Feb 2021 11:30:36 +0100 Subject: [PATCH] mgr/cephadm: osd: Use _run_cephadm_json() Signed-off-by: Sebastian Wagner (cherry picked from commit 555cada8e554e7ec5707bae0d69336af9fe4ae51) --- src/pybind/mgr/cephadm/services/osd.py | 7 +------ src/pybind/mgr/cephadm/tests/test_cephadm.py | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py index 7c2a2cef1d1b3..732a416870dfd 100644 --- a/src/pybind/mgr/cephadm/services/osd.py +++ b/src/pybind/mgr/cephadm/services/osd.py @@ -86,7 +86,7 @@ class OSDService(CephService): code, '\n'.join(err))) # check result - out, err, code = CephadmServe(self.mgr)._run_cephadm( + osds_elems: dict = CephadmServe(self.mgr)._run_cephadm_json( host, 'osd', 'ceph-volume', [ '--', @@ -94,11 +94,6 @@ class OSDService(CephService): '--format', 'json', ]) before_osd_uuid_map = self.mgr.get_osd_uuid_map(only_up=True) - try: - osds_elems = json.loads('\n'.join(out)) - except ValueError: - logger.exception('Cannot decode JSON: \'%s\'' % '\n'.join(out)) - osds_elems = {} fsid = self.mgr._cluster_fsid osd_uuid_map = self.mgr.get_osd_uuid_map() created = [] diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py index 957f7395b7f38..91ebe6c0d07c1 100644 --- a/src/pybind/mgr/cephadm/tests/test_cephadm.py +++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py @@ -513,7 +513,7 @@ class TestCephadm(object): '--no-auto', '/dev/sdb', '--yes', '--no-systemd'], env_vars=['CEPH_VOLUME_OSDSPEC_AFFINITY=foo'], error_ok=True, stdin='{"config": "", "keyring": ""}') _run_cephadm.assert_called_with( - 'test', 'osd', 'ceph-volume', ['--', 'lvm', 'list', '--format', 'json']) + 'test', 'osd', 'ceph-volume', ['--', 'lvm', 'list', '--format', 'json'], image='', no_fsid=False) @mock.patch("cephadm.serve.CephadmServe._run_cephadm") def test_apply_osd_save_non_collocated(self, _run_cephadm, cephadm_module: CephadmOrchestrator): @@ -553,7 +553,7 @@ class TestCephadm(object): env_vars=['CEPH_VOLUME_OSDSPEC_AFFINITY=noncollocated'], error_ok=True, stdin='{"config": "", "keyring": ""}') _run_cephadm.assert_called_with( - 'test', 'osd', 'ceph-volume', ['--', 'lvm', 'list', '--format', 'json']) + 'test', 'osd', 'ceph-volume', ['--', 'lvm', 'list', '--format', 'json'], image='', no_fsid=False) @mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}')) @mock.patch("cephadm.module.SpecStore.save") -- 2.39.5