From 9a84cbf552c5a69e4df59194a4d3ee4f552e5b11 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 31 Dec 2019 17:24:42 +0530 Subject: [PATCH] ceph-volume: don't use api.lvm.VolumeGroups Use api.lvm.get_vgs() and api.lvm.get_first_vg() instead and update tests. Signed-off-by: Rishabh Dave (cherry picked from commit dfe6b1b90384482e8ec38e3be7024971fb252968) --- .../ceph_volume/devices/lvm/strategies/bluestore.py | 1 - .../ceph_volume/devices/lvm/strategies/filestore.py | 1 - .../tests/devices/lvm/strategies/test_bluestore.py | 2 +- .../tests/devices/lvm/strategies/test_filestore.py | 9 ++++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py index 099b1cc36b086..c63053b99b4cd 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py @@ -130,7 +130,6 @@ class MixedType(MixedStrategy): super(MixedType, self).__init__(args, data_devs, db_devs, wal_devs) self.block_db_size = self.get_block_db_size() self.block_wal_size = self.get_block_wal_size() - self.system_vgs = lvm.VolumeGroups() self.common_vg = None self.common_wal_vg = None self.dbs_needed = len(self.data_devs) * self.osds_per_device diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py index 0c9ff31fb9aac..bc10473eee9d9 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py @@ -184,7 +184,6 @@ class MixedType(MixedStrategy): self.blank_journal_devs = [] self.journals_needed = len(self.data_devs) * self.osds_per_device self.journal_size = get_journal_size(args) - self.system_vgs = lvm.VolumeGroups() self.validate_compute() @classmethod diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py index d64a7a56877a1..0bde8e4bc695f 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py @@ -61,7 +61,7 @@ class TestMixedType(object): block_db_size=None, block_wal_size=None, osd_ids=[]) monkeypatch.setattr(lvm, 'VolumeGroup', lambda x, **kw: []) - monkeypatch.setattr(lvm, 'VolumeGroups', lambda: []) + monkeypatch.setattr(lvm, 'get_vgs', lambda: []) bluestore.MixedType(args, [], [db_dev], []) diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py index 5bfc07086b4c3..a9bff0ca6a2b9 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py @@ -178,7 +178,9 @@ class TestMixedType(object): args = factory(filtered_devices=[], osds_per_device=1, journal_size=None, osd_ids=[]) devices = [ssd, hdd] - result = filestore.MixedType.with_auto_devices(args, devices).computed['osds'][0] + + result = filestore.MixedType.with_auto_devices(args, devices).\ + computed['osds'][0] assert result['journal']['path'] == 'vg: fast' assert result['journal']['percentage'] == 71 assert result['journal']['human_readable_size'] == '5.00 GB' @@ -195,9 +197,10 @@ class TestMixedType(object): hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, rotational=True, sys_api=dict(size=6073740000)) conf_ceph(get_safe=lambda *a: '5120') - args = factory(filtered_devices=[], osds_per_device=1, - journal_size=None, osd_ids=[]) + args = factory(filtered_devices=[], osds_per_device=1, osd_ids=[], + journal_size=None) devices = [ssd1, ssd2, hdd] + with pytest.raises(RuntimeError) as error: filestore.MixedType.with_auto_devices(args, devices) assert 'Could not find a common VG between devices' in str(error.value) -- 2.39.5