Fix imports

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

test/functional/api/cas/cache.py

@@ -8,8 +8,8 @@ from api.cas.casadm_parser import *
 from api.cas.core import Core
 from api.cas.dmesg import get_metadata_size_on_device
 from api.cas.statistics import CacheStats, CacheIoClassStats
-from test_tools.os_tools import *
 from connection.utils.output import Output
+from test_tools.os_tools import sync
 
 
 class Cache:

test/functional/api/cas/cas_module.py

@@ -6,7 +6,7 @@
 
 from enum import Enum
 from core.test_run import TestRun
-from test_tools import os_tools
+from test_tools.os_tools import unload_kernel_module, load_kernel_module
 
 
 class CasModule(Enum):
@@ -14,12 +14,12 @@ class CasModule(Enum):
 
 
 def reload_all_cas_modules():
-    os_tools.unload_kernel_module(CasModule.cache.value)
-    os_tools.load_kernel_module(CasModule.cache.value)
+    unload_kernel_module(CasModule.cache.value)
+    load_kernel_module(CasModule.cache.value)
 
 
 def unload_all_cas_modules():
-    os_tools.unload_kernel_module(CasModule.cache.value)
+    unload_kernel_module(CasModule.cache.value)
 
 
 def is_cas_management_dev_present():

test/functional/api/cas/core.py

@@ -8,7 +8,6 @@ from datetime import timedelta
 from typing import List
 from enum import Enum
 
-import test_tools.fs_tools
 from api.cas import casadm
 from api.cas.cache_config import SeqCutOffParameters, SeqCutOffPolicy
 from api.cas.casadm_params import StatsFilter
@@ -16,7 +15,7 @@ from api.cas.casadm_parser import get_seq_cut_off_parameters, get_core_info_for_
 from api.cas.statistics import CoreStats, CoreIoClassStats
 from core.test_run_utils import TestRun
 from storage_devices.device import Device
-from test_tools import fs_tools, disk_tools
+from test_tools.fs_tools import Filesystem, ls_item
 from test_tools.os_tools import sync
 from test_tools.common.wait import wait
 from type_def.size import Unit, Size
@@ -51,7 +50,7 @@ class Core(Device):
         return get_core_info_for_cache_by_path(core_disk_path=self.core_device.path,
                                                target_cache_id=self.cache_id)
 
-    def create_filesystem(self, fs_type: test_tools.fs_utils.Filesystem, force=True, blocksize=None):
+    def create_filesystem(self, fs_type: Filesystem, force=True, blocksize=None):
         super().create_filesystem(fs_type, force, blocksize)
         self.core_device.filesystem = self.filesystem
 
@@ -140,7 +139,7 @@ class Core(Device):
     def check_if_is_present_in_os(self, should_be_visible=True):
         device_in_system_message = "CAS device exists in OS."
         device_not_in_system_message = "CAS device does not exist in OS."
-        item = fs_utils.ls_item(f"{self.path}")
+        item = ls_item(self.path)
         if item is not None:
             if should_be_visible:
                 TestRun.LOGGER.info(device_in_system_message)

test/functional/api/cas/init_config.py

@@ -7,8 +7,7 @@
 from api.cas import casadm_parser
 from api.cas.cache_config import CacheMode
 from storage_devices.device import Device
-from test_tools import fs_tools
-
+from test_tools.fs_tools import remove, write_file
 
 opencas_conf_path = "/etc/opencas/opencas.conf"
 
@@ -34,7 +33,7 @@ class InitConfig:
 
     @staticmethod
     def remove_config_file():
-        fs_utils.remove(opencas_conf_path, force=False)
+        remove(opencas_conf_path, force=False)
 
     def save_config_file(self):
         config_lines = []
@@ -47,7 +46,7 @@ class InitConfig:
             config_lines.append(CoreConfigLine.header)
             for c in self.core_config_lines:
                 config_lines.append(str(c))
-        fs_utils.write_file(opencas_conf_path, "\n".join(config_lines), False)
+        write_file(opencas_conf_path, "\n".join(config_lines), False)
 
     @classmethod
     def create_init_config_from_running_configuration(
@@ -69,7 +68,7 @@ class InitConfig:
     @classmethod
     def create_default_init_config(cls):
         cas_version = casadm_parser.get_casadm_version()
-        fs_utils.write_file(opencas_conf_path, f"version={cas_version.base}")
+        write_file(opencas_conf_path, f"version={cas_version.base}")
 
 
 class CacheConfigLine:

test/functional/api/cas/installer.py

@@ -9,7 +9,7 @@ import os
 from core.test_run import TestRun
 from api.cas import cas_module
 from api.cas.version import get_installed_cas_version
-from test_tools import git, os_tools
+from test_tools import git
 from connection.utils.output import CmdException
 from test_tools.os_tools import is_kernel_module_loaded
 

test/functional/api/cas/ioclass_config.py

@@ -14,7 +14,7 @@ from datetime import timedelta
 from packaging import version
 
 from core.test_run import TestRun
-from test_tools import fs_tools
+from test_tools.fs_tools import write_file
 from test_tools.os_tools import get_kernel_version
 
 default_config_file_path = "/tmp/opencas_ioclass.conf"
@@ -108,7 +108,7 @@ class IoClass:
         ioclass_config_path: str = default_config_file_path,
     ):
         TestRun.LOGGER.info(f"Creating config file {ioclass_config_path}")
-        fs_utils.write_file(
+        write_file(
             ioclass_config_path, IoClass.list_to_csv(ioclass_list, add_default_rule)
         )