github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1265 from pdebski21/fix_test_core_pool

Browse Source 
Fix core pool tests
This commit is contained in:
Robert Baldyga 2022-07-06 11:18:47 +02:00 committed by GitHub
commit ede99f4db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/api/cas/casadm.py
View File

@ -137,9 +137,9 @@ def remove_detached(core_device: Device, shortcut: bool = False):
return output return output
def try_add(core_device: Device, cache_id: int, core_id: int = None): def try_add(core_device: Device, cache_id: int, core_id: int):
output = TestRun.executor.run(script_try_add_cmd(str(cache_id), core_device.path, output = TestRun.executor.run(script_try_add_cmd(str(cache_id), core_device.path,
str(core_id) if core_id is not None else None)) str(core_id)))
if output.exit_code != 0: if output.exit_code != 0:
raise CmdException("Failed to execute try add script command.", output) raise CmdException("Failed to execute try add script command.", output)
return Core(core_device.path, cache_id) return Core(core_device.path, cache_id)

13
test/functional/tests/incremental_load/test_core_pool.py
View File

@ -1,5 +1,5 @@
# #
# Copyright(c) 2019-2021 Intel Corporation # Copyright(c) 2019-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -37,6 +37,7 @@ def test_attach_core_pool():
core_disk.create_partitions([Size(2, Unit.GibiByte), Size(2, Unit.GibiByte)]) core_disk.create_partitions([Size(2, Unit.GibiByte), Size(2, Unit.GibiByte)])
core_dev = core_disk.partitions[0] core_dev = core_disk.partitions[0]
second_core_dev = core_disk.partitions[1] second_core_dev = core_disk.partitions[1]
core_1_id, core_2_id = 1, 2
with TestRun.step("Start cache."): with TestRun.step("Start cache."):
cache = casadm.start_cache(cache_dev, force=True) cache = casadm.start_cache(cache_dev, force=True)
@ -48,10 +49,12 @@ def test_attach_core_pool():
cache.stop() cache.stop()
with TestRun.step("Add previously used core device to core pool using --try-add flag."): with TestRun.step("Add previously used core device to core pool using --try-add flag."):
first_core = casadm.try_add(core_dev, cache.cache_id) first_core = casadm.try_add(core_device=core_dev, cache_id=cache.cache_id,
core_id=core_1_id)
with TestRun.step("Add different core device to core pool using --try-add flag."): with TestRun.step("Add different core device to core pool using --try-add flag."):
second_core = casadm.try_add(second_core_dev, cache.cache_id) second_core = casadm.try_add(core_device=second_core_dev, cache_id=cache.cache_id,
core_id=core_2_id)
with TestRun.step("Load cache."): with TestRun.step("Load cache."):
cache = casadm.load_cache(cache_dev) cache = casadm.load_cache(cache_dev)
@ -86,9 +89,11 @@ def test_core_pool_exclusive_open():
core_disk.create_partitions([Size(1, Unit.GibiByte)]) core_disk.create_partitions([Size(1, Unit.GibiByte)])
core_dev = core_disk.partitions[0] core_dev = core_disk.partitions[0]
core_dev.create_filesystem(Filesystem.ext4) core_dev.create_filesystem(Filesystem.ext4)
cache_id = 1
core_id = 1
with TestRun.step("Add core device to core device pool using --try-add flag."): with TestRun.step("Add core device to core device pool using --try-add flag."):
core = casadm.try_add(core_dev, 1) core = casadm.try_add(core_device=core_dev, cache_id=cache_id, core_id=core_id)
with TestRun.step("Check if core status of added core in core pool is detached."): with TestRun.step("Check if core status of added core in core pool is detached."):
status = core.get_status() status = core.get_status()