Skip to content

Commit

Permalink
ceph-volume tests.devices update fixture to include new size flags fo…
Browse files Browse the repository at this point in the history 
…r strategies

Signed-off-by: Alfredo Deza <adeza@redhat.com>
  • Loading branch information
Alfredo Deza committed Sep 20, 2018
1 parent 2378c28 commit 5df56a0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
20 changes: 10 additions & 10 deletions src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_bluestore.py
View file
Expand Up @@ -5,7 +5,7 @@
class TestSingleType(object):

def test_hdd_device_is_large_enough(self, fakedevice, factory):
args = factory(osds_per_device=1)
args = factory(osds_per_device=1, block_db_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000))
]
Expand All @@ -16,7 +16,7 @@ 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)
args = factory(osds_per_device=1, block_db_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000))
]
Expand All @@ -27,7 +27,7 @@ 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)
args = factory(osds_per_device=3, block_db_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000))
]
Expand All @@ -36,7 +36,7 @@ def test_device_cannot_have_many_osds_per_device(self, fakedevice, factory):
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)
args = factory(osds_per_device=1, block_db_size=None)
devices = [
fakedevice(is_lvm_member=True, sys_api=dict(rotational='1', size=6073740000))
]
Expand All @@ -52,7 +52,7 @@ 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)
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))
devices = [ssd, hdd]
Expand All @@ -68,7 +68,7 @@ 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)
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))
devices = [ssd, hdd]
Expand All @@ -81,7 +81,7 @@ 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)
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))
devices = [ssd, hdd]
Expand All @@ -96,7 +96,7 @@ 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)
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))
devices = [ssd, hdd]
Expand All @@ -112,7 +112,7 @@ 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)
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))
devices = [ssd, hdd]
Expand All @@ -128,7 +128,7 @@ 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)
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))
devices = [ssd, hdd]
Expand Down
30 changes: 15 additions & 15 deletions src/ceph-volume/ceph_volume/tests/devices/lvm/strategies/test_filestore.py
View file
Expand Up @@ -7,7 +7,7 @@ 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)
args = factory(osds_per_device=1, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=12073740000))
]
Expand All @@ -19,7 +19,7 @@ def test_hdd_device_is_large_enough(self, fakedevice, factory, conf_ceph):

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)
args = factory(osds_per_device=1, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000))
]
Expand All @@ -30,7 +30,7 @@ def test_hdd_device_with_large_journal(self, fakedevice, factory, conf_ceph):

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)
args = factory(osds_per_device=1, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=12073740000))
]
Expand All @@ -42,7 +42,7 @@ def test_ssd_device_is_large_enough(self, fakedevice, factory, conf_ceph):

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)
args = factory(osds_per_device=1, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000))
]
Expand All @@ -53,7 +53,7 @@ def test_ssd_device_with_large_journal(self, fakedevice, factory, conf_ceph):

def test_ssd_device_multi_osd(self, fakedevice, factory, conf_ceph):
conf_ceph(get_safe=lambda *a: '5120')
args = factory(osds_per_device=4)
args = factory(osds_per_device=4, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=16073740000))
]
Expand All @@ -64,7 +64,7 @@ def test_ssd_device_multi_osd(self, fakedevice, factory, conf_ceph):

def test_hdd_device_multi_osd(self, fakedevice, factory, conf_ceph):
conf_ceph(get_safe=lambda *a: '5120')
args = factory(osds_per_device=4)
args = factory(osds_per_device=4, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=16073740000))
]
Expand All @@ -75,7 +75,7 @@ def test_hdd_device_multi_osd(self, fakedevice, factory, conf_ceph):

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)
args = factory(osds_per_device=1, journal_size=None)
devices = [
fakedevice(is_lvm_member=True, sys_api=dict(rotational='1', size=12073740000))
]
Expand All @@ -85,7 +85,7 @@ def test_device_is_lvm_member_fails(self, fakedevice, factory, conf_ceph):

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)
args = factory(osds_per_device=1, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='1', size=6073740000))
]
Expand All @@ -96,7 +96,7 @@ def test_hdd_device_with_small_configured_journal(self, fakedevice, factory, con

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)
args = factory(osds_per_device=1, journal_size=None)
devices = [
fakedevice(is_lvm_member=False, sys_api=dict(rotational='0', size=6073740000))
]
Expand All @@ -110,7 +110,7 @@ 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)
args = factory(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))
Expand All @@ -122,7 +122,7 @@ def test_minimum_size_is_not_met(self, stub_vgs, fakedevice, factory, conf_ceph)

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)
args = factory(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))
Expand All @@ -134,7 +134,7 @@ def test_ssd_device_is_not_large_enough(self, stub_vgs, fakedevice, factory, con

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)
args = factory(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))
Expand All @@ -159,7 +159,7 @@ def test_ssd_is_lvm_member_doesnt_fail(self, volumes, stub_vgs, fakedevice, fact
])

conf_ceph(get_safe=lambda *a: '5120')
args = factory(osds_per_device=1)
args = factory(osds_per_device=1, journal_size=None)
devices = [ssd, hdd]
result = filestore.MixedType(devices, args).computed['osds'][0]
assert result['journal']['path'] == 'vg: fast'
Expand Down Expand Up @@ -190,7 +190,7 @@ def test_no_common_vg(self, volumes, stub_vgs, fakedevice, factory, conf_ceph):
])

conf_ceph(get_safe=lambda *a: '5120')
args = factory(osds_per_device=1)
args = factory(osds_per_device=1, journal_size=None)
devices = [ssd1, ssd2, hdd]
with pytest.raises(RuntimeError) as error:
filestore.MixedType(devices, args)
Expand All @@ -199,7 +199,7 @@ def test_no_common_vg(self, volumes, stub_vgs, fakedevice, factory, conf_ceph):

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)
args = factory(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))
Expand Down

0 comments on commit 5df56a0

Please sign in to comment.