OS tools refactor

Signed-off-by: Katarzyna Treder <katarzyna.treder@h-partners.com>

test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py

@@ -9,7 +9,6 @@ import test_tools.common.wait
 from core.test_run import TestRun
 from test_tools import fs_utils
 from test_tools.dd import Dd
-from test_utils import os_utils
 from test_utils.filesystem.file import File
 from types.size import Size, Unit
 

test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py

@@ -15,9 +15,8 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.disk_utils import Filesystem
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
-from test_utils import os_utils
 from test_utils.filesystem.file import File
-from test_utils.os_utils import DropCachesMode
+from test_tools.os_tools import DropCachesMode, drop_caches, sync
 from types.size import Size, Unit
 from types.time import Time
 from tests.lazy_writes.recovery.recovery_tests_methods import power_cycle_dut
@@ -63,7 +62,7 @@ def test_recovery_all_options(cache_mode, cache_line_size, cleaning_policy, file
     with TestRun.step("Mount core device."):
         core_device.mount(mount_point)
         file_operation(test_file.full_path, other_pattern, ReadWrite.write)
-        os_utils.drop_caches(DropCachesMode.ALL)
+        drop_caches(DropCachesMode.ALL)
 
     with TestRun.step("Unmount core device."):
         core_device.unmount()
@@ -85,9 +84,9 @@ def test_recovery_all_options(cache_mode, cache_line_size, cleaning_policy, file
         cache.set_cache_mode(CacheMode.WT, flush=False)
 
     with TestRun.step("Reset platform."):
-        os_utils.sync()
+        sync()
         core.unmount()
-        os_utils.drop_caches(DropCachesMode.ALL)
+        drop_caches(DropCachesMode.ALL)
         TestRun.LOGGER.info(f"Number of dirty blocks in cache: {cache.get_dirty_blocks()}")
         power_cycle_dut()
 

test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py

@@ -13,8 +13,8 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.disk_utils import Filesystem
 from test_tools.fs_utils import readlink
-from test_utils import os_utils
-from test_utils.os_utils import Udev, DropCachesMode
+from test_tools.os_tools import DropCachesMode, sync, drop_caches
+from test_tools.udev import Udev
 from connection.utils.output import CmdException
 from types.size import Size, Unit
 from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \
@@ -62,13 +62,13 @@ def test_recovery_flush_reset_raw(cache_mode):
                   direct="oflag")
 
     with TestRun.step("Sync and flush buffers."):
-        os_utils.sync()
+        sync()
         output = TestRun.executor.run(f"hdparm -f {core.path}")
         if output.exit_code != 0:
             raise CmdException("Error during hdparm", output)
 
     with TestRun.step("Trigger flush."):
-        os_utils.drop_caches(DropCachesMode.ALL)
+        drop_caches(DropCachesMode.ALL)
         TestRun.executor.run_in_background(cli.flush_cache_cmd(f"{cache.cache_id}"))
 
     with TestRun.step("Hard reset DUT during data flushing."):