Skip to content

Commit

Permalink
ceph-volume: update tests to account for filtered_devices in batch
Browse files Browse the repository at this point in the history 
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
  • Loading branch information
@andrewschoen
andrewschoen committed Oct 10, 2018
1 parent 6751253 commit 3639622
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 63 deletions.
52 changes: 26 additions & 26 deletions src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py
View file
Expand Up @@ -5,9 +5,9 @@
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
Expand All @@ -16,9 +16,9 @@ def test_hdd_device_is_large_enough(self, fakedevice, factory):
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
Expand All @@ -27,18 +27,18 @@ def test_sdd_device_is_large_enough(self, fakedevice, factory):
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)
Expand All @@ -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]
Expand All @@ -68,9 +68,9 @@ def test_hdd_device_is_large_enough(self, stub_vgs, fakedevice, factory, conf_ce
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:
Expand All @@ -81,9 +81,9 @@ def test_ssd_device_is_not_large_enough(self, stub_vgs, fakedevice, factory, con
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:
Expand All @@ -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]
Expand All @@ -112,9 +112,9 @@ def test_hdd_device_is_large_enough(self, stub_vgs, fakedevice, factory, conf_ce

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]
Expand All @@ -128,9 +128,9 @@ def test_multi_hdd_device_is_large_enough(self, stub_vgs, fakedevice, factory, c

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:
Expand Down

0 comments on commit 3639622

Please sign in to comment.