diff --git a/test/functional/api/cas/cache_config.py b/test/functional/api/cas/cache_config.py index 602626a..8f46766 100644 --- a/test/functional/api/cas/cache_config.py +++ b/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 types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time class CacheLineSize(Enum): diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py index b7d2a31..ef033a1 100644 --- a/test/functional/api/cas/casadm.py +++ b/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 diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py index 47c0e48..37e50b9 100644 --- a/test/functional/api/cas/core.py +++ b/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): diff --git a/test/functional/api/cas/dmesg.py b/test/functional/api/cas/dmesg.py index 6a7dff8..89e8ffa 100644 --- a/test/functional/api/cas/dmesg.py +++ b/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: diff --git a/test/functional/api/cas/statistics.py b/test/functional/api/cas/statistics.py index eda4642..e103bc5 100644 --- a/test/functional/api/cas/statistics.py +++ b/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): diff --git a/test/functional/tests/512b/test_different_io_sizes_support.py b/test/functional/tests/512b/test_different_io_sizes_support.py index 14b65cc..0c7e24f 100644 --- a/test/functional/tests/512b/test_different_io_sizes_support.py +++ b/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 diff --git a/test/functional/tests/basic/test_basic.py b/test/functional/tests/basic/test_basic.py index 4a68996..7381879 100644 --- a/test/functional/tests/basic/test_basic.py +++ b/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" diff --git a/test/functional/tests/basic/test_start_cas.py b/test/functional/tests/basic/test_start_cas.py index 4f3f926..affa40b 100644 --- a/test/functional/tests/basic/test_start_cas.py +++ b/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 diff --git a/test/functional/tests/cache_ops/test_cleaning_policy_operation.py b/test/functional/tests/cache_ops/test_cleaning_policy_operation.py index b40b977..79d5d5e 100644 --- a/test/functional/tests/cache_ops/test_cleaning_policy_operation.py +++ b/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 diff --git a/test/functional/tests/cache_ops/test_concurrent_flushes.py b/test/functional/tests/cache_ops/test_concurrent_flushes.py index da777e1..b6f6b57 100644 --- a/test/functional/tests/cache_ops/test_concurrent_flushes.py +++ b/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)) diff --git a/test/functional/tests/cache_ops/test_core_remove.py b/test/functional/tests/cache_ops/test_core_remove.py index fdd4d1e..a7b3aa7 100644 --- a/test/functional/tests/cache_ops/test_core_remove.py +++ b/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 diff --git a/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py b/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py index 9a6f4db..e253a20 100644 --- a/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py +++ b/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) diff --git a/test/functional/tests/cache_ops/test_multilevel_cache.py b/test/functional/tests/cache_ops/test_multilevel_cache.py index 9d625f4..d67ecb9 100644 --- a/test/functional/tests/cache_ops/test_multilevel_cache.py +++ b/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])) diff --git a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py index cfc9741..65face6 100644 --- a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py +++ b/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) diff --git a/test/functional/tests/cache_ops/test_seq_cutoff.py b/test/functional/tests/cache_ops/test_seq_cutoff.py index 90bea73..77b1995 100644 --- a/test/functional/tests/cache_ops/test_seq_cutoff.py +++ b/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): diff --git a/test/functional/tests/ci/test_ci_read_write.py b/test/functional/tests/ci/test_ci_read_write.py index ec05540..3821c84 100644 --- a/test/functional/tests/ci/test_ci_read_write.py +++ b/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 diff --git a/test/functional/tests/cli/test_cas_memory_usage.py b/test/functional/tests/cli/test_cas_memory_usage.py index bb33b62..32a4ba1 100644 --- a/test/functional/tests/cli/test_cas_memory_usage.py +++ b/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, diff --git a/test/functional/tests/cli/test_cleaning_policy.py b/test/functional/tests/cli/test_cleaning_policy.py index 8d065f1..432ec26 100644 --- a/test/functional/tests/cli/test_cleaning_policy.py +++ b/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 diff --git a/test/functional/tests/cli/test_cli_script.py b/test/functional/tests/cli/test_cli_script.py index 9334b69..6f24c81 100644 --- a/test/functional/tests/cli/test_cli_script.py +++ b/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 diff --git a/test/functional/tests/cli/test_cli_standby.py b/test/functional/tests/cli/test_cli_standby.py index 7f6ed15..e9b9c80 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/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, diff --git a/test/functional/tests/cli/test_cli_start_stop.py b/test/functional/tests/cli/test_cli_start_stop.py index ee4096d..47efd99 100644 --- a/test/functional/tests/cli/test_cli_start_stop.py +++ b/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) diff --git a/test/functional/tests/cli/test_manual_casadm_flush.py b/test/functional/tests/cli/test_manual_casadm_flush.py index e759c9c..585d80b 100644 --- a/test/functional/tests/cli/test_manual_casadm_flush.py +++ b/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 diff --git a/test/functional/tests/cli/test_seq_cutoff_settings.py b/test/functional/tests/cli/test_seq_cutoff_settings.py index 1c7c4c7..fb3fcf1 100644 --- a/test/functional/tests/cli/test_seq_cutoff_settings.py +++ b/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])) diff --git a/test/functional/tests/cli/test_set_get_params.py b/test/functional/tests/cli/test_set_get_params.py index 93cf2c1..aaea922 100644 --- a/test/functional/tests/cli/test_set_get_params.py +++ b/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 diff --git a/test/functional/tests/cli/test_zero_metadata_command.py b/test/functional/tests/cli/test_zero_metadata_command.py index efb1ee1..92d63e6 100644 --- a/test/functional/tests/cli/test_zero_metadata_command.py +++ b/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])) diff --git a/test/functional/tests/common/lvm_common_utils.py b/test/functional/tests/common/lvm_common_utils.py index a9cede6..9923af5 100644 --- a/test/functional/tests/common/lvm_common_utils.py +++ b/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: []): diff --git a/test/functional/tests/data_integrity/test_data_integrity_12h.py b/test/functional/tests/data_integrity/test_data_integrity_12h.py index ad5c8a6..f868ee4 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_12h.py +++ b/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)) diff --git a/test/functional/tests/data_integrity/test_data_integrity_5d.py b/test/functional/tests/data_integrity/test_data_integrity_5d.py index 5e8062a..dcfc93c 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_5d.py +++ b/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() diff --git a/test/functional/tests/data_integrity/test_data_integrity_unplug.py b/test/functional/tests/data_integrity/test_data_integrity_unplug.py index 3494cfb..898f1b3 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_unplug.py +++ b/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 diff --git a/test/functional/tests/example/example_test.py b/test/functional/tests/example/example_test.py index 5ff0fa4..e27b385 100644 --- a/test/functional/tests/example/example_test.py +++ b/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 diff --git a/test/functional/tests/failover_standby/test_cache_activation_perf.py b/test/functional/tests/failover_standby/test_cache_activation_perf.py index e97b3f9..7e32fb3 100644 --- a/test/functional/tests/failover_standby/test_cache_activation_perf.py +++ b/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 diff --git a/test/functional/tests/failover_standby/test_failover_advanced.py b/test/functional/tests/failover_standby/test_failover_advanced.py index 6bbb900..2bfde1a 100644 --- a/test/functional/tests/failover_standby/test_failover_advanced.py +++ b/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 diff --git a/test/functional/tests/failover_standby/test_failover_multihost.py b/test/functional/tests/failover_standby/test_failover_multihost.py index 1d65b1f..467f83f 100644 --- a/test/functional/tests/failover_standby/test_failover_multihost.py +++ b/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 diff --git a/test/functional/tests/fault_injection/test_another_device_with_same_id.py b/test/functional/tests/fault_injection/test_another_device_with_same_id.py index 9bf17b4..4cd322a 100644 --- a/test/functional/tests/fault_injection/test_another_device_with_same_id.py +++ b/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])) diff --git a/test/functional/tests/fault_injection/test_cache_insert_error.py b/test/functional/tests/fault_injection/test_cache_insert_error.py index f2a1513..bed641a 100644 --- a/test/functional/tests/fault_injection/test_cache_insert_error.py +++ b/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) diff --git a/test/functional/tests/fault_injection/test_error_device_as_cache.py b/test/functional/tests/fault_injection/test_error_device_as_cache.py index 94bb683..af924d7 100644 --- a/test/functional/tests/fault_injection/test_error_device_as_cache.py +++ b/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) diff --git a/test/functional/tests/fault_injection/test_fault_injection_interrupts.py b/test/functional/tests/fault_injection/test_fault_injection_interrupts.py index fa23cfa..871a27d 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_interrupts.py +++ b/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" diff --git a/test/functional/tests/fault_injection/test_fault_injection_many_to_one.py b/test/functional/tests/fault_injection/test_fault_injection_many_to_one.py index fc18253..14b5211 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_many_to_one.py +++ b/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) diff --git a/test/functional/tests/fault_injection/test_fault_injection_opencas_load.py b/test/functional/tests/fault_injection/test_fault_injection_opencas_load.py index 7e0617c..c88bc63 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_opencas_load.py +++ b/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" diff --git a/test/functional/tests/fault_injection/test_fault_injection_standby.py b/test/functional/tests/fault_injection/test_fault_injection_standby.py index 8f6f3f8..01053a3 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_standby.py +++ b/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 diff --git a/test/functional/tests/fault_injection/test_fault_injection_standby_core.py b/test/functional/tests/fault_injection/test_fault_injection_standby_core.py index 285079f..b0bc4b9 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_standby_core.py +++ b/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 diff --git a/test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py b/test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py index 2a4c1ea..c20bd14 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py +++ b/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" diff --git a/test/functional/tests/fault_injection/test_fault_power_reboot.py b/test/functional/tests/fault_injection/test_fault_power_reboot.py index 25c7222..2d25ba1 100644 --- a/test/functional/tests/fault_injection/test_fault_power_reboot.py +++ b/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 diff --git a/test/functional/tests/fault_injection/test_max_io_greater_in_core.py b/test/functional/tests/fault_injection/test_max_io_greater_in_core.py index b1b4b2b..001b1f6 100644 --- a/test/functional/tests/fault_injection/test_max_io_greater_in_core.py +++ b/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])) diff --git a/test/functional/tests/fault_injection/test_primary_device_error.py b/test/functional/tests/fault_injection/test_primary_device_error.py index 7856dce..6624b1c 100644 --- a/test/functional/tests/fault_injection/test_primary_device_error.py +++ b/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)) diff --git a/test/functional/tests/fault_injection/test_soft_hot_plug_device.py b/test/functional/tests/fault_injection/test_soft_hot_plug_device.py index 7bfc1d2..c93ec60 100644 --- a/test/functional/tests/fault_injection/test_soft_hot_plug_device.py +++ b/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) diff --git a/test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py b/test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py index 03abcd8..927b10b 100644 --- a/test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py +++ b/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 diff --git a/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py b/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py index f02ceed..f1605ba 100644 --- a/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py +++ b/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 diff --git a/test/functional/tests/incremental_load/test_core_pool.py b/test/functional/tests/incremental_load/test_core_pool.py index 1f3c8f7..376af5c 100644 --- a/test/functional/tests/incremental_load/test_core_pool.py +++ b/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])) diff --git a/test/functional/tests/incremental_load/test_inactive_cores.py b/test/functional/tests/incremental_load/test_inactive_cores.py index 5150b22..d5a80c3 100644 --- a/test/functional/tests/incremental_load/test_inactive_cores.py +++ b/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])) diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index 1ba3a0e..32f947d 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/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 types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.CI diff --git a/test/functional/tests/incremental_load/test_udev.py b/test/functional/tests/incremental_load/test_udev.py index a471e44..857d1cc 100644 --- a/test/functional/tests/incremental_load/test_udev.py +++ b/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 diff --git a/test/functional/tests/initialize/test_clean_reboot.py b/test/functional/tests/initialize/test_clean_reboot.py index 6383b0c..769c1cd 100644 --- a/test/functional/tests/initialize/test_clean_reboot.py +++ b/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 diff --git a/test/functional/tests/initialize/test_initialize_load.py b/test/functional/tests/initialize/test_initialize_load.py index d727463..6801ee4 100644 --- a/test/functional/tests/initialize/test_initialize_load.py +++ b/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]) diff --git a/test/functional/tests/initialize/test_initialize_runlevel.py b/test/functional/tests/initialize/test_initialize_runlevel.py index 566b385..81b200f 100644 --- a/test/functional/tests/initialize/test_initialize_runlevel.py +++ b/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" diff --git a/test/functional/tests/initialize/test_negative_load.py b/test/functional/tests/initialize/test_negative_load.py index 6e92e4f..08608d8 100644 --- a/test/functional/tests/initialize/test_negative_load.py +++ b/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])) diff --git a/test/functional/tests/initialize/test_recovery.py b/test/functional/tests/initialize/test_recovery.py index 80a61a3..1cd8be2 100644 --- a/test/functional/tests/initialize/test_recovery.py +++ b/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" diff --git a/test/functional/tests/initialize/test_simulation_startup.py b/test/functional/tests/initialize/test_simulation_startup.py index f090fec..d82943a 100644 --- a/test/functional/tests/initialize/test_simulation_startup.py +++ b/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 diff --git a/test/functional/tests/initialize/test_startup_init_config.py b/test/functional/tests/initialize/test_startup_init_config.py index 82a2e1e..e02824f 100644 --- a/test/functional/tests/initialize/test_startup_init_config.py +++ b/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 diff --git a/test/functional/tests/io/test_io_engines.py b/test/functional/tests/io/test_io_engines.py index f4b0512..e4c9fc0 100644 --- a/test/functional/tests/io/test_io_engines.py +++ b/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) diff --git a/test/functional/tests/io/test_remove_device_during_io.py b/test/functional/tests/io/test_remove_device_during_io.py index dcfe1d2..40b2e6d 100644 --- a/test/functional/tests/io/test_remove_device_during_io.py +++ b/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])) diff --git a/test/functional/tests/io/test_write_fetch.py b/test/functional/tests/io/test_write_fetch.py index 456149f..6840199 100644 --- a/test/functional/tests/io/test_write_fetch.py +++ b/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])) diff --git a/test/functional/tests/io/trim/test_trim.py b/test/functional/tests/io/trim/test_trim.py index e2674a7..cb48057 100644 --- a/test/functional/tests/io/trim/test_trim.py +++ b/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 diff --git a/test/functional/tests/io/trim/test_trim_stress.py b/test/functional/tests/io/trim/test_trim_stress.py index 85d47fe..9ca60be 100644 --- a/test/functional/tests/io/trim/test_trim_stress.py +++ b/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 diff --git a/test/functional/tests/io_class/io_class_common.py b/test/functional/tests/io_class/io_class_common.py index 373b826..7c6c3ef 100644 --- a/test/functional/tests/io_class/io_class_common.py +++ b/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" diff --git a/test/functional/tests/io_class/test_io_class_cli.py b/test/functional/tests/io_class/test_io_class_cli.py index 730eb5c..73feb62 100644 --- a/test/functional/tests/io_class/test_io_class_cli.py +++ b/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" diff --git a/test/functional/tests/io_class/test_io_class_core_id.py b/test/functional/tests/io_class/test_io_class_core_id.py index 7cc60aa..8332ec6 100644 --- a/test/functional/tests/io_class/test_io_class_core_id.py +++ b/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 diff --git a/test/functional/tests/io_class/test_io_class_directory.py b/test/functional/tests/io_class/test_io_class_directory.py index 7e506d9..b7f264b 100644 --- a/test/functional/tests/io_class/test_io_class_directory.py +++ b/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 diff --git a/test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py b/test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py index e75fd3b..1a0aa2a 100644 --- a/test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py +++ b/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) diff --git a/test/functional/tests/io_class/test_io_class_file.py b/test/functional/tests/io_class/test_io_class_file.py index 1cc7002..ac01f18 100644 --- a/test/functional/tests/io_class/test_io_class_file.py +++ b/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 diff --git a/test/functional/tests/io_class/test_io_class_lvm_on_cas.py b/test/functional/tests/io_class/test_io_class_lvm_on_cas.py index 6fd91de..ec5cab1 100644 --- a/test/functional/tests/io_class/test_io_class_lvm_on_cas.py +++ b/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/" diff --git a/test/functional/tests/io_class/test_io_class_occupancy.py b/test/functional/tests/io_class/test_io_class_occupancy.py index dd65cf7..0f3a039 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/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, diff --git a/test/functional/tests/io_class/test_io_class_occupancy_repart.py b/test/functional/tests/io_class/test_io_class_occupancy_repart.py index 68b5690..501a7a1 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy_repart.py +++ b/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, diff --git a/test/functional/tests/io_class/test_io_class_occupancy_resize.py b/test/functional/tests/io_class/test_io_class_occupancy_resize.py index 7e9e45f..3e01deb 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy_resize.py +++ b/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, diff --git a/test/functional/tests/io_class/test_io_class_pinning_eviction.py b/test/functional/tests/io_class/test_io_class_pinning_eviction.py index 2e66a19..ece7ee3 100644 --- a/test/functional/tests/io_class/test_io_class_pinning_eviction.py +++ b/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, diff --git a/test/functional/tests/io_class/test_io_class_preserve_config.py b/test/functional/tests/io_class/test_io_class_preserve_config.py index 89c2fe2..be9abec 100644 --- a/test/functional/tests/io_class/test_io_class_preserve_config.py +++ b/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, diff --git a/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py b/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py index 060f79a..43540f7 100644 --- a/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py +++ b/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" diff --git a/test/functional/tests/io_class/test_io_class_process.py b/test/functional/tests/io_class/test_io_class_process.py index 4783adc..f30299e 100644 --- a/test/functional/tests/io_class/test_io_class_process.py +++ b/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 diff --git a/test/functional/tests/io_class/test_io_class_purge.py b/test/functional/tests/io_class/test_io_class_purge.py index 46e47d0..6300d46 100644 --- a/test/functional/tests/io_class/test_io_class_purge.py +++ b/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 diff --git a/test/functional/tests/io_class/test_io_class_service_support.py b/test/functional/tests/io_class/test_io_class_service_support.py index 32b570a..d62d244 100644 --- a/test/functional/tests/io_class/test_io_class_service_support.py +++ b/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, diff --git a/test/functional/tests/io_class/test_io_class_stats_file_size_core.py b/test/functional/tests/io_class/test_io_class_stats_file_size_core.py index 078dffa..3d377cd 100644 --- a/test/functional/tests/io_class/test_io_class_stats_file_size_core.py +++ b/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 diff --git a/test/functional/tests/io_class/test_io_class_wlth.py b/test/functional/tests/io_class/test_io_class_wlth.py index 4d09b23..14b8c90 100644 --- a/test/functional/tests/io_class/test_io_class_wlth.py +++ b/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 diff --git a/test/functional/tests/io_class/test_io_classification.py b/test/functional/tests/io_class/test_io_classification.py index a9c91cd..31cf460 100644 --- a/test/functional/tests/io_class/test_io_classification.py +++ b/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 diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py index 2134f6c..22c2c13 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py +++ b/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 types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py index bcd5802..3cbb03e 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py +++ b/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 types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py b/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py index d47d821..219e233 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py +++ b/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 types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py b/test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py index 02816e4..df9ea76 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py +++ b/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])) diff --git a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py index 472c692..8f1a0eb 100644 --- a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py +++ b/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): diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py b/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py index 9a19a46..674f7ae 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py +++ b/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 types.time import Time +from type_def.size import Size, Unit +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) diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py b/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py index 66d085a..28bfb33 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py +++ b/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 diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py index db76560..5e1b65a 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py +++ b/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 diff --git a/test/functional/tests/lazy_writes/test_clean_load.py b/test/functional/tests/lazy_writes/test_clean_load.py index e6df380..c408503 100644 --- a/test/functional/tests/lazy_writes/test_clean_load.py +++ b/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])) diff --git a/test/functional/tests/lazy_writes/test_dirty_load.py b/test/functional/tests/lazy_writes/test_dirty_load.py index 5608fbc..afbd16f 100644 --- a/test/functional/tests/lazy_writes/test_dirty_load.py +++ b/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])) diff --git a/test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py b/test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py index bbad151..1409708 100644 --- a/test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py +++ b/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 diff --git a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py index 98cd4a1..b6405f2 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py +++ b/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/" diff --git a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py b/test/functional/tests/lazy_writes/test_lazy_writes_signals.py index 2bb823d..0c41f8c 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py +++ b/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" diff --git a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py index 2857cf5..f6a00ef 100644 --- a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py +++ b/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])) diff --git a/test/functional/tests/lazy_writes/test_wb_throttling.py b/test/functional/tests/lazy_writes/test_wb_throttling.py index 91085ab..158dae5 100644 --- a/test/functional/tests/lazy_writes/test_wb_throttling.py +++ b/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 diff --git a/test/functional/tests/memory/test_check_number_of_processes.py b/test/functional/tests/memory/test_check_number_of_processes.py index b13be24..8a4b18e 100644 --- a/test/functional/tests/memory/test_check_number_of_processes.py +++ b/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 diff --git a/test/functional/tests/memory/test_memory_metadata_consumption.py b/test/functional/tests/memory/test_memory_metadata_consumption.py index c3ebf43..5c27326 100644 --- a/test/functional/tests/memory/test_memory_metadata_consumption.py +++ b/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) diff --git a/test/functional/tests/misc/test_device_capabilities.py b/test/functional/tests/misc/test_device_capabilities.py index dc7f136..cb8b2bc 100644 --- a/test/functional/tests/misc/test_device_capabilities.py +++ b/test/functional/tests/misc/test_device_capabilities.py @@ -15,7 +15,7 @@ from storage_devices.device import Device from storage_devices.disk import DiskTypeSet, DiskType from test_tools import disk_utils from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.os_dependent diff --git a/test/functional/tests/misc/test_flush_propagation.py b/test/functional/tests/misc/test_flush_propagation.py index 9bb0d5b..261af0f 100644 --- a/test/functional/tests/misc/test_flush_propagation.py +++ b/test/functional/tests/misc/test_flush_propagation.py @@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem from test_tools.os_tools import sync from test_tools.scsi_debug import Logs, syslog_path from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/performance/test_100p_hits.py b/test/functional/tests/performance/test_100p_hits.py index 5a63275..659e265 100644 --- a/test/functional/tests/performance/test_100p_hits.py +++ b/test/functional/tests/performance/test_100p_hits.py @@ -20,7 +20,7 @@ from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import set_wbt_lat, get_dut_cpu_physical_cores 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 utils.performance import WorkloadParameter diff --git a/test/functional/tests/performance/test_performance_reads.py b/test/functional/tests/performance/test_performance_reads.py index e93e8ee..b2c2e47 100644 --- a/test/functional/tests/performance/test_performance_reads.py +++ b/test/functional/tests/performance/test_performance_reads.py @@ -18,7 +18,7 @@ from test_tools.os_tools import ( set_wbt_lat, get_dut_cpu_physical_cores, ) -from types.size import Unit, Size +from type_def.size import Unit, Size def fill_cas_cache(target, bs): diff --git a/test/functional/tests/performance/test_performance_write.py b/test/functional/tests/performance/test_performance_write.py index 1e3a684..4c2b14c 100644 --- a/test/functional/tests/performance/test_performance_write.py +++ b/test/functional/tests/performance/test_performance_write.py @@ -18,7 +18,7 @@ from test_tools.os_tools import ( get_number_of_processors_from_cpuinfo, get_dut_cpu_physical_cores, ) -from types.size import Unit, Size +from type_def.size import Unit, Size # TODO: for disks other than Intel Optane, fio ramp is needed before fio tests on raw disk diff --git a/test/functional/tests/progress_bar/test_progress_bar_big_files.py b/test/functional/tests/progress_bar/test_progress_bar_big_files.py index 499f719..e2496e9 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_big_files.py +++ b/test/functional/tests/progress_bar/test_progress_bar_big_files.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/progress_bar/test_progress_bar_during_io.py b/test/functional/tests/progress_bar/test_progress_bar_during_io.py index 3680f19..b89c2f2 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_during_io.py +++ b/test/functional/tests/progress_bar/test_progress_bar_during_io.py @@ -14,7 +14,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType 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])) diff --git a/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py b/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py index cdcb196..8e1de28 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py +++ b/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py b/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py index c871805..1101c6a 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py +++ b/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType 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 progress_bar_cmd_cache = [cli.stop_cmd, cli.flush_cache_cmd, cli.script_purge_cache_cmd] diff --git a/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py b/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py index 0d976de..3666f27 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py +++ b/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/security/fuzzy/kernel/common/common.py b/test/functional/tests/security/fuzzy/kernel/common/common.py index 87ca5ed..fcdc92b 100644 --- a/test/functional/tests/security/fuzzy/kernel/common/common.py +++ b/test/functional/tests/security/fuzzy/kernel/common/common.py @@ -15,7 +15,7 @@ from api.cas import casadm from api.cas.cache_config import CacheMode, CacheLineSize, KernelParameters, CleaningPolicy from core.test_run import TestRun from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit def get_fuzz_config(config_name: str): diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py index 5001ac9..6b11f86 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( run_cmd_and_validate, get_device_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py index fa93a23..e4a502a 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py @@ -20,7 +20,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, run_cmd_and_validate, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py index 558ea4e..65ac303 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, run_cmd_and_validate, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py index 60528d5..3781e5c 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( run_cmd_and_validate, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py index 3dd3beb..e8f4736 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( run_cmd_and_validate, get_device_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py index 0ca5f32..3272379 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, run_cmd_and_validate, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py index 47e2994..c592e6c 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py @@ -7,7 +7,7 @@ from datetime import timedelta from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/security/test_load_corrupted_metadata.py b/test/functional/tests/security/test_load_corrupted_metadata.py index e6fa727..79ef2e0 100644 --- a/test/functional/tests/security/test_load_corrupted_metadata.py +++ b/test/functional/tests/security/test_load_corrupted_metadata.py @@ -20,7 +20,7 @@ from core.test_run import TestRun from storage_devices.ramdisk import RamDisk from test_tools.dd import Dd 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) diff --git a/test/functional/tests/security/test_security_user.py b/test/functional/tests/security/test_security_user.py index b7aa5db..ef20c1d 100644 --- a/test/functional/tests/security/test_security_user.py +++ b/test/functional/tests/security/test_security_user.py @@ -16,7 +16,7 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.os_tools import create_user, check_if_user_exists from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" system_casadm_bin_path = "/sbin/casadm" diff --git a/test/functional/tests/stats/test_block_stats.py b/test/functional/tests/stats/test_block_stats.py index 08c106d..b45121c 100644 --- a/test/functional/tests/stats/test_block_stats.py +++ b/test/functional/tests/stats/test_block_stats.py @@ -16,7 +16,7 @@ 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 iterations = 10 dd_block_size = Size(1, Unit.Blocks4096) diff --git a/test/functional/tests/stats/test_consistency_between_outputs.py b/test/functional/tests/stats/test_consistency_between_outputs.py index cf60acf..bbc30cf 100644 --- a/test/functional/tests/stats/test_consistency_between_outputs.py +++ b/test/functional/tests/stats/test_consistency_between_outputs.py @@ -13,7 +13,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit iterations = 64 cache_size = Size(8, Unit.GibiByte) diff --git a/test/functional/tests/stats/test_display_statistics.py b/test/functional/tests/stats/test_display_statistics.py index ab8c55b..468ff37 100644 --- a/test/functional/tests/stats/test_display_statistics.py +++ b/test/functional/tests/stats/test_display_statistics.py @@ -27,7 +27,7 @@ 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 types.size import Size, Unit +from type_def.size import Size, Unit # One cache instance per every cache mode: caches_count = len(CacheMode) diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index a2210a3..5fdf6a1 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -29,7 +29,7 @@ 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 IoClass = ioclass_config.IoClass diff --git a/test/functional/tests/stats/test_stat_max.py b/test/functional/tests/stats/test_stat_max.py index c0ea5f1..815cd45 100644 --- a/test/functional/tests/stats/test_stat_max.py +++ b/test/functional/tests/stats/test_stat_max.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 from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit cache_size = Size(1, Unit.GibiByte) core_size = Size(2, Unit.GibiByte) diff --git a/test/functional/tests/stats/test_statistics_integrity.py b/test/functional/tests/stats/test_statistics_integrity.py index 039caaf..8a67679 100644 --- a/test/functional/tests/stats/test_statistics_integrity.py +++ b/test/functional/tests/stats/test_statistics_integrity.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 from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit # One cache instance per every cache mode: caches_count = len(CacheMode) diff --git a/test/functional/tests/stress/test_stress_attach_detach.py b/test/functional/tests/stress/test_stress_attach_detach.py index e468986..f10a29f 100644 --- a/test/functional/tests/stress/test_stress_attach_detach.py +++ b/test/functional/tests/stress/test_stress_attach_detach.py @@ -9,7 +9,7 @@ import random 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.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/stress/test_stress_change_io_class_config_io.py b/test/functional/tests/stress/test_stress_change_io_class_config_io.py index 391998a..224858c 100644 --- a/test/functional/tests/stress/test_stress_change_io_class_config_io.py +++ b/test/functional/tests/stress/test_stress_change_io_class_config_io.py @@ -19,7 +19,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine from connection.utils.asynchronous import start_async_func -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import generate_and_load_random_io_class_config diff --git a/test/functional/tests/stress/test_stress_cleaning_policy_change.py b/test/functional/tests/stress/test_stress_cleaning_policy_change.py index 0e0bfa4..a194dd8 100644 --- a/test/functional/tests/stress/test_stress_cleaning_policy_change.py +++ b/test/functional/tests/stress/test_stress_cleaning_policy_change.py @@ -15,7 +15,7 @@ from api.cas.cache_config import ( from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from test_tools.disk_utils import Filesystem -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 diff --git a/test/functional/tests/stress/test_stress_io_small_device.py b/test/functional/tests/stress/test_stress_io_small_device.py index 5a3b07a..fc362ba 100644 --- a/test/functional/tests/stress/test_stress_io_small_device.py +++ b/test/functional/tests/stress/test_stress_io_small_device.py @@ -12,7 +12,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet from test_tools.fio.fio import Fio from test_tools.fio.fio_param import CpusAllowedPolicy, IoEngine, ReadWrite -from types.size import Size, Unit +from type_def.size import Size, Unit stress_time = timedelta(minutes=30) diff --git a/test/functional/tests/stress/test_stress_shutdown.py b/test/functional/tests/stress/test_stress_shutdown.py index 76f0225..73712da 100644 --- a/test/functional/tests/stress/test_stress_shutdown.py +++ b/test/functional/tests/stress/test_stress_shutdown.py @@ -13,7 +13,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from types.size import Size, Unit +from type_def.size import Size, Unit cores_number = 2 iterations_per_config = 5 diff --git a/test/functional/tests/stress/test_stress_without_io.py b/test/functional/tests/stress/test_stress_without_io.py index 47da3c4..4710dc6 100644 --- a/test/functional/tests/stress/test_stress_without_io.py +++ b/test/functional/tests/stress/test_stress_without_io.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun 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 iterations_per_config = 50 cas_conf_path = "/etc/opencas/opencas.conf" diff --git a/test/functional/tests/volumes/common.py b/test/functional/tests/volumes/common.py index 35be295..45c8914 100644 --- a/test/functional/tests/volumes/common.py +++ b/test/functional/tests/volumes/common.py @@ -8,7 +8,7 @@ from api.cas.init_config import InitConfig, opencas_conf_path from test_tools import fs_utils from core.test_run import TestRun from test_tools.disk_utils import get_block_device_names_list -from types.size import Size, Unit +from type_def.size import Size, Unit test_file_size = Size(500, Unit.KiloByte) lvm_filters = [ diff --git a/test/functional/tests/volumes/test_discard_on_huge_core.py b/test/functional/tests/volumes/test_discard_on_huge_core.py index 919a219..34c9376 100644 --- a/test/functional/tests/volumes/test_discard_on_huge_core.py +++ b/test/functional/tests/volumes/test_discard_on_huge_core.py @@ -8,7 +8,7 @@ import pytest from api.cas import casadm from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit scsi_dev_size_gb = str(40 * 1024) diff --git a/test/functional/tests/volumes/test_many_cores_on_many_lvms.py b/test/functional/tests/volumes/test_many_cores_on_many_lvms.py index fa529ae..1c82e9c 100644 --- a/test/functional/tests/volumes/test_many_cores_on_many_lvms.py +++ b/test/functional/tests/volumes/test_many_cores_on_many_lvms.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet from test_tools import initramfs from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.volumes.common import get_test_configuration diff --git a/test/functional/tests/volumes/test_many_lvms_on_many_cores.py b/test/functional/tests/volumes/test_many_lvms_on_many_cores.py index b70bbae..2a74ead 100644 --- a/test/functional/tests/volumes/test_many_lvms_on_many_cores.py +++ b/test/functional/tests/volumes/test_many_lvms_on_many_cores.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import initramfs from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.volumes.common import get_test_configuration, lvm_filters diff --git a/test/functional/tests/volumes/test_many_lvms_on_single_core.py b/test/functional/tests/volumes/test_many_lvms_on_single_core.py index 9d35668..51407cc 100644 --- a/test/functional/tests/volumes/test_many_lvms_on_single_core.py +++ b/test/functional/tests/volumes/test_many_lvms_on_single_core.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import initramfs from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.volumes.common import get_test_configuration, lvm_filters diff --git a/test/functional/tests/volumes/test_multilevel_cache_3.py b/test/functional/tests/volumes/test_multilevel_cache_3.py index 160fe60..bee7936 100644 --- a/test/functional/tests/volumes/test_multilevel_cache_3.py +++ b/test/functional/tests/volumes/test_multilevel_cache_3.py @@ -8,7 +8,7 @@ import pytest from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from api.cas.cache import CacheMode, casadm -from types.size import Size, Unit +from type_def.size import Size, Unit from test_tools.disk_utils import Filesystem from .common import create_files_with_md5sums, compare_md5sums diff --git a/test/functional/tests/volumes/test_raid_as_cache.py b/test/functional/tests/volumes/test_raid_as_cache.py index 0312b33..e772465 100644 --- a/test/functional/tests/volumes/test_raid_as_cache.py +++ b/test/functional/tests/volumes/test_raid_as_cache.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.raid import Raid, RaidConfiguration, MetadataVariant, Level 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 mount_point = "/mnt/test" mount_point2 = "/mnt/test2" diff --git a/test/functional/tests/volumes/test_volume_partitions.py b/test/functional/tests/volumes/test_volume_partitions.py index 17565ca..30ef489 100644 --- a/test/functional/tests/volumes/test_volume_partitions.py +++ b/test/functional/tests/volumes/test_volume_partitions.py @@ -12,7 +12,7 @@ from core.test_run import TestRun from storage_devices.partition import Partition from test_tools import fs_utils, disk_utils from test_tools.disk_utils import PartitionTable, Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" cores_number = 16