OS tools refactor

Signed-off-by: Katarzyna Treder <katarzyna.treder@h-partners.com>
This commit is contained in:
Katarzyna Treder
2024-12-11 07:58:50 +01:00
parent 3e67a8c0f5
commit 8a5d531a32
92 changed files with 187 additions and 173 deletions

View File

@@ -3,12 +3,13 @@
# Copyright(c) 2024 Huawei Technologies Co., Ltd.
# SPDX-License-Identifier: BSD-3-Clause
#
import os
import posixpath
import time
import pytest
from test_tools.os_tools import sync, drop_caches
from test_tools.udev import Udev
from api.cas import casadm
from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy
from core.test_run import TestRun
@@ -18,7 +19,6 @@ from test_tools.blktrace import BlkTrace, BlkTraceMask, RwbsKind
from test_tools.disk_utils import Filesystem, check_if_device_supports_trim
from test_tools.fio.fio import Fio
from test_tools.fio.fio_param import ReadWrite, IoEngine
from test_utils import os_utils
from types.size import Size, Unit
from api.cas.dmesg import get_metadata_size_on_device
@@ -129,7 +129,7 @@ def test_trim_propagation():
raise Exception("Core device doesn't support discards")
with TestRun.step(f"Disable udev"):
os_utils.Udev.disable()
Udev.disable()
with TestRun.step(f"Prepare cache instance in WB with one core"):
cache = casadm.start_cache(cache_dev, CacheMode.WB, force=True)
@@ -161,7 +161,7 @@ def test_trim_propagation():
with TestRun.step("Power cycle"):
power_control = TestRun.plugin_manager.get_plugin("power_control")
power_control.power_cycle()
os_utils.Udev.disable()
Udev.disable()
with TestRun.step("Load cache"):
cache = casadm.start_cache(cache_dev, load=True)
@@ -246,8 +246,8 @@ def test_trim_device_discard_support(
with TestRun.step("Remove file."):
test_file.remove()
os_utils.sync()
os_utils.drop_caches()
sync()
drop_caches()
time.sleep(5)
with TestRun.step("Ensure that discards were detected by blktrace on proper devices."):
@@ -315,8 +315,8 @@ def compare_properties(value, expected_value, property_name):
def stop_monitoring_and_check_discards(blktraces, discard_support):
time.sleep(60)
os_utils.sync()
os_utils.drop_caches()
sync()
drop_caches()
time.sleep(5)
discard_flag = RwbsKind.D # Discard