From d4e562caf9ac788549ada126e9d1782e16761e26 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:17:13 +0100 Subject: [PATCH] Move size.py to types Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache_config.py | 2 +- test/functional/api/cas/casadm.py | 2 +- test/functional/api/cas/core.py | 2 +- test/functional/api/cas/dmesg.py | 2 +- test/functional/api/cas/statistics.py | 2 +- test/functional/test-framework | 2 +- .../tests/512b/test_different_io_sizes_support.py | 2 +- test/functional/tests/basic/test_basic.py | 2 +- test/functional/tests/basic/test_start_cas.py | 2 +- .../tests/cache_ops/test_cleaning_policy_operation.py | 2 +- test/functional/tests/cache_ops/test_concurrent_flushes.py | 2 +- test/functional/tests/cache_ops/test_core_remove.py | 2 +- .../tests/cache_ops/test_dynamic_cache_mode_switching.py | 2 +- test/functional/tests/cache_ops/test_multilevel_cache.py | 2 +- .../tests/cache_ops/test_multistream_seq_cutoff.py | 2 +- test/functional/tests/cache_ops/test_seq_cutoff.py | 2 +- test/functional/tests/ci/test_ci_read_write.py | 2 +- test/functional/tests/cli/test_cas_memory_usage.py | 2 +- test/functional/tests/cli/test_cleaning_policy.py | 2 +- test/functional/tests/cli/test_cli_script.py | 4 ++-- test/functional/tests/cli/test_cli_standby.py | 2 +- test/functional/tests/cli/test_cli_start_stop.py | 2 +- test/functional/tests/cli/test_manual_casadm_flush.py | 2 +- test/functional/tests/cli/test_seq_cutoff_settings.py | 2 +- test/functional/tests/cli/test_set_get_params.py | 2 +- test/functional/tests/cli/test_zero_metadata_command.py | 2 +- test/functional/tests/common/lvm_common_utils.py | 2 +- .../tests/data_integrity/test_data_integrity_12h.py | 2 +- .../tests/data_integrity/test_data_integrity_5d.py | 2 +- .../tests/data_integrity/test_data_integrity_unplug.py | 2 +- test/functional/tests/example/example_test.py | 4 ++-- .../tests/failover_standby/test_cache_activation_perf.py | 2 +- .../tests/failover_standby/test_failover_advanced.py | 5 ++--- .../tests/failover_standby/test_failover_multihost.py | 3 +-- .../fault_injection/test_another_device_with_same_id.py | 4 +--- .../tests/fault_injection/test_cache_insert_error.py | 2 +- .../tests/fault_injection/test_error_device_as_cache.py | 2 +- .../fault_injection/test_fault_injection_interrupts.py | 2 +- .../fault_injection/test_fault_injection_many_to_one.py | 4 ++-- .../fault_injection/test_fault_injection_opencas_load.py | 4 +--- .../tests/fault_injection/test_fault_injection_standby.py | 7 +------ .../fault_injection/test_fault_injection_standby_core.py | 6 +++--- .../test_fault_injection_with_mounted_core.py | 2 +- .../tests/fault_injection/test_fault_power_reboot.py | 2 +- .../tests/fault_injection/test_max_io_greater_in_core.py | 2 +- .../tests/fault_injection/test_primary_device_error.py | 2 +- .../tests/fault_injection/test_soft_hot_plug_device.py | 2 +- .../test_standby_activate_different_cache_path.py | 2 +- .../test_standby_activate_the_same_cache_path.py | 2 +- test/functional/tests/incremental_load/test_core_pool.py | 2 +- .../tests/incremental_load/test_inactive_cores.py | 2 +- .../tests/incremental_load/test_incremental_load.py | 2 +- test/functional/tests/incremental_load/test_udev.py | 2 +- test/functional/tests/initialize/test_clean_reboot.py | 2 +- test/functional/tests/initialize/test_initialize_load.py | 2 +- .../tests/initialize/test_initialize_runlevel.py | 2 +- test/functional/tests/initialize/test_negative_load.py | 2 +- test/functional/tests/initialize/test_recovery.py | 4 ++-- .../functional/tests/initialize/test_simulation_startup.py | 2 +- .../tests/initialize/test_startup_init_config.py | 2 +- test/functional/tests/io/test_io_engines.py | 2 +- test/functional/tests/io/test_remove_device_during_io.py | 2 +- test/functional/tests/io/test_write_fetch.py | 2 +- test/functional/tests/io/trim/test_trim.py | 2 +- test/functional/tests/io/trim/test_trim_stress.py | 2 +- test/functional/tests/io_class/io_class_common.py | 2 +- test/functional/tests/io_class/test_io_class_cli.py | 2 +- test/functional/tests/io_class/test_io_class_core_id.py | 2 +- test/functional/tests/io_class/test_io_class_directory.py | 2 +- .../io_class/test_io_class_eviction_pinned_after_unpin.py | 2 +- test/functional/tests/io_class/test_io_class_file.py | 2 +- test/functional/tests/io_class/test_io_class_lvm_on_cas.py | 2 +- test/functional/tests/io_class/test_io_class_occupancy.py | 3 +-- .../tests/io_class/test_io_class_occupancy_repart.py | 2 +- .../tests/io_class/test_io_class_occupancy_resize.py | 2 +- .../tests/io_class/test_io_class_pinning_eviction.py | 2 +- .../tests/io_class/test_io_class_preserve_config.py | 2 +- .../io_class/test_io_class_prevent_wrong_configuration.py | 2 +- test/functional/tests/io_class/test_io_class_process.py | 2 +- test/functional/tests/io_class/test_io_class_purge.py | 3 +-- .../tests/io_class/test_io_class_service_support.py | 2 +- .../tests/io_class/test_io_class_stats_file_size_core.py | 2 +- test/functional/tests/io_class/test_io_class_wlth.py | 2 +- test/functional/tests/io_class/test_io_classification.py | 2 +- .../tests/lazy_writes/cleaning_policy/test_acp.py | 2 +- .../tests/lazy_writes/cleaning_policy/test_alru.py | 2 +- .../lazy_writes/cleaning_policy/test_cleaning_params.py | 2 +- .../cleaning_policy/test_switch_cleaning_policy.py | 2 +- .../tests/lazy_writes/recovery/recovery_tests_methods.py | 2 +- .../lazy_writes/recovery/test_recovery_all_options.py | 2 +- .../lazy_writes/recovery/test_recovery_flush_reset.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_unplug.py | 2 +- test/functional/tests/lazy_writes/test_clean_load.py | 2 +- test/functional/tests/lazy_writes/test_dirty_load.py | 2 +- .../tests/lazy_writes/test_flush_huge_dirty_data.py | 2 +- .../functional/tests/lazy_writes/test_lazy_writes_clean.py | 2 +- .../tests/lazy_writes/test_lazy_writes_signals.py | 2 +- .../tests/lazy_writes/test_parallel_core_flushing.py | 2 +- test/functional/tests/lazy_writes/test_wb_throttling.py | 5 +---- .../tests/memory/test_check_number_of_processes.py | 2 +- .../tests/memory/test_memory_metadata_consumption.py | 2 +- test/functional/tests/misc/test_device_capabilities.py | 5 ++--- test/functional/tests/misc/test_flush_propagation.py | 2 +- test/functional/tests/performance/test_100p_hits.py | 2 +- .../functional/tests/performance/test_performance_reads.py | 2 +- .../functional/tests/performance/test_performance_write.py | 2 +- .../tests/progress_bar/test_progress_bar_big_files.py | 2 +- .../tests/progress_bar/test_progress_bar_during_io.py | 2 +- .../progress_bar/test_progress_bar_output_redirection.py | 2 +- .../progress_bar/test_progress_bar_supported_commands.py | 2 +- .../tests/progress_bar/test_progress_bar_wt_cache_mode.py | 2 +- .../tests/security/fuzzy/kernel/common/common.py | 2 +- .../kernel/fuzzy_start/test_fuzzy_start_cache_device.py | 2 +- .../kernel/fuzzy_start/test_fuzzy_start_cache_flags.py | 2 +- .../fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py | 2 +- .../kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py | 2 +- .../fuzzy_start/test_fuzzy_start_cache_load_device.py | 2 +- .../kernel/fuzzy_start/test_fuzzy_start_cache_mode.py | 2 +- .../security/fuzzy/kernel/fuzzy_with_io/common/common.py | 2 +- .../tests/security/test_load_corrupted_metadata.py | 2 +- test/functional/tests/security/test_security_user.py | 2 +- test/functional/tests/stats/test_block_stats.py | 2 +- .../tests/stats/test_consistency_between_outputs.py | 2 +- test/functional/tests/stats/test_display_statistics.py | 2 +- test/functional/tests/stats/test_ioclass_stats.py | 2 +- test/functional/tests/stats/test_stat_max.py | 2 +- test/functional/tests/stats/test_statistics_integrity.py | 2 +- test/functional/tests/stress/test_kedr.py | 2 +- test/functional/tests/stress/test_stress_attach_detach.py | 2 +- .../tests/stress/test_stress_change_io_class_config_io.py | 2 +- .../tests/stress/test_stress_cleaning_policy_change.py | 2 +- .../functional/tests/stress/test_stress_io_small_device.py | 2 +- test/functional/tests/stress/test_stress_shutdown.py | 2 +- test/functional/tests/stress/test_stress_without_io.py | 2 +- test/functional/tests/volumes/common.py | 2 +- test/functional/tests/volumes/test_discard_on_huge_core.py | 2 +- .../tests/volumes/test_many_cores_on_many_lvms.py | 2 +- .../tests/volumes/test_many_lvms_on_many_cores.py | 2 +- .../tests/volumes/test_many_lvms_on_single_core.py | 2 +- test/functional/tests/volumes/test_multilevel_cache_3.py | 2 +- test/functional/tests/volumes/test_raid_as_cache.py | 2 +- test/functional/tests/volumes/test_volume_partitions.py | 2 +- 142 files changed, 150 insertions(+), 167 deletions(-) diff --git a/test/functional/api/cas/cache_config.py b/test/functional/api/cas/cache_config.py index 0665bd4..b57757f 100644 --- a/test/functional/api/cas/cache_config.py +++ b/test/functional/api/cas/cache_config.py @@ -7,7 +7,7 @@ from enum import Enum, IntFlag from test_utils.os_utils import get_kernel_module_parameter -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.time import Time diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py index 292cdba..fdc64ed 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_utils.os_utils import reload_kernel_module from test_utils.output import CmdException, Output -from test_utils.size import Size, Unit +from types.size import Size, Unit # casadm commands diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py index e85eef9..12396e1 100644 --- a/test/functional/api/cas/core.py +++ b/test/functional/api/cas/core.py @@ -17,7 +17,7 @@ from core.test_run_utils import TestRun from storage_devices.device import Device from test_tools import fs_utils, disk_utils from test_utils.os_utils import wait, sync -from test_utils.size import Unit, Size +from types.size import Unit, Size class CoreStatus(Enum): diff --git a/test/functional/api/cas/dmesg.py b/test/functional/api/cas/dmesg.py index d9c787b..4ebb58e 100644 --- a/test/functional/api/cas/dmesg.py +++ b/test/functional/api/cas/dmesg.py @@ -7,7 +7,7 @@ import re from test_utils.dmesg import get_dmesg -from test_utils.size import Size, Unit +from types.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 1f2a9f4..eda4642 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 test_utils.size import Size, Unit +from types.size import Size, Unit class UnitType(Enum): diff --git a/test/functional/test-framework b/test/functional/test-framework index 072c72b..622c64c 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 072c72b08c9d5657c131b5cd325175a19a5417df +Subproject commit 622c64c46bb36cfe72001264e9f6d95c8b1c006b 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 3d104c2..14b65cc 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 test_utils.size import Size, Unit +from types.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 2b77c05..7dba5ed 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 1d882cb..4f3f926 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 test_utils.size import Size, Unit +from types.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 be6cf25..365e481 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 test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.os_utils 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 df9458c..3dc950d 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 2129e72..41088b3 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 bb40b07..3fc4245 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 @@ -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 ReadWrite, IoEngine, VerifyMethod from test_utils.os_utils import Udev, sync -from test_utils.size import Size, Unit +from types.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 a132273..9d625f4 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 test_utils.size import Size, Unit +from types.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 141948b..1969c6e 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_utils.os_utils import Udev from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 a0770ad..f527204 100644 --- a/test/functional/tests/cache_ops/test_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_seq_cutoff.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 ReadWrite, IoEngine, CpusAllowedPolicy from test_utils.os_utils import Udev, sync, get_dut_cpu_physical_cores -from test_utils.size import Size, Unit +from types.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 d2358f0..4f4ee81 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_utils.os_utils import Udev -from test_utils.size import Unit, Size +from types.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 f39c434..2338366 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 test_utils.size import Unit +from types.size import Unit from test_utils.os_utils import (allocate_memory, disable_memory_affecting_functions, drop_caches, diff --git a/test/functional/tests/cli/test_cleaning_policy.py b/test/functional/tests/cli/test_cleaning_policy.py index 7052abe..c8f00aa 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 test_utils.size import Size, Unit +from types.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 8121701..35972b0 100644 --- a/test/functional/tests/cli/test_cli_script.py +++ b/test/functional/tests/cli/test_cli_script.py @@ -6,11 +6,11 @@ import pytest -from api.cas import casadm, casadm_parser +from api.cas import casadm from core.test_run import TestRun from test_utils.os_utils import sync from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_utils.size import Unit, Size +from types.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 5d0bd38..afee549 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_utils.os_utils import sync from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 7f1b503..ee4096d 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 test_utils.size import Unit, Size +from types.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 6898825..2369127 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 test_utils.size import Size, Unit +from types.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 f751673..1c7c4c7 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 test_utils.size import Size, Unit +from types.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 7f3ce08..93cf2c1 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 test_utils.size import Size, Unit +from types.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 0fed8af..0907bcd 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_utils.disk_finder import get_system_disks from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 aec41af..a9cede6 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 test_utils.size import Size, Unit +from types.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 4e2f2e7..ad5c8a6 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 test_utils.size import Unit, Size +from types.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 718d169..6d0e974 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_utils.os_utils import sync -from test_utils.size import Unit, Size +from types.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 3e6ba6c..646cef3 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 test_utils.asynchronous import start_async_func from test_utils.filesystem.directory import Directory from test_utils.output import CmdException -from test_utils.size import Unit, Size +from types.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 b3ae6a1..89b7eab 100644 --- a/test/functional/tests/example/example_test.py +++ b/test/functional/tests/example/example_test.py @@ -15,10 +15,10 @@ from storage_devices.drbd import Drbd from test_tools.drbdadm import Drbdadm from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from test_tools.fs_utils import copy, check_if_file_exists +from test_tools.fs_utils import copy from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.emergency_escape import EmergencyEscape from test_utils.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 c22442d..c853eb7 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_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 47f823f..6bbb900 100644 --- a/test/functional/tests/failover_standby/test_failover_advanced.py +++ b/test/functional/tests/failover_standby/test_failover_advanced.py @@ -23,13 +23,12 @@ from storage_devices.disk import DiskType, DiskTypeSet from storage_devices.drbd import Drbd from test_tools.dd import Dd from test_tools.disk_utils import Filesystem -from test_utils.size import Size, Unit from test_utils.filesystem.file import File from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite -from test_tools.fs_utils import readlink, create_directory +from test_tools.fs_utils import create_directory from test_utils.drbd import Resource, Node -from test_utils.size import Size, Unit +from types.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 9973425..14a3b2b 100644 --- a/test/functional/tests/failover_standby/test_failover_multihost.py +++ b/test/functional/tests/failover_standby/test_failover_multihost.py @@ -22,14 +22,13 @@ from storage_devices.disk import DiskType, DiskTypeSet from storage_devices.drbd import Drbd from storage_devices.raid import Raid, RaidConfiguration, MetadataVariant, Level from test_tools.dd import Dd -from test_tools.drbdadm import Drbdadm from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite from test_tools.fs_utils import readlink from test_utils.drbd import Resource, Node from test_utils.os_utils import sync, Udev -from test_utils.size import Size, Unit +from types.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 2868285..9bf17b4 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 @@ -3,14 +3,12 @@ # SPDX-License-Identifier: BSD-3-Clause # -import time - import pytest from api.cas import cli, casadm from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun -from test_utils.size import Size, Unit +from types.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 87c0c4d..5a711cb 100644 --- a/test/functional/tests/fault_injection/test_cache_insert_error.py +++ b/test/functional/tests/fault_injection/test_cache_insert_error.py @@ -20,7 +20,7 @@ from test_tools.device_mapper import ErrorDevice, DmTable from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter, VerifyMethod from test_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 35f2c94..1f9695b 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 @@ -21,7 +21,7 @@ from api.cas.cache_config import ( ) from storage_devices.disk import DiskTypeSet, DiskType from test_utils.io_stats import IoStats -from test_utils.size import Size, Unit +from types.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 81650bd..c5375fa 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_utils import os_utils from test_utils.os_utils import Udev, DropCachesMode -from test_utils.size import Size, Unit +from types.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 0518355..b5ad1a7 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 @@ -12,8 +12,8 @@ from api.cas.core import Core from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from test_tools.dd import Dd -from test_utils.os_utils import Udev, sync -from test_utils.size import Size, Unit +from test_utils.os_utils import Udev +from types.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 273c5a4..b6dffe1 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 @@ -11,10 +11,8 @@ 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 test_tools.dd import Dd -from test_tools.disk_utils import Filesystem from test_utils import os_utils -from test_utils.size import Size, Unit +from types.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 80d0753..15a0f98 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_standby.py +++ b/test/functional/tests/fault_injection/test_fault_injection_standby.py @@ -5,20 +5,15 @@ # import pytest -from collections import namedtuple -import random from api.cas import casadm from api.cas import dmesg -from api.cas.cli import casadm_bin from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_utils.size import Size, Unit -from api.cas.cli_messages import check_stderr_msg, missing_param, disallowed_param +from types.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 -from api.cas.ioclass_config import IoClass from test_tools.dd import Dd from test_utils.os_utils import sync from test_utils.filesystem.file import File 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 726918f..285079f 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 @@ -6,11 +6,11 @@ import pytest -from api.cas import cli, casadm +from api.cas import casadm from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun -from test_utils.size import Size, Unit -from api.cas.cache_config import CacheLineSize, CacheMode, CacheStatus +from types.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 from api.cas.core import CoreStatus, Core 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 d8ac834..2a4c1ea 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 test_utils.size import Size, Unit +from types.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 22237e7..a8a791b 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 1caaf1d..98b0b06 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_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 069e15d..b8842a9 100644 --- a/test/functional/tests/fault_injection/test_primary_device_error.py +++ b/test/functional/tests/fault_injection/test_primary_device_error.py @@ -19,7 +19,7 @@ from api.cas.cache_config import ( ) from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 31b0c01..9cc7d64 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 5608c83..74dfef1 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 test_utils.size import Size, Unit +from types.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 adb71a0..f02ceed 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 test_utils.size import Size, Unit +from types.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 a05171c..182c2de 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 57ef360..5150b22 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 test_utils.size import Size, Unit +from types.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 ae6e6b5..ba30a35 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -31,7 +31,7 @@ from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.filesystem.file import File from test_utils.os_utils import Udev, sync from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.time import Time diff --git a/test/functional/tests/incremental_load/test_udev.py b/test/functional/tests/incremental_load/test_udev.py index 48b46ee..a471e44 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 test_utils.size import Size, Unit +from types.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 182145e..eac621f 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_utils.os_utils import drop_caches, DropCachesMode, sync -from test_utils.size import Size, Unit +from types.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 2f2b7de..d727463 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 test_utils.size import Size, Unit +from types.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 ad5305d..1c36db8 100644 --- a/test/functional/tests/initialize/test_initialize_runlevel.py +++ b/test/functional/tests/initialize/test_initialize_runlevel.py @@ -16,7 +16,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils import os_utils from test_utils.os_utils import Runlevel -from test_utils.size import Size, Unit +from types.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 973e3e6..6e92e4f 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 test_utils.size import Size, Unit +from types.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 71e5881..26b4a57 100644 --- a/test/functional/tests/initialize/test_recovery.py +++ b/test/functional/tests/initialize/test_recovery.py @@ -14,11 +14,11 @@ from api.cas.cli_messages import check_stderr_msg, stop_cache_errors from core.test_run import TestRun from storage_devices.disk import DiskTypeLowerThan, DiskTypeSet, DiskType from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem, mount +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_utils.os_utils import sync -from test_utils.size import Size, Unit +from types.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 5dc647e..f090fec 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 test_utils.size import Size, Unit +from types.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 34c1801..c72349d 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_utils import fstab from test_tools.dd import Dd -from test_utils.size import Unit, Size +from types.size import Unit, Size from test_utils.os_utils import sync, Udev from test_utils.emergency_escape import EmergencyEscape from api.cas.cas_service import set_cas_service_timeout, clear_cas_service_timeout diff --git a/test/functional/tests/io/test_io_engines.py b/test/functional/tests/io/test_io_engines.py index f6ea967..c1d3690 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_utils.os_utils import get_dut_cpu_physical_cores -from test_utils.size import Size, Unit +from types.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 b7170af..dcfe1d2 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 test_utils.size import Size, Unit +from types.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 ab2b0b9..deb8ddd 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_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 27052e6..b37c04b 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.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 test_utils import os_utils -from test_utils.size import Size, Unit +from types.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 a92ac9b..85d47fe 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 test_utils.size import Size, Unit +from types.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 405e1e8..23256bb 100644 --- a/test/functional/tests/io_class/io_class_common.py +++ b/test/functional/tests/io_class/io_class_common.py @@ -18,7 +18,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.os_utils import Udev, sync from test_utils.os_utils import drop_caches, DropCachesMode -from test_utils.size import Size, Unit +from types.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 82b39ab..730eb5c 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 test_utils.size import Size, Unit +from types.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 eb19d3c..842f556 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 @@ -11,7 +11,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_utils.os_utils import sync, Udev, drop_caches -from test_utils.size import Unit, Size +from types.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 827334d..9a9b0c9 100644 --- a/test/functional/tests/io_class/test_io_class_directory.py +++ b/test/functional/tests/io_class/test_io_class_directory.py @@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File from test_utils.os_utils import drop_caches, DropCachesMode, sync, Udev -from test_utils.size import Size, Unit +from types.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 95f0a28..2574680 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 @@ -13,7 +13,7 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from .io_class_common import ioclass_config, get_io_class_occupancy, run_io_dir from api.cas import casadm from test_utils.os_utils import sync, Udev, drop_caches -from test_utils.size import Unit, Size +from types.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 2d23ba4..fce1f6e 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_utils.os_utils import sync, DropCachesMode, drop_caches -from test_utils.size import Size, Unit +from types.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 bae9bf1..6fd91de 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 test_utils.size import Size, Unit +from types.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 6ed20bc..c2fad88 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/test/functional/tests/io_class/test_io_class_occupancy.py @@ -12,13 +12,12 @@ import pytest from api.cas import ioclass_config, casadm from api.cas.cache_config import CacheMode, CacheLineSize from api.cas.ioclass_config import IoClass, default_config_file_path -from api.cas.statistics import IoClassUsageStats from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_utils.os_utils import sync, Udev -from test_utils.size import Unit, Size +from types.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 5fcc66c..0171ac9 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 @@ -16,7 +16,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_utils.os_utils import sync, Udev -from test_utils.size import Unit +from types.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 eb07c29..4be7d59 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 @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_utils.os_utils import sync, Udev -from test_utils.size import Unit +from types.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 2eeb6b4..2e66a19 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 test_utils.size import Size, Unit +from types.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 639de22..89c2fe2 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 test_utils.size import Size, Unit +from types.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 c895b06..6cd9072 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 test_utils.output import CmdException -from test_utils.size import Unit, Size +from types.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 366e138..285144a 100644 --- a/test/functional/tests/io_class/test_io_class_process.py +++ b/test/functional/tests/io_class/test_io_class_process.py @@ -12,7 +12,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_utils.os_utils import sync, Udev -from test_utils.size import Size, Unit +from types.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 86d3385..ea02797 100644 --- a/test/functional/tests/io_class/test_io_class_purge.py +++ b/test/functional/tests/io_class/test_io_class_purge.py @@ -9,14 +9,13 @@ from collections import namedtuple import pytest from api.cas import ioclass_config, casadm -from api.cas.statistics import IoClassUsageStats from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.os_utils import drop_caches, DropCachesMode, sync, Udev -from test_utils.size import Unit, Size +from types.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 ea0e412..f96d8e7 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 @@ -19,7 +19,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils import os_utils from test_utils.os_utils import Runlevel -from test_utils.size import Size, Unit +from types.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 9670edd..ef67c94 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_utils.os_utils import sync, drop_caches -from test_utils.size import Size, Unit +from types.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 52c1820..822ff05 100644 --- a/test/functional/tests/io_class/test_io_class_wlth.py +++ b/test/functional/tests/io_class/test_io_class_wlth.py @@ -11,7 +11,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_utils.os_utils import sync, Udev, drop_caches -from test_utils.size import Unit, Size +from types.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 43bbe0b..ab3dce5 100644 --- a/test/functional/tests/io_class/test_io_classification.py +++ b/test/functional/tests/io_class/test_io_classification.py @@ -20,7 +20,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.filesystem.file import File from test_utils.os_utils import sync, Udev -from test_utils.size import Size, Unit +from types.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 63478c2..c3158bf 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py @@ -25,7 +25,7 @@ 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_utils.os_utils import kill_all_io -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.time import Time 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 f0aa529..450be7a 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py @@ -15,7 +15,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_utils.os_utils import Udev, kill_all_io -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.time import Time 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 9a4e91e..8a27da4 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,7 +19,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.time import Time 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 484cbfe..0d93c13 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 test_utils.asynchronous import start_async_func -from test_utils.size import Size, Unit +from types.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 09522fa..5d84531 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 test_tools import fs_utils from test_tools.dd import Dd from test_utils import os_utils from test_utils.filesystem.file import File -from test_utils.size import Size, Unit +from types.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 b25a813..2de7c74 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 @@ -18,7 +18,7 @@ from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils import os_utils from test_utils.filesystem.file import File from test_utils.os_utils import DropCachesMode -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.time import Time from tests.lazy_writes.recovery.recovery_tests_methods import power_cycle_dut 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 18b6675..664cffb 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_utils import os_utils from test_utils.os_utils import Udev, DropCachesMode from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 f776066..1f0a7a5 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 a3c6373..a70c938 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_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 fc81998..5608fbc 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 test_utils.size import Size, Unit +from types.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 5dfd3ee..a27cd4f 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 @@ -19,7 +19,7 @@ from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.fs_utils import remove from test_utils.filesystem.file import File from test_utils.os_utils import sync, Udev -from test_utils.size import Size, Unit +from types.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 b67263b..4bc49d8 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py @@ -16,7 +16,7 @@ from test_tools.fs_utils import create_random_test_file, remove from test_tools.iostat import IOstatBasic from test_utils.filesystem.file import File from test_utils.os_utils import Udev, sync -from test_utils.size import Size, Unit +from types.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 9215167..e1a9048 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_utils.scsi_debug import Logs, syslog_path from test_utils import os_utils -from test_utils.size import Size, Unit +from types.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 4996465..b31aa87 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 457ced0..afa0abc 100644 --- a/test/functional/tests/lazy_writes/test_wb_throttling.py +++ b/test/functional/tests/lazy_writes/test_wb_throttling.py @@ -4,14 +4,11 @@ # import pytest -import time -import random from datetime import timedelta -from test_utils.size import Size, Unit +from types.size import Size, Unit from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.iostat import IOstatExtended 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 e3593eb..eaba832 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_utils.os_utils import (get_number_of_processors_from_cpuinfo, get_number_of_processes) -from test_utils.size import Size, Unit +from types.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 0686155..fbdbc72 100644 --- a/test/functional/tests/memory/test_memory_metadata_consumption.py +++ b/test/functional/tests/memory/test_memory_metadata_consumption.py @@ -15,7 +15,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.os_utils import get_mem_available, get_module_mem_footprint from test_utils.os_utils import sync, Udev -from test_utils.size import Size, Unit +from types.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 3e15091..98d3249 100644 --- a/test/functional/tests/misc/test_device_capabilities.py +++ b/test/functional/tests/misc/test_device_capabilities.py @@ -13,10 +13,9 @@ from api.cas.cache_config import CacheLineSize from core.test_run import TestRun from storage_devices.device import Device from storage_devices.disk import DiskTypeSet, DiskType -from storage_devices.partition import Partition -from test_tools import disk_utils, fs_utils +from test_tools import disk_utils from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 e22237a..1926ffa 100644 --- a/test/functional/tests/misc/test_flush_propagation.py +++ b/test/functional/tests/misc/test_flush_propagation.py @@ -19,7 +19,7 @@ from test_tools.disk_utils import Filesystem from test_utils.scsi_debug import Logs, syslog_path from test_tools.fs_utils import create_random_test_file from test_utils import os_utils -from test_utils.size import Size, Unit +from types.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 1c2ce26..344b447 100644 --- a/test/functional/tests/performance/test_100p_hits.py +++ b/test/functional/tests/performance/test_100p_hits.py @@ -19,7 +19,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.os_utils import Udev, set_wbt_lat, get_dut_cpu_physical_cores from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 9c29e6b..8561ead 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_utils.os_utils import ( set_wbt_lat, get_dut_cpu_physical_cores, ) -from test_utils.size import Unit, Size +from types.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 bf0925d..e60090a 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_utils.os_utils import ( get_number_of_processors_from_cpuinfo, get_dut_cpu_physical_cores, ) -from test_utils.size import Unit, Size +from types.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 dcf0068..499f719 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 test_utils.size import Size, Unit +from types.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 55b017f..3680f19 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 test_utils.size import Size, Unit +from types.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 77d4c07..cdcb196 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 test_utils.size import Size, Unit +from types.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 c197d1e..c871805 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 test_utils.size import Size, Unit +from types.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 f5ca2a9..0d976de 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 test_utils.size import Size, Unit +from types.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 408682a..87ca5ed 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 test_utils.size import Size, Unit +from types.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 5e580d5..5001ac9 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 test_utils.size import Unit, Size +from types.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 535e74f..3a8f92e 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_utils.os_utils import Udev -from test_utils.size import Unit, Size +from types.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 89c20bd..558ea4e 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 test_utils.size import Unit, Size +from types.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 b8ca4ed..60528d5 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 test_utils.size import Unit, Size +from types.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 72073e7..3dd3beb 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 test_utils.size import Unit, Size +from types.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 210bb31..0ca5f32 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 test_utils.size import Unit, Size +from types.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 91cb165..47e2994 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 test_utils.size import Size, Unit +from types.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 94d09b7..bda46ff 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 test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 5dc5720..53baa11 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_utils.os_utils import create_user, check_if_user_exists from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 c439f76..69865d4 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_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 61fffd0..cf60acf 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 test_utils.size import Size, Unit +from types.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 8d06f7b..ab8c55b 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 test_utils.size import Size, Unit +from types.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 5f03963..287c6e7 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_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from test_utils.os_utils import sync, Udev from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.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 2f0cda3..2bbbeed 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_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.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 e8f4bea..e83dc2f 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_utils.os_utils import Udev -from test_utils.size import Size, Unit +from types.size import Size, Unit # One cache instance per every cache mode: caches_count = len(CacheMode) diff --git a/test/functional/tests/stress/test_kedr.py b/test/functional/tests/stress/test_kedr.py index 84828f1..89105ac 100644 --- a/test/functional/tests/stress/test_kedr.py +++ b/test/functional/tests/stress/test_kedr.py @@ -11,7 +11,7 @@ from test_tools.kedr import Kedr, KedrProfile from api.cas import cas_module, installer, casadm from core.test_run import TestRun from test_utils import os_utils -from test_utils.size import Size, Unit +from types.size import Size, Unit from test_tools.disk_utils import Filesystem from test_utils.os_utils import sync from test_tools.fio.fio import Fio diff --git a/test/functional/tests/stress/test_stress_attach_detach.py b/test/functional/tests/stress/test_stress_attach_detach.py index b121a95..e468986 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 test_utils.size import Size, Unit +from types.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 3bf1a07..0fd98bd 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 test_utils.asynchronous import start_async_func -from test_utils.size import Size, Unit +from types.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 6c8ea0f..890a18e 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 test_utils.size import Size, Unit +from types.size import Size, Unit from test_utils.os_utils 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 d8135ba..5a3b07a 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 test_utils.size import Size, Unit +from types.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 e0ca82c..76f0225 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 test_utils.size import Size, Unit +from types.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 da4ad5a..47da3c4 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 test_utils.size import Size, Unit +from types.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 2acfec3..a3eb48c 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_utils.os_utils import get_block_device_names_list -from test_utils.size import Size, Unit +from types.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 47ff08c..919a219 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 test_utils.size import Size, Unit +from types.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 dc023ae..fa529ae 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 test_utils.size import Size, Unit +from types.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 6618395..b70bbae 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 test_utils.size import Size, Unit +from types.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 acb6132..9d35668 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 test_utils.size import Size, Unit +from types.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 566acef..160fe60 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 test_utils.size import Size, Unit +from types.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 7eb5ca9..0312b33 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 test_utils.size import Size, Unit +from types.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 385968f..17565ca 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 test_utils.size import Size, Unit +from types.size import Size, Unit mount_point = "/mnt/cas" cores_number = 16