Fix names: rename types to type_def

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

test/functional/api/cas/cache_config.py

@@ -7,8 +7,8 @@
 from enum import Enum, IntFlag
 
 from test_tools.os_tools import get_kernel_module_parameter
-from types.size import Size, Unit
+from type_def.size import Size, Unit
-from types.time import Time
+from type_def.time import Time
 
 
 class CacheLineSize(Enum):

test/functional/api/cas/casadm.py

@@ -22,7 +22,7 @@ from core.test_run import TestRun
 from storage_devices.device import Device
 from test_tools.os_tools import reload_kernel_module
 from connection.utils.output import CmdException, Output
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 # casadm commands

test/functional/api/cas/core.py

@@ -18,7 +18,7 @@ from storage_devices.device import Device
 from test_tools import fs_utils, disk_utils
 from test_tools.os_tools import sync
 from test_tools.common.wait import wait
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 
 
 class CoreStatus(Enum):

test/functional/api/cas/dmesg.py

@@ -7,7 +7,7 @@
 import re
 
 from test_tools.dmesg import get_dmesg
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 def get_metadata_size_on_device(cache_id: int) -> Size:

test/functional/api/cas/statistics.py

@@ -11,7 +11,7 @@ from typing import List
 
 from api.cas import casadm
 from api.cas.casadm_params import StatsFilter
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 class UnitType(Enum):

test/functional/tests/512b/test_different_io_sizes_support.py

@@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet
 from api.cas.cache_config import CacheMode
 from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 

test/functional/tests/basic/test_basic.py

@@ -22,7 +22,7 @@ from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
 from test_utils.filesystem.file import File
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 version_file_path = r"/var/lib/opencas/cas_version"
 mountpoint = "/mnt"

test/functional/tests/basic/test_start_cas.py

@@ -9,7 +9,7 @@ import pytest
 from api.cas import casadm
 from core.test_run import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.CI

test/functional/tests/cache_ops/test_cleaning_policy_operation.py

@@ -17,7 +17,7 @@ from api.cas.cache_config import (
 )
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from core.test_run import TestRun
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from test_tools.udev import Udev
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine

test/functional/tests/cache_ops/test_concurrent_flushes.py

@@ -16,7 +16,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites))

test/functional/tests/cache_ops/test_core_remove.py

@@ -13,7 +13,7 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet
 from test_tools.disk_utils import Filesystem
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 mount_point = "/mnt/cas"
 cores_amount = 3

test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py

@@ -17,7 +17,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 io_size = Size(10000, Unit.Blocks4096)
 

test/functional/tests/cache_ops/test_multilevel_cache.py

@@ -9,7 +9,7 @@ import pytest
 from api.cas import casadm, cli, cli_messages
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/cache_ops/test_multistream_seq_cutoff.py

@@ -26,7 +26,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
 from test_tools.udev import Udev
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 random_thresholds = random.sample(range(1028, 1024**2, 4), 3)
 random_stream_numbers = random.sample(range(2, 128), 3)

test/functional/tests/cache_ops/test_seq_cutoff.py

@@ -17,7 +17,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine, CpusAllowedPolicy
 from test_tools.os_tools import sync, get_dut_cpu_physical_cores
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 class VerifyType(Enum):

test/functional/tests/ci/test_ci_read_write.py

@@ -10,7 +10,7 @@ from api.cas.cache_config import CacheMode
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.udev import Udev
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 from test_tools.dd import Dd
 from test_tools.iostat import IOstatBasic
 

test/functional/tests/cli/test_cas_memory_usage.py

@@ -8,7 +8,7 @@ import pytest
 
 from api.cas.cas_module import CasModule
 from core.test_run import TestRun
-from types.size import Unit
+from type_def.size import Unit
 from test_tools.os_tools import (drop_caches,
                                  is_kernel_module_loaded,
                                  load_kernel_module,

test/functional/tests/cli/test_cleaning_policy.py

@@ -8,7 +8,7 @@ import pytest
 import time
 
 from core.test_run_utils import TestRun
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.fio.fio import Fio

test/functional/tests/cli/test_cli_script.py

@@ -10,7 +10,7 @@ from api.cas import casadm
 from core.test_run import TestRun
 from test_tools.os_tools import sync
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 from test_tools.dd import Dd
 
 

test/functional/tests/cli/test_cli_standby.py

@@ -17,7 +17,7 @@ from test_tools.disk_utils import Filesystem
 from test_utils.filesystem.file import File
 from test_tools.os_tools import sync
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from api.cas.cli_messages import (
     check_stderr_msg,
     missing_param,

test/functional/tests/cli/test_cli_start_stop.py

@@ -10,7 +10,7 @@ from api.cas import casadm, casadm_parser, cli_messages
 from api.cas.cli import start_cmd
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 
 CACHE_ID_RANGE = (1, 16384)
 CORE_ID_RANGE = (0, 4095)

test/functional/tests/cli/test_manual_casadm_flush.py

@@ -8,7 +8,7 @@ import time
 
 from core.test_run_utils import TestRun
 from storage_devices.device import Device
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.fio.fio import Fio

test/functional/tests/cli/test_seq_cutoff_settings.py

@@ -14,7 +14,7 @@ from api.cas.casadm import set_param_cutoff_cmd
 from core.test_run import TestRun
 
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/cli/test_set_get_params.py

@@ -19,7 +19,7 @@ from api.cas.cache_config import (
 )
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 # There should be at least 2 cache instances and 2 cores per cache

test/functional/tests/cli/test_zero_metadata_command.py

@@ -17,7 +17,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
 from test_tools.disk_finder import get_system_disks
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/common/lvm_common_utils.py

@@ -10,7 +10,7 @@ from storage_devices.lvm import get_block_devices_list
 from api.cas.init_config import InitConfig
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite, VerifyMethod
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 def run_fio_on_lvm(volumes: []):

test/functional/tests/data_integrity/test_data_integrity_12h.py

@@ -14,7 +14,7 @@ from core.test_run import TestRun
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 
 
 start_size = int(Size(512, Unit.Byte))

test/functional/tests/data_integrity/test_data_integrity_5d.py

@@ -19,7 +19,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_utils.filesystem.file import File
 from test_tools.os_tools import sync
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 
 
 start_size = Size(512, Unit.Byte).get_value()

test/functional/tests/data_integrity/test_data_integrity_unplug.py

@@ -22,7 +22,7 @@ from test_tools.fio.fio_param import ReadWrite
 from connection.utils.asynchronous import start_async_func
 from test_utils.filesystem.directory import Directory
 from connection.utils.output import CmdException
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 
 ram_disk, tmp_dir, fio_seed = None, None, None
 num_jobs = 8

test/functional/tests/example/example_test.py

@@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem
 from test_tools.fs_utils import copy
 from test_utils.filesystem.directory import Directory
 from test_utils.filesystem.file import File
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from test_utils.emergency_escape import EmergencyEscape
 from test_tools.fstab import add_mountpoint
 from storage_devices.lvm import Lvm

test/functional/tests/failover_standby/test_cache_activation_perf.py

@@ -11,7 +11,7 @@ from test_tools.dd import Dd
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from storage_devices.disk import DiskType, DiskTypeSet
 from storage_devices.device import Device
 from api.cas import casadm, dmesg

test/functional/tests/failover_standby/test_failover_advanced.py

@@ -28,7 +28,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite
 from test_tools.fs_utils import create_directory
 from test_utils.drbd import Resource, Node
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 from test_failover_multihost import check_drbd_installed
 

test/functional/tests/failover_standby/test_failover_multihost.py

@@ -28,7 +28,7 @@ from test_tools.fs_utils import readlink
 from test_utils.drbd import Resource, Node
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from test_tools import fs_utils
 
 

test/functional/tests/fault_injection/test_another_device_with_same_id.py

@@ -8,7 +8,7 @@ import pytest
 from api.cas import cli, casadm
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from core.test_run import TestRun
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache_1", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/fault_injection/test_cache_insert_error.py

@@ -21,7 +21,7 @@ from storage_devices.error_device import ErrorDevice
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter, VerifyMethod
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 start_size = Size(512, Unit.Byte)
 stop_size = Size(128, Unit.KibiByte)

test/functional/tests/fault_injection/test_error_device_as_cache.py

@@ -22,7 +22,7 @@ from api.cas.cache_config import (
 )
 from storage_devices.disk import DiskTypeSet, DiskType
 from test_utils.io_stats import IoStats
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.parametrizex("cache_line_size", CacheLineSize)

test/functional/tests/fault_injection/test_fault_injection_interrupts.py

@@ -16,7 +16,7 @@ from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
 from test_tools.os_tools import DropCachesMode, sync, drop_caches
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from tests.lazy_writes.recovery.recovery_tests_methods import compare_files
 
 mount_point = "/mnt/cas"

test/functional/tests/fault_injection/test_fault_injection_many_to_one.py

@@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from core.test_run import TestRun
 from test_tools.dd import Dd
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 block_size = Size(1, Unit.Blocks4096)
 

test/functional/tests/fault_injection/test_fault_injection_opencas_load.py

@@ -12,7 +12,7 @@ from tests.lazy_writes.recovery.recovery_tests_methods import copy_file, compare
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 mount_point = "/mnt/cas"
 test_file_path = f"{mount_point}/test_file"

test/functional/tests/fault_injection/test_fault_injection_standby.py

@@ -10,7 +10,7 @@ from api.cas import casadm
 from api.cas import dmesg
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from api.cas.cache_config import CacheLineSize, CacheMode
 from api.cas.cli import standby_activate_cmd, standby_load_cmd
 from api.cas.dmesg import get_md_section_size

test/functional/tests/fault_injection/test_fault_injection_standby_core.py

@@ -9,7 +9,7 @@ import pytest
 from api.cas import casadm
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from core.test_run import TestRun
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from api.cas.cache_config import CacheLineSize, CacheStatus
 from api.cas.casadm_params import StatsFilter
 from api.cas.casadm_parser import get_core_info_for_cache_by_path

test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py

@@ -13,7 +13,7 @@ from test_tools import fs_utils, disk_utils
 from test_tools.disk_utils import Filesystem
 from test_utils.filesystem.file import File
 from test_utils.filesystem.symlink import Symlink
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 mount_point, mount_point2 = "/mnt/cas", "/mnt/cas2"
 test_file_path = f"{mount_point}/test_file"

test/functional/tests/fault_injection/test_fault_power_reboot.py

@@ -11,7 +11,7 @@ from api.cas import casadm, cli, cli_messages
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 log_path = "/var/log/opencas.log"
 wait_long_time = 180

test/functional/tests/fault_injection/test_max_io_greater_in_core.py

@@ -10,7 +10,7 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet
 from test_tools.dd import Dd
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/fault_injection/test_primary_device_error.py

@@ -20,7 +20,7 @@ from api.cas.cache_config import (
 )
 from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.parametrizex("cache_mode", CacheMode.without_traits(CacheModeTrait.LazyWrites))

test/functional/tests/fault_injection/test_soft_hot_plug_device.py

@@ -17,7 +17,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.parametrizex("cache_mode", CacheMode)

test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py

@@ -11,7 +11,7 @@ from api.cas.cli import standby_activate_cmd
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_utils.filesystem.symlink import Symlink
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from api.cas.cache_config import CacheLineSize
 from api.cas.cache import CacheStatus
 from test_tools.dd import Dd

test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py

@@ -10,7 +10,7 @@ from api.cas import casadm
 from api.cas.casadm_parser import get_caches
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from api.cas.cache_config import CacheStatus
 
 

test/functional/tests/incremental_load/test_core_pool.py

@@ -11,7 +11,7 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.disk_utils import Filesystem
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/incremental_load/test_inactive_cores.py

@@ -13,7 +13,7 @@ from api.cas.core import Core, CoreStatus
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.dd import Dd
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/incremental_load/test_incremental_load.py

@@ -32,8 +32,8 @@ from test_utils.filesystem.file import File
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
-from types.time import Time
+from type_def.time import Time
 
 
 @pytest.mark.CI

test/functional/tests/incremental_load/test_udev.py

@@ -16,7 +16,7 @@ from api.cas.init_config import InitConfig
 from core.test_run import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType
 from storage_devices.raid import RaidConfiguration, Raid, Level, MetadataVariant
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.os_dependent

test/functional/tests/initialize/test_clean_reboot.py

@@ -15,7 +15,7 @@ from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
 from test_utils.filesystem.file import File
 from test_tools.os_tools import drop_caches, DropCachesMode, sync
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.os_dependent

test/functional/tests/initialize/test_initialize_load.py

@@ -15,7 +15,7 @@ from api.cas.cache_config import (CleaningPolicy,
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import *
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.parametrizex("cores_amount", [1, 4])

test/functional/tests/initialize/test_initialize_runlevel.py

@@ -18,7 +18,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_tools.os_tools import sync, drop_caches
 from test_tools.runlevel import Runlevel
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 mount_point = "/mnt/test"

test/functional/tests/initialize/test_negative_load.py

@@ -8,7 +8,7 @@ import pytest
 from api.cas import casadm, casadm_parser, cli, cli_messages
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/initialize/test_recovery.py

@@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem
 from test_tools.fs_utils import check_if_file_exists
 from test_utils.filesystem.file import File
 from test_tools.os_tools import sync
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 mount_point = "/mnt/cas"
 

test/functional/tests/initialize/test_simulation_startup.py

@@ -13,7 +13,7 @@ from api.cas.core import CoreStatus
 from api.cas.init_config import InitConfig
 from core.test_run import TestRun
 from storage_devices.disk import DiskTypeLowerThan, DiskTypeSet, DiskType
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.CI

test/functional/tests/initialize/test_startup_init_config.py

@@ -17,7 +17,7 @@ from test_utils.filesystem.file import File
 from test_tools.disk_utils import Filesystem
 from test_tools import fstab
 from test_tools.dd import Dd
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
 from test_utils.emergency_escape import EmergencyEscape

test/functional/tests/io/test_io_engines.py

@@ -15,7 +15,7 @@ from test_tools.disk_utils import Filesystem
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, CpusAllowedPolicy, ReadWrite
 from test_tools.os_tools import get_dut_cpu_physical_cores
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 mount_point = "/mnt/test"
 runtime = timedelta(minutes=15)

test/functional/tests/io/test_remove_device_during_io.py

@@ -13,7 +13,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from core.test_run import TestRun
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/io/test_write_fetch.py

@@ -14,7 +14,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
 from test_utils.filesystem.symlink import Symlink
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/io/trim/test_trim.py

@@ -19,7 +19,7 @@ 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 types.size import Size, Unit
+from type_def.size import Size, Unit
 from api.cas.dmesg import get_metadata_size_on_device
 
 

test/functional/tests/io/trim/test_trim_stress.py

@@ -11,7 +11,7 @@ from api.cas.cache_config import CacheMode, CacheLineSize
 from core.test_run import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType
 from test_tools.disk_utils import Filesystem
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.os_dependent

test/functional/tests/io_class/io_class_common.py

@@ -19,7 +19,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine
 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
+from type_def.size import Size, Unit
 
 ioclass_config_path = "/etc/opencas/ioclass.conf"
 template_config_path = "/etc/opencas/ioclass-config.csv"

test/functional/tests/io_class/test_io_class_cli.py

@@ -13,7 +13,7 @@ from api.cas.ioclass_config import IoClass
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 ioclass_config_path = "/tmp/opencas_ioclass.conf"
 

test/functional/tests/io_class/test_io_class_core_id.py

@@ -12,7 +12,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.dd import Dd
 from test_tools.os_tools import sync, drop_caches
 from test_tools.udev import Udev
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 
 dd_bs = Size(1, Unit.Blocks4096)
 dd_count = 1230

test/functional/tests/io_class/test_io_class_directory.py

@@ -19,7 +19,7 @@ from test_utils.filesystem.directory import Directory
 from test_utils.filesystem.file import File
 from test_tools.os_tools import drop_caches, DropCachesMode, sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.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

@@ -14,7 +14,7 @@ from .io_class_common import ioclass_config, get_io_class_occupancy, run_io_dir
 from api.cas import casadm
 from test_tools.os_tools import sync, drop_caches
 from test_tools.udev import Udev
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 
 
 cache_size = Size(100, Unit.MiB)

test/functional/tests/io_class/test_io_class_file.py

@@ -14,7 +14,7 @@ from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
 from test_utils.filesystem.file import File
 from test_tools.os_tools import sync, DropCachesMode, drop_caches
-from types.size import Size, Unit
+from type_def.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_lvm_on_cas.py

@@ -16,7 +16,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 ReadWrite, IoEngine
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from tests.volumes.common import lvm_filters
 
 mount_point = "/mnt/"

test/functional/tests/io_class/test_io_class_occupancy.py

@@ -18,7 +18,7 @@ from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 from tests.io_class.io_class_common import (
     prepare,
     mountpoint,

test/functional/tests/io_class/test_io_class_occupancy_repart.py

@@ -17,7 +17,7 @@ from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Unit
+from type_def.size import Unit
 from tests.io_class.io_class_common import (
     prepare,
     mountpoint,

test/functional/tests/io_class/test_io_class_occupancy_resize.py

@@ -15,7 +15,7 @@ from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Unit
+from type_def.size import Unit
 from tests.io_class.io_class_common import (
     mountpoint,
     prepare,

test/functional/tests/io_class/test_io_class_pinning_eviction.py

@@ -13,7 +13,7 @@ from api.cas.ioclass_config import IoClass, default_config_file_path
 from test_tools import fs_utils
 from test_tools.disk_utils import Filesystem
 from core.test_run import TestRun
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from .io_class_common import (
     prepare,
     mountpoint,

test/functional/tests/io_class/test_io_class_preserve_config.py

@@ -9,7 +9,7 @@ from api.cas import casadm, ioclass_config
 from api.cas.ioclass_config import IoClass
 from core.test_run_utils import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from tests.io_class.io_class_common import (
     compare_io_classes_list,
     generate_and_load_random_io_class_config,

test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py

@@ -11,7 +11,7 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools import fs_utils
 from connection.utils.output import CmdException
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 from tests.io_class.io_class_common import prepare, ioclass_config_path
 
 headerless_configuration = "1,unclassified,22,1.00"

test/functional/tests/io_class/test_io_class_process.py

@@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.dd import Dd
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.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

@@ -16,7 +16,7 @@ from test_tools.dd import Dd
 from test_tools.disk_utils import Filesystem
 from test_tools.os_tools import drop_caches, DropCachesMode, sync
 from test_tools.udev import Udev
-from types.size import Unit, Size
+from type_def.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

@@ -21,7 +21,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
 from test_tools.os_tools import sync, drop_caches
 from test_tools.runlevel import Runlevel
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from tests.io_class.io_class_common import (
     prepare,
     mountpoint,

test/functional/tests/io_class/test_io_class_stats_file_size_core.py

@@ -18,7 +18,7 @@ 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_tools.os_tools import sync, drop_caches
-from types.size import Size, Unit
+from type_def.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

@@ -12,7 +12,7 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_tools.os_tools import sync, drop_caches
 from test_tools.udev import Udev
-from types.size import Unit, Size
+from type_def.size import Unit, Size
 from tests.io_class.io_class_common import prepare
 
 

test/functional/tests/io_class/test_io_classification.py

@@ -21,7 +21,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_utils.filesystem.file import File
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from tests.io_class.io_class_common import prepare, ioclass_config_path, mountpoint
 
 

test/functional/tests/lazy_writes/cleaning_policy/test_acp.py

@@ -25,8 +25,8 @@ from test_tools.blktrace import BlkTrace, BlkTraceMask, ActionKind, RwbsKind
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
 from test_tools.os_tools import kill_all_io
-from types.size import Size, Unit
+from type_def.size import Size, Unit
-from types.time import Time
+from type_def.time import Time
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/lazy_writes/cleaning_policy/test_alru.py

@@ -16,8 +16,8 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_tools.os_tools import kill_all_io
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
-from types.time import Time
+from type_def.time import Time
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py

@@ -19,8 +19,8 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.dd import Dd
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
-from types.time import Time
+from type_def.time import Time
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py

@@ -14,7 +14,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from connection.utils.asynchronous import start_async_func
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

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

@@ -10,7 +10,7 @@ from core.test_run import TestRun
 from test_tools import fs_utils
 from test_tools.dd import Dd
 from test_utils.filesystem.file import File
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 def create_test_files(test_file_size):

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

@@ -17,8 +17,8 @@ from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import IoEngine, ReadWrite
 from test_utils.filesystem.file import File
 from test_tools.os_tools import DropCachesMode, drop_caches, sync
-from types.size import Size, Unit
+from type_def.size import Size, Unit
-from types.time import Time
+from type_def.time import Time
 from tests.lazy_writes.recovery.recovery_tests_methods import power_cycle_dut
 
 test_file_size = Size(300, Unit.MebiByte)

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

@@ -16,7 +16,7 @@ from test_tools.fs_utils import readlink
 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 type_def.size import Size, Unit
 from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \
     compare_files, power_cycle_dut
 

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

@@ -14,7 +14,7 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.disk_utils import Filesystem
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \
     compare_files
 

test/functional/tests/lazy_writes/test_clean_load.py

@@ -11,7 +11,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/lazy_writes/test_dirty_load.py

@@ -10,7 +10,7 @@ from core.test_run_utils import TestRun
 from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.fio.fio import Fio
 from test_tools.fio.fio_param import ReadWrite, IoEngine
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py

@@ -20,7 +20,7 @@ from test_tools.fs_utils import remove
 from test_utils.filesystem.file import File
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 file_size = Size(640, Unit.GiB)
 required_disk_size = file_size * 1.02

test/functional/tests/lazy_writes/test_lazy_writes_clean.py

@@ -17,7 +17,7 @@ from test_tools.iostat import IOstatBasic
 from test_utils.filesystem.file import File
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 bs = Size(512, Unit.KibiByte)
 mnt_point = "/mnt/cas/"

test/functional/tests/lazy_writes/test_lazy_writes_signals.py

@@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem
 from test_tools.fs_utils import create_random_test_file
 from test_tools.os_tools import sync
 from test_tools.scsi_debug import Logs, syslog_path
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 mount_point = "/mnt/cas"
 

test/functional/tests/lazy_writes/test_parallel_core_flushing.py

@@ -15,7 +15,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
 from test_tools.dd import Dd
 from test_utils.filesystem.file import File
 from connection.utils.output import CmdException
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 
 @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))

test/functional/tests/lazy_writes/test_wb_throttling.py

@@ -6,7 +6,7 @@
 import pytest
 from datetime import timedelta
 
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.fio.fio import Fio

test/functional/tests/memory/test_check_number_of_processes.py

@@ -10,7 +10,7 @@ from core.test_run import TestRun
 from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
 from test_tools.os_tools import (get_number_of_processors_from_cpuinfo,
                                  get_number_of_processes)
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 cleaning_threads_expected = 1
 management_thread_expected = 1

test/functional/tests/memory/test_memory_metadata_consumption.py

@@ -16,7 +16,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine
 from test_tools.memory import get_mem_available, get_module_mem_footprint
 from test_tools.os_tools import sync
 from test_tools.udev import Udev
-from types.size import Size, Unit
+from type_def.size import Size, Unit
 
 cores_count = 16
 cache_size = Size(50, Unit.GibiByte)