diff --git a/test/functional/tests/io_class/test_io_class_occupancy.py b/test/functional/tests/io_class/test_io_class_occupancy.py index c782b69..6a9341a 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/test/functional/tests/io_class/test_io_class_occupancy.py @@ -11,7 +11,7 @@ import pytest from .io_class_common import * from api.cas.cache_config import CacheMode, CacheLineSize from api.cas.ioclass_config import IoClass -from api.cas.statistics import UsageStats +from api.cas.statistics import IoClassUsageStats from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem @@ -337,7 +337,7 @@ def test_ioclass_occupancy_sum_cache(): cache.purge_cache() with TestRun.step("Verify stats before IO"): - usage_stats_sum = UsageStats(Size(0), Size(0), Size(0), Size(0)) + usage_stats_sum = IoClassUsageStats(Size(0), Size(0), Size(0)) for i in io_classes: usage_stats_sum += get_io_class_usage(cache, i.id) usage_stats_sum += get_io_class_usage(cache, default_ioclass_id) @@ -364,7 +364,7 @@ def test_ioclass_occupancy_sum_cache(): ) with TestRun.step("Verify stats after IO"): - usage_stats_sum = UsageStats(Size(0), Size(0), Size(0), Size(0)) + usage_stats_sum = IoClassUsageStats(Size(0), Size(0), Size(0)) for i in io_classes: usage_stats_sum += get_io_class_usage(cache, i.id) usage_stats_sum += get_io_class_usage(cache, default_ioclass_id) diff --git a/test/functional/tests/io_class/test_io_class_purge.py b/test/functional/tests/io_class/test_io_class_purge.py index 029aa3a..5316790 100644 --- a/test/functional/tests/io_class/test_io_class_purge.py +++ b/test/functional/tests/io_class/test_io_class_purge.py @@ -8,7 +8,7 @@ from collections import namedtuple import pytest from api.cas import ioclass_config, casadm -from api.cas.statistics import UsageStats +from api.cas.statistics import IoClassUsageStats from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils @@ -108,7 +108,7 @@ def get_io_class_usage(cache, io_class_id): def verify_ioclass_usage_stats(cache, ioclasses_ids): cache_size = cache.get_statistics().config_stats.cache_size - usage_stats_sum = UsageStats(Size(0), Size(0), Size(0), Size(0)) + usage_stats_sum = IoClassUsageStats(Size(0), Size(0), Size(0)) for i in ioclasses_ids: usage_stats_sum += get_io_class_usage(cache, i) diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index ba38fea..613f3c7 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -16,7 +16,12 @@ from api.cas.cli_messages import ( get_stats_ioclass_id_out_of_range ) from api.cas.statistics import ( - config_stats_ioclass, usage_stats, request_stats, block_stats_core, block_stats_cache + config_stats_ioclass, + usage_stats, + usage_stats_ioclass, + request_stats, + block_stats_core, + block_stats_cache ) from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan @@ -147,7 +152,7 @@ def test_ioclass_stats_sum(random_cls): with TestRun.step("Check if per class cache IO class statistics sum up to cache statistics"): # Name of stats, which should not be compared - not_compare_stats = ["clean", "occupancy"] + not_compare_stats = ["clean", "occupancy", "free"] ioclass_id_list = list(range(min_ioclass_id, max_ioclass_id)) # Append default IO class id ioclass_id_list.append(0) @@ -275,7 +280,7 @@ def get_checked_statistics(stat_filter: StatsFilter, per_core: bool): if stat_filter == StatsFilter.conf: return config_stats_ioclass if stat_filter == StatsFilter.usage: - return usage_stats + return usage_stats_ioclass if stat_filter == StatsFilter.blk: return block_stats_core if per_core else block_stats_cache if stat_filter == StatsFilter.req: