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

fix tests: proper config file path

Browse Source 
Signed-off-by: Karolina Rogowska <karolina.rogowska@intel.com>
This commit is contained in:
Karolina Rogowska 2022-08-19 16:46:37 +02:00
parent 4fc0c4f8bb
commit a1484b2412
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/functional/tests/io_class/test_io_class_occupancy_load.py
View File

@ -1,21 +1,23 @@
# #
# Copyright(c) 2020-2021 Intel Corporation # Copyright(c) 2020-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
import pytest
from collections import namedtuple from collections import namedtuple
from math import isclose from math import isclose
import pytest
from api.cas import ioclass_config, casadm from api.cas import ioclass_config, casadm
from tests.io_class.io_class_common import prepare, mountpoint, TestRun, Unit, \
ioclass_config_path, run_io_dir, get_io_class_dirty, get_io_class_usage, get_io_class_occupancy
from api.cas.cache_config import CacheMode, CacheLineSize from api.cas.cache_config import CacheMode, CacheLineSize
from api.cas.ioclass_config import IoClass from api.cas.ioclass_config import IoClass, default_config_file_path
from storage_devices.device import Device from storage_devices.device import Device
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
from test_tools import fs_utils from test_tools import fs_utils
from test_tools.disk_utils import Filesystem from test_tools.disk_utils import Filesystem
from test_utils.os_utils import sync, Udev from test_utils.os_utils import sync, Udev
from tests.io_class.io_class_common import prepare, mountpoint, TestRun, Unit, \
run_io_dir, get_io_class_dirty, get_io_class_usage, get_io_class_occupancy
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
@ -75,7 +77,7 @@ def test_ioclass_occuppancy_load(cache_line_size):
f"{io_class.max_occupancy:0.2f}", f"{io_class.max_occupancy:0.2f}",
) )
casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) casadm.load_io_classes(cache_id=cache.cache_id, file=default_config_file_path)
with TestRun.step("Reset cache stats"): with TestRun.step("Reset cache stats"):
cache.purge_cache() cache.purge_cache()

17
test/functional/tests/io_class/test_io_class_occupancy_repart.py
View File

@ -1,25 +1,24 @@
# #
# Copyright(c) 2020-2021 Intel Corporation # Copyright(c) 2020-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
import pytest
from collections import namedtuple from collections import namedtuple
from math import isclose from math import isclose
from recordclass import recordclass import pytest
from api.cas import ioclass_config, casadm from api.cas import ioclass_config, casadm
from core.test_run_utils import TestRun
from test_utils.size import Unit, Size
from tests.io_class.io_class_common import prepare, mountpoint, ioclass_config_path, \
get_io_class_occupancy, run_io_dir, run_io_dir_read
from api.cas.cache_config import CacheMode, CacheLineSize from api.cas.cache_config import CacheMode, CacheLineSize
from api.cas.ioclass_config import IoClass from api.cas.ioclass_config import IoClass, default_config_file_path
from core.test_run_utils import TestRun
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
from test_tools import fs_utils from test_tools import fs_utils
from test_tools.disk_utils import Filesystem from test_tools.disk_utils import Filesystem
from test_utils.os_utils import sync, Udev from test_utils.os_utils import sync, Udev
from test_utils.size import Unit
from tests.io_class.io_class_common import prepare, mountpoint, ioclass_config_path, \
get_io_class_occupancy, run_io_dir, run_io_dir_read
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
@ -85,7 +84,7 @@ def test_ioclass_repart(cache_mode, cache_line_size, ioclass_size_multiplicatior
f"{io_class.max_occupancy*ioclass_size_multiplicatior:0.2f}", f"{io_class.max_occupancy*ioclass_size_multiplicatior:0.2f}",
) )
casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) casadm.load_io_classes(cache_id=cache.cache_id, file=default_config_file_path)
with TestRun.step("Reset cache stats"): with TestRun.step("Reset cache stats"):
cache.purge_cache() cache.purge_cache()

23
test/functional/tests/io_class/test_io_class_occupancy_resize.py
View File

@ -1,21 +1,21 @@
# #
# Copyright(c) 2020-2021 Intel Corporation # Copyright(c) 2020-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
import pytest import pytest
from recordclass import recordclass
from api.cas import ioclass_config, casadm from api.cas import ioclass_config, casadm
from core.test_run import TestRun
from test_utils.size import Unit, Size
from tests.io_class.io_class_common import mountpoint, prepare, ioclass_config_path, \
get_io_class_occupancy, run_io_dir
from api.cas.cache_config import CacheMode, CacheLineSize from api.cas.cache_config import CacheMode, CacheLineSize
from api.cas.ioclass_config import IoClass from api.cas.ioclass_config import IoClass, default_config_file_path
from core.test_run import TestRun
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
from test_tools import fs_utils from test_tools import fs_utils
from test_tools.disk_utils import Filesystem from test_tools.disk_utils import Filesystem
from test_utils.os_utils import sync, Udev from test_utils.os_utils import sync, Udev
from recordclass import recordclass from test_utils.size import Unit
from tests.io_class.io_class_common import mountpoint, prepare, get_io_class_occupancy, run_io_dir
@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
@ -60,11 +60,10 @@ def test_ioclass_resize(cache_line_size, new_occupancy):
rule="metadata&done", rule="metadata&done",
eviction_priority=1, eviction_priority=1,
allocation="1.00", allocation="1.00",
ioclass_config_path=ioclass_config_path ioclass_config_path=default_config_file_path
) )
ioclass_config.add_ioclass(*str(IoClass.default(allocation="0.00")).split(",")) ioclass_config.add_ioclass(*str(IoClass.default(allocation="0.00")).split(","))
with TestRun.step("Add directory for ioclass"): with TestRun.step("Add directory for ioclass"):
ioclass_config.add_ioclass( ioclass_config.add_ioclass(
io_class.id, io_class.id,
@ -73,7 +72,7 @@ def test_ioclass_resize(cache_line_size, new_occupancy):
f"{io_class.max_occupancy:0.2f}", f"{io_class.max_occupancy:0.2f}",
) )
casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) casadm.load_io_classes(cache_id=cache.cache_id, file=default_config_file_path)
with TestRun.step("Reset cache stats"): with TestRun.step("Reset cache stats"):
cache.purge_cache() cache.purge_cache()
@ -120,7 +119,7 @@ def test_ioclass_resize(cache_line_size, new_occupancy):
rule="metadata&done", rule="metadata&done",
eviction_priority=1, eviction_priority=1,
allocation="1.00", allocation="1.00",
ioclass_config_path=ioclass_config_path ioclass_config_path=default_config_file_path
) )
ioclass_config.add_ioclass( ioclass_config.add_ioclass(
io_class.id, io_class.id,
@ -129,7 +128,7 @@ def test_ioclass_resize(cache_line_size, new_occupancy):
f"{io_class.max_occupancy:0.2f}", f"{io_class.max_occupancy:0.2f}",
) )
casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) casadm.load_io_classes(cache_id=cache.cache_id, file=default_config_file_path)
with TestRun.step(f"Perform IO with size equal to cache size"): with TestRun.step(f"Perform IO with size equal to cache size"):
run_io_dir(f"{io_class.dir_path}/tmp_file", int((cache_size) / Unit.Blocks4096)) run_io_dir(f"{io_class.dir_path}/tmp_file", int((cache_size) / Unit.Blocks4096))