OS tools refactor

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

test/functional/tests/io_class/io_class_common.py

@@ -16,8 +16,9 @@ from core.test_run import TestRun
 from test_tools.dd import Dd
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
-from test_utils.os_utils import Udev, sync
-from test_utils.os_utils import drop_caches, DropCachesMode
+from test_tools.os_tools import sync
+from test_tools.udev import Udev
+from test_tools.os_tools import drop_caches, DropCachesMode
 from types.size import Size, Unit
 
 ioclass_config_path = "/etc/opencas/ioclass.conf"

test/functional/tests/io_class/test_io_class_core_id.py

@@ -10,7 +10,8 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.dd import Dd
-from test_utils.os_utils import sync, Udev, drop_caches
+from test_tools.os_tools import sync, drop_caches
+from test_tools.udev import Udev
 from types.size import Unit, Size
 
 dd_bs = Size(1, Unit.Blocks4096)

test/functional/tests/io_class/test_io_class_directory.py

@@ -17,7 +17,8 @@ from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
 from test_utils.filesystem.directory import Directory
 from test_utils.filesystem.file import File
-from test_utils.os_utils import drop_caches, DropCachesMode, sync, Udev
+from test_tools.os_tools import drop_caches, DropCachesMode, sync
+from test_tools.udev import Udev
 from types.size import Size, Unit
 from tests.io_class.io_class_common import mountpoint, prepare, ioclass_config_path
 

test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py

@@ -12,7 +12,8 @@ from core.test_run import TestRun
 from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy
 from .io_class_common import ioclass_config, get_io_class_occupancy, run_io_dir
 from api.cas import casadm
-from test_utils.os_utils import sync, Udev, drop_caches
+from test_tools.os_tools import sync, drop_caches
+from test_tools.udev import Udev
 from types.size import Unit, Size
 
 

test/functional/tests/io_class/test_io_class_file.py

@@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
 from test_utils.filesystem.file import File
-from test_utils.os_utils import sync, DropCachesMode, drop_caches
+from test_tools.os_tools import sync, DropCachesMode, drop_caches
 from types.size import Size, Unit
 from tests.io_class.io_class_common import mountpoint, prepare, ioclass_config_path
 

test/functional/tests/io_class/test_io_class_occupancy.py

@@ -16,7 +16,8 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
-from test_utils.os_utils import sync, Udev
+from test_tools.os_tools import sync
+from test_tools.udev import Udev
 from types.size import Unit, Size
 from tests.io_class.io_class_common import (
     prepare,

test/functional/tests/io_class/test_io_class_occupancy_load.py

@@ -15,7 +15,8 @@ from storage_devices.device import Device
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
-from test_utils.os_utils import sync, Udev
+from test_tools.os_tools import sync
+from test_tools.udev import Udev
 from tests.io_class.io_class_common import (
     prepare,
     mountpoint,

test/functional/tests/io_class/test_io_class_occupancy_repart.py

@@ -15,7 +15,8 @@ from core.test_run_utils import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
-from test_utils.os_utils import sync, Udev
+from test_tools.os_tools import sync
+from test_tools.udev import Udev
 from types.size import Unit
 from tests.io_class.io_class_common import (
     prepare,

test/functional/tests/io_class/test_io_class_occupancy_resize.py

@@ -13,7 +13,8 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
-from test_utils.os_utils import sync, Udev
+from test_tools.os_tools import sync
+from test_tools.udev import Udev
 from types.size import Unit
 from tests.io_class.io_class_common import (
     mountpoint,

test/functional/tests/io_class/test_io_class_process.py

@@ -11,7 +11,8 @@ from api.cas import ioclass_config, casadm
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.dd import Dd
-from test_utils.os_utils import sync, Udev
+from test_tools.os_tools import sync
+from test_tools.udev import Udev
 from types.size import Size, Unit
 from tests.io_class.io_class_common import prepare, ioclass_config_path
 

test/functional/tests/io_class/test_io_class_purge.py

@@ -14,7 +14,8 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
 from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
-from test_utils.os_utils import drop_caches, DropCachesMode, sync, Udev
+from test_tools.os_tools import drop_caches, DropCachesMode, sync
+from test_tools.udev import Udev
 from types.size import Unit, Size
 from tests.io_class.io_class_common import prepare, mountpoint, ioclass_config_path
 

test/functional/tests/io_class/test_io_class_service_support.py

@@ -6,6 +6,8 @@
 import os
 import pytest
 from datetime import timedelta
+
+import test_tools.runlevel
 from api.cas import ioclass_config, casadm_parser
 from api.cas.cache_config import CacheMode
 from api.cas.casadm_params import StatsFilter
@@ -17,8 +19,8 @@ from test_tools import fs_utils
 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.os_utils import Runlevel
+from test_tools.os_tools import sync, drop_caches
+from test_tools.runlevel import Runlevel
 from types.size import Size, Unit
 from tests.io_class.io_class_common import (
     prepare,
@@ -73,10 +75,10 @@ def test_io_class_service_load(runlevel):
         InitConfig.create_init_config_from_running_configuration(
             cache_extra_flags=f"ioclass_file={ioclass_config_path}"
         )
-        os_utils.sync()
+        sync()
 
     with TestRun.step(f"Reboot system to runlevel {runlevel}."):
-        os_utils.change_runlevel(runlevel)
+        test_tools.runlevel.change_runlevel(runlevel)
         TestRun.executor.reboot()
 
     with TestRun.step(
@@ -152,8 +154,8 @@ def run_io():
     )
     fio.run()
 
-    os_utils.sync()
-    os_utils.drop_caches()
+    sync()
+    drop_caches()
 
 
 def prepare_and_load_io_class_config(cache, metadata_not_cached=False):

test/functional/tests/io_class/test_io_class_stats_file_size_core.py

@@ -17,7 +17,7 @@ from test_tools import fs_utils
 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.os_utils import sync, drop_caches
+from test_tools.os_tools import sync, drop_caches
 from types.size import Size, Unit
 from tests.io_class.io_class_common import template_config_path
 

test/functional/tests/io_class/test_io_class_wlth.py

@@ -10,7 +10,8 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
-from test_utils.os_utils import sync, Udev, drop_caches
+from test_tools.os_tools import sync, drop_caches
+from test_tools.udev import Udev
 from types.size import Unit, Size
 from tests.io_class.io_class_common import prepare
 

test/functional/tests/io_class/test_io_classification.py

@@ -19,7 +19,8 @@ from test_tools.disk_utils import Filesystem
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_utils.filesystem.file import File
-from test_utils.os_utils import sync, Udev
+from test_tools.os_tools import sync
+from test_tools.udev import Udev
 from types.size import Size, Unit
 from tests.io_class.io_class_common import prepare, ioclass_config_path, mountpoint