From 0be83ba7a9e9541e7754a566c54a17b2e2f05b75 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Tue, 27 Nov 2018 15:56:29 +0100 Subject: [PATCH] ceph-volume: adjust tests for strategies refactoring Signed-off-by: Jan Fajerski --- .../devices/lvm/strategies/test_bluestore.py | 20 ++++++------- .../devices/lvm/strategies/test_filestore.py | 30 +++++++++---------- 2 files changed, 25 insertions(+), 25 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 01a813c66dd70..a3821ab5160a3 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 @@ -9,7 +9,7 @@ class TestSingleType(object): devices = [ 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] + computed_osd = bluestore.SingleType.with_auto_devices(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 100 assert computed_osd['data']['parts'] == 1 assert computed_osd['data']['human_readable_size'] == '5.66 GB' @@ -20,7 +20,7 @@ class TestSingleType(object): devices = [ 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] + computed_osd = bluestore.SingleType.with_auto_devices(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 100 assert computed_osd['data']['parts'] == 1 assert computed_osd['data']['human_readable_size'] == '5.66 GB' @@ -32,7 +32,7 @@ class TestSingleType(object): 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) + bluestore.SingleType.with_auto_devices(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): @@ -41,7 +41,7 @@ class TestSingleType(object): 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) + bluestore.SingleType.with_auto_devices(devices, args) assert 'Unable to use device, already a member of LVM' in str(error) @@ -57,7 +57,7 @@ class TestMixedTypeConfiguredSize(object): 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] + osd = bluestore.MixedType.with_auto_devices(devices, args).computed['osds'][0] assert osd['data']['percentage'] == 100 assert osd['data']['human_readable_size'] == '5.66 GB' assert osd['data']['path'] == '/dev/sda' @@ -74,7 +74,7 @@ class TestMixedTypeConfiguredSize(object): devices = [ssd, hdd] with pytest.raises(RuntimeError) as error: - bluestore.MixedType(devices, args).computed['osds'][0] + bluestore.MixedType.with_auto_devices(devices, args).computed['osds'][0] expected = 'Not enough space in fast devices (5.66 GB) to create 1 x 7.22 GB block.db LV' assert expected in str(error) @@ -87,7 +87,7 @@ class TestMixedTypeConfiguredSize(object): devices = [ssd, hdd] with pytest.raises(RuntimeError) as error: - bluestore.MixedType(devices, args) + bluestore.MixedType.with_auto_devices(devices, args) expected = 'Unable to use device 5.66 GB /dev/sda, LVs would be smaller than 5GB' assert expected in str(error) @@ -101,7 +101,7 @@ class TestMixedTypeLargeAsPossible(object): 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] + osd = bluestore.MixedType.with_auto_devices(devices, args).computed['osds'][0] assert osd['data']['percentage'] == 100 assert osd['data']['human_readable_size'] == '5.66 GB' assert osd['data']['path'] == '/dev/sda' @@ -117,7 +117,7 @@ class TestMixedTypeLargeAsPossible(object): 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] + osd = bluestore.MixedType.with_auto_devices(devices, args).computed['osds'][0] assert osd['data']['percentage'] == 50 assert osd['data']['human_readable_size'] == '27.97 GB' assert osd['data']['path'] == '/dev/sda' @@ -134,6 +134,6 @@ class TestMixedTypeLargeAsPossible(object): devices = [ssd, hdd] with pytest.raises(RuntimeError) as error: - bluestore.MixedType(devices, args) + bluestore.MixedType.with_auto_devices(devices, args) expected = 'Unable to use device 5.66 GB /dev/sda, LVs would be smaller than 5GB' assert expected in str(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 0537e1e08a778..675f2b3a0498c 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 @@ -11,7 +11,7 @@ class TestSingleType(object): devices = [ 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] + computed_osd = filestore.SingleType.with_auto_devices(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 55 assert computed_osd['data']['parts'] == 1 assert computed_osd['data']['human_readable_size'] == '6.24 GB' @@ -24,7 +24,7 @@ class TestSingleType(object): 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) + filestore.SingleType.with_auto_devices(devices, args) msg = "Unable to use device 5.66 GB /dev/sda, LVs would be smaller than 5GB" assert msg in str(error) @@ -34,7 +34,7 @@ class TestSingleType(object): devices = [ 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] + computed_osd = filestore.SingleType.with_auto_devices(devices, args).computed['osds'][0] assert computed_osd['data']['percentage'] == 55 assert computed_osd['data']['parts'] == 1 assert computed_osd['data']['human_readable_size'] == '6.24 GB' @@ -47,7 +47,7 @@ class TestSingleType(object): 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) + filestore.SingleType.with_auto_devices(devices, args) msg = "Unable to use device 5.66 GB /dev/sda, LVs would be smaller than 5GB" assert msg in str(error) @@ -58,7 +58,7 @@ class TestSingleType(object): 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) + filestore.SingleType.with_auto_devices(devices, args) msg = "Unable to use device 14.97 GB /dev/sda, LVs would be smaller than 5GB" assert msg in str(error) @@ -69,7 +69,7 @@ class TestSingleType(object): 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) + filestore.SingleType.with_auto_devices(devices, args) msg = "Unable to use device 14.97 GB /dev/sda, LVs would be smaller than 5GB" assert msg in str(error) @@ -80,7 +80,7 @@ class TestSingleType(object): 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) + filestore.SingleType.with_auto_devices(devices, args) assert 'Unable to use device, already a member of LVM' in str(error) def test_hdd_device_with_small_configured_journal(self, fakedevice, factory, conf_ceph): @@ -90,7 +90,7 @@ class TestSingleType(object): 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) + filestore.SingleType.with_auto_devices(devices, args) msg = "journal sizes must be larger than 2GB, detected: 120.00 MB" assert msg in str(error) @@ -101,7 +101,7 @@ class TestSingleType(object): 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) + filestore.SingleType.with_auto_devices(devices, args) msg = "journal sizes must be larger than 2GB, detected: 120.00 MB" assert msg in str(error) @@ -116,7 +116,7 @@ class TestMixedType(object): 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) + filestore.MixedType.with_auto_devices(devices, args) msg = "journal sizes must be larger than 2GB, detected: 120.00 MB" assert msg in str(error) @@ -128,7 +128,7 @@ class TestMixedType(object): 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) + filestore.MixedType.with_auto_devices(devices, args) msg = "Not enough space in fast devices (5.66 GB) to create 1 x 6.95 GB journal LV" assert msg in str(error) @@ -140,7 +140,7 @@ class TestMixedType(object): 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) + filestore.MixedType.with_auto_devices(devices, args) assert 'Unable to use device, already a member of LVM' in str(error) def test_ssd_is_lvm_member_doesnt_fail(self, volumes, stub_vgs, fakedevice, factory, conf_ceph): @@ -161,7 +161,7 @@ class TestMixedType(object): conf_ceph(get_safe=lambda *a: '5120') args = factory(filtered_devices=[], osds_per_device=1, journal_size=None) devices = [ssd, hdd] - result = filestore.MixedType(devices, args).computed['osds'][0] + result = filestore.MixedType.with_auto_devices(devices, args).computed['osds'][0] assert result['journal']['path'] == 'vg: fast' assert result['journal']['percentage'] == 71 assert result['journal']['human_readable_size'] == '5.00 GB' @@ -193,7 +193,7 @@ class TestMixedType(object): 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) + filestore.MixedType.with_auto_devices(devices, args) assert 'Could not find a common VG between devices' in str(error) @@ -205,6 +205,6 @@ class TestMixedType(object): fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=16073740000)) ] with pytest.raises(RuntimeError) as error: - filestore.MixedType(devices, args) + filestore.MixedType.with_auto_devices(devices, args) msg = "Not enough space in fast devices (14.97 GB) to create 2 x 14.77 GB journal LV" assert msg in str(error) -- 2.39.5