From 36396229d3b8d20862565b35d431ff22fa92cd1c Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 2 Oct 2018 15:23:39 -0500 Subject: [PATCH] ceph-volume: update tests to account for filtered_devices in batch Signed-off-by: Andrew Schoen --- .../devices/lvm/strategies/test_bluestore.py | 52 +++++++------- .../devices/lvm/strategies/test_filestore.py | 70 +++++++++---------- .../ceph_volume/tests/util/test_device.py | 4 +- 3 files changed, 63 insertions(+), 63 deletions(-) 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 295e8b807bcac..01a813c66dd70 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 @@ -5,9 +5,9 @@ from ceph_volume.devices.lvm.strategies import bluestore class TestSingleType(object): def test_hdd_device_is_large_enough(self, fakedevice, factory): - args = factory(osds_per_device=1, block_db_size=None) + args = factory(filtered_devices=[], osds_per_device=1, block_db_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) ] computed_osd = bluestore.SingleType(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 100 @@ -16,9 +16,9 @@ class TestSingleType(object): assert computed_osd['data']['path'] == '/dev/sda' def test_sdd_device_is_large_enough(self, fakedevice, factory): - args = factory(osds_per_device=1, block_db_size=None) + args = factory(filtered_devices=[], osds_per_device=1, block_db_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) ] computed_osd = bluestore.SingleType(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 100 @@ -27,18 +27,18 @@ class TestSingleType(object): assert computed_osd['data']['path'] == '/dev/sda' def test_device_cannot_have_many_osds_per_device(self, fakedevice, factory): - args = factory(osds_per_device=3, block_db_size=None) + args = factory(filtered_devices=[], osds_per_device=3, block_db_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) ] with pytest.raises(RuntimeError) as error: bluestore.SingleType(devices, args) assert 'Unable to use device 5.66 GB /dev/sda' in str(error) def test_device_is_lvm_member_fails(self, fakedevice, factory): - args = factory(osds_per_device=1, block_db_size=None) + args = factory(filtered_devices=[], osds_per_device=1, block_db_size=None) devices = [ - fakedevice(is_lvm_member=True, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=True, sys_api=dict(rotational='1', size=6073740000)) ] with pytest.raises(RuntimeError) as error: bluestore.SingleType(devices, args) @@ -52,9 +52,9 @@ class TestMixedTypeConfiguredSize(object): def test_hdd_device_is_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph): # 3GB block.db in ceph.conf conf_ceph(get_safe=lambda *a: 3147483640) - args = factory(osds_per_device=1, block_db_size=None) - ssd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + args = factory(filtered_devices=[], osds_per_device=1, block_db_size=None) + ssd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) devices = [ssd, hdd] osd = bluestore.MixedType(devices, args).computed['osds'][0] @@ -68,9 +68,9 @@ class TestMixedTypeConfiguredSize(object): def test_ssd_device_is_not_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph): # 7GB block.db in ceph.conf conf_ceph(get_safe=lambda *a: 7747483640) - args = factory(osds_per_device=1, block_db_size=None) - ssd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + args = factory(filtered_devices=[], osds_per_device=1, block_db_size=None) + ssd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) devices = [ssd, hdd] with pytest.raises(RuntimeError) as error: @@ -81,9 +81,9 @@ class TestMixedTypeConfiguredSize(object): def test_multi_hdd_device_is_not_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph): # 3GB block.db in ceph.conf conf_ceph(get_safe=lambda *a: 3147483640) - args = factory(osds_per_device=2, block_db_size=None) - ssd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=60737400000)) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + args = factory(filtered_devices=[], osds_per_device=2, block_db_size=None) + ssd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=60737400000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) devices = [ssd, hdd] with pytest.raises(RuntimeError) as error: @@ -96,9 +96,9 @@ class TestMixedTypeLargeAsPossible(object): def test_hdd_device_is_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: None) - args = factory(osds_per_device=1, block_db_size=None) - ssd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + args = factory(filtered_devices=[], osds_per_device=1, block_db_size=None) + ssd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) devices = [ssd, hdd] osd = bluestore.MixedType(devices, args).computed['osds'][0] @@ -112,9 +112,9 @@ class TestMixedTypeLargeAsPossible(object): def test_multi_hdd_device_is_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: None) - args = factory(osds_per_device=2, block_db_size=None) - ssd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=60073740000)) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=60073740000)) + args = factory(filtered_devices=[], osds_per_device=2, block_db_size=None) + ssd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=60073740000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=60073740000)) devices = [ssd, hdd] osd = bluestore.MixedType(devices, args).computed['osds'][0] @@ -128,9 +128,9 @@ class TestMixedTypeLargeAsPossible(object): def test_multi_hdd_device_is_not_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: None) - args = factory(osds_per_device=2, block_db_size=None) - ssd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=60737400000)) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + args = factory(filtered_devices=[], osds_per_device=2, block_db_size=None) + ssd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=60737400000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) devices = [ssd, hdd] with pytest.raises(RuntimeError) as error: 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 07f6f36231000..0537e1e08a778 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 @@ -7,9 +7,9 @@ class TestSingleType(object): def test_hdd_device_is_large_enough(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=12073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=12073740000)) ] computed_osd = filestore.SingleType(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 55 @@ -19,9 +19,9 @@ class TestSingleType(object): def test_hdd_device_with_large_journal(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) ] with pytest.raises(RuntimeError) as error: filestore.SingleType(devices, args) @@ -30,9 +30,9 @@ class TestSingleType(object): def test_ssd_device_is_large_enough(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=12073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=12073740000)) ] computed_osd = filestore.SingleType(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 55 @@ -42,9 +42,9 @@ class TestSingleType(object): def test_ssd_device_with_large_journal(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) ] with pytest.raises(RuntimeError) as error: filestore.SingleType(devices, args) @@ -53,9 +53,9 @@ class TestSingleType(object): def test_ssd_device_multi_osd(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=4, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=4, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=16073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=16073740000)) ] with pytest.raises(RuntimeError) as error: filestore.SingleType(devices, args) @@ -64,9 +64,9 @@ class TestSingleType(object): def test_hdd_device_multi_osd(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=4, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=4, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=16073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=16073740000)) ] with pytest.raises(RuntimeError) as error: filestore.SingleType(devices, args) @@ -75,9 +75,9 @@ class TestSingleType(object): def test_device_is_lvm_member_fails(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=True, sys_api=dict(rotational='1', size=12073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=True, sys_api=dict(rotational='1', size=12073740000)) ] with pytest.raises(RuntimeError) as error: filestore.SingleType(devices, args) @@ -85,9 +85,9 @@ class TestSingleType(object): def test_hdd_device_with_small_configured_journal(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) ] with pytest.raises(RuntimeError) as error: filestore.SingleType(devices, args) @@ -96,9 +96,9 @@ class TestSingleType(object): def test_ssd_device_with_small_configured_journal(self, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)) ] with pytest.raises(RuntimeError) as error: filestore.SingleType(devices, args) @@ -110,10 +110,10 @@ class TestMixedType(object): def test_minimum_size_is_not_met(self, stub_vgs, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)), - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)), + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) ] with pytest.raises(RuntimeError) as error: filestore.MixedType(devices, args) @@ -122,10 +122,10 @@ class TestMixedType(object): def test_ssd_device_is_not_large_enough(self, stub_vgs, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '7120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)), - fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)), + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) ] with pytest.raises(RuntimeError) as error: filestore.MixedType(devices, args) @@ -134,10 +134,10 @@ class TestMixedType(object): def test_hdd_device_is_lvm_member_fails(self, stub_vgs, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ - fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)), - fakedevice(is_lvm_member=True, sys_api=dict(rotational='1', size=6073740000)) + fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000)), + fakedevice(used_by_ceph=False, is_lvm_member=True, sys_api=dict(rotational='1', size=6073740000)) ] with pytest.raises(RuntimeError) as error: filestore.MixedType(devices, args) @@ -147,9 +147,9 @@ class TestMixedType(object): # fast PV, because ssd is an LVM member CephPV = lvm.PVolume(vg_name='fast', pv_name='/dev/sda', pv_tags='') ssd = fakedevice( - is_lvm_member=True, sys_api=dict(rotational='0', size=6073740000), pvs_api=[CephPV] + used_by_ceph=False, is_lvm_member=True, sys_api=dict(rotational='0', size=6073740000), pvs_api=[CephPV] ) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) # when get_api_vgs() gets called, it will return this one VG stub_vgs([ dict( @@ -159,7 +159,7 @@ class TestMixedType(object): ]) conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ssd, hdd] result = filestore.MixedType(devices, args).computed['osds'][0] assert result['journal']['path'] == 'vg: fast' @@ -171,12 +171,12 @@ class TestMixedType(object): CephPV1 = lvm.PVolume(vg_name='fast1', pv_name='/dev/sda', pv_tags='') CephPV2 = lvm.PVolume(vg_name='fast2', pv_name='/dev/sdb', pv_tags='') ssd1 = fakedevice( - is_lvm_member=True, sys_api=dict(rotational='0', size=6073740000), pvs_api=[CephPV1] + used_by_ceph=False, is_lvm_member=True, sys_api=dict(rotational='0', size=6073740000), pvs_api=[CephPV1] ) ssd2 = fakedevice( - is_lvm_member=True, sys_api=dict(rotational='0', size=6073740000), pvs_api=[CephPV2] + used_by_ceph=False, is_lvm_member=True, sys_api=dict(rotational='0', size=6073740000), pvs_api=[CephPV2] ) - hdd = fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) + hdd = fakedevice(used_by_ceph=False, is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000)) # when get_api_vgs() gets called, it will return this one VG stub_vgs([ dict( @@ -190,7 +190,7 @@ class TestMixedType(object): ]) conf_ceph(get_safe=lambda *a: '5120') - args = factory(osds_per_device=1, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ssd1, ssd2, hdd] with pytest.raises(RuntimeError) as error: filestore.MixedType(devices, args) @@ -199,7 +199,7 @@ class TestMixedType(object): def test_ssd_device_fails_multiple_osds(self, stub_vgs, fakedevice, factory, conf_ceph): conf_ceph(get_safe=lambda *a: '15120') - args = factory(osds_per_device=2, journal_size=None) + args = factory(filtered_devices=[], osds_per_device=2, journal_size=None) devices = [ fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=16073740000)), fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=16073740000)) diff --git a/src/ceph-volume/ceph_volume/tests/util/test_device.py b/src/ceph-volume/ceph_volume/tests/util/test_device.py index 70a2a240a185b..0990366ed7808 100644 --- a/src/ceph-volume/ceph_volume/tests/util/test_device.py +++ b/src/ceph-volume/ceph_volume/tests/util/test_device.py @@ -13,7 +13,7 @@ class TestDevice(object): assert "foo" in disk.sys_api def test_is_lv(self, device_info): - data = {"lv_path": "vg/lv"} + data = {"lv_path": "vg/lv", "vg_name": "vg"} device_info(lv=data) disk = device.Device("vg/lv") assert disk.is_lv @@ -85,7 +85,7 @@ class TestDevice(object): assert disk.is_ceph_disk_member is False def test_pv_api(self, device_info, pvolumes, monkeypatch): - FooPVolume = api.PVolume(pv_name='/dev/sda', pv_uuid="0000", pv_tags={}, vg_name="vg") + FooPVolume = api.PVolume(pv_name='/dev/sda', pv_uuid="0000", lv_uuid="0000", pv_tags={}, vg_name="vg") pvolumes.append(FooPVolume) monkeypatch.setattr(api, 'PVolumes', lambda: pvolumes) data = {"/dev/sda": {"foo": "bar"}} -- 2.39.5