From d4e562caf9ac788549ada126e9d1782e16761e26 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:17:13 +0100 Subject: [PATCH 01/24] 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 From 81e792be9936b2842aa439bf5d42b31348b119bc Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:20:31 +0100 Subject: [PATCH 02/24] Move Time to types Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache_config.py | 2 +- test/functional/test-framework | 2 +- test/functional/tests/incremental_load/test_incremental_load.py | 2 +- test/functional/tests/lazy_writes/cleaning_policy/test_acp.py | 2 +- test/functional/tests/lazy_writes/cleaning_policy/test_alru.py | 2 +- .../tests/lazy_writes/cleaning_policy/test_cleaning_params.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_all_options.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/functional/api/cas/cache_config.py b/test/functional/api/cas/cache_config.py index b57757f..dcd04c5 100644 --- a/test/functional/api/cas/cache_config.py +++ b/test/functional/api/cas/cache_config.py @@ -8,7 +8,7 @@ from enum import Enum, IntFlag from test_utils.os_utils import get_kernel_module_parameter from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time class CacheLineSize(Enum): diff --git a/test/functional/test-framework b/test/functional/test-framework index 622c64c..513f006 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 622c64c46bb36cfe72001264e9f6d95c8b1c006b +Subproject commit 513f006d17468ead7a768e13f48014e725b9ddd1 diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index ba30a35..b3a041a 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -32,7 +32,7 @@ from test_utils.filesystem.file import File from test_utils.os_utils import Udev, sync from test_utils.output import CmdException from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.CI 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 c3158bf..6faacd5 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.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 kill_all_io from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py index 450be7a..f53f503 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py @@ -16,7 +16,7 @@ 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 types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py b/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py index 8a27da4..962e239 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 @@ -20,7 +20,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_utils.os_utils import Udev from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) 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 2de7c74..e04cedc 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 @@ -19,7 +19,7 @@ from test_utils import os_utils from test_utils.filesystem.file import File from test_utils.os_utils import DropCachesMode from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time from tests.lazy_writes.recovery.recovery_tests_methods import power_cycle_dut test_file_size = Size(300, Unit.MebiByte) From 9460151ee532019f331186c1dcbbb23bfb719d53 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:31:14 +0100 Subject: [PATCH 03/24] Move output to connection utils Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache.py | 2 +- test/functional/api/cas/casadm.py | 2 +- test/functional/api/cas/casadm_parser.py | 2 +- test/functional/api/cas/cli_messages.py | 2 +- test/functional/api/cas/installer.py | 2 +- test/functional/api/cas/version.py | 2 +- test/functional/test-framework | 2 +- test/functional/tests/basic/test_basic.py | 2 +- test/functional/tests/cache_ops/test_concurrent_flushes.py | 2 +- test/functional/tests/cache_ops/test_core_remove.py | 2 +- test/functional/tests/cache_ops/test_multistream_seq_cutoff.py | 2 +- test/functional/tests/cli/test_cli_standby.py | 2 +- test/functional/tests/cli/test_zero_metadata_command.py | 2 +- .../tests/data_integrity/test_data_integrity_unplug.py | 2 +- .../functional/tests/fault_injection/test_fault_power_reboot.py | 2 +- .../tests/fault_injection/test_soft_hot_plug_device.py | 2 +- test/functional/tests/incremental_load/test_core_pool.py | 2 +- test/functional/tests/incremental_load/test_incremental_load.py | 2 +- .../tests/io_class/test_io_class_prevent_wrong_configuration.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_flush_reset.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_unplug.py | 2 +- .../functional/tests/lazy_writes/test_parallel_core_flushing.py | 2 +- test/functional/tests/misc/test_device_capabilities.py | 2 +- test/functional/tests/performance/test_100p_hits.py | 2 +- test/functional/tests/security/test_load_corrupted_metadata.py | 2 +- test/functional/tests/security/test_security_user.py | 2 +- test/functional/tests/stats/test_ioclass_stats.py | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/functional/api/cas/cache.py b/test/functional/api/cas/cache.py index e752a0f..fe1e667 100644 --- a/test/functional/api/cas/cache.py +++ b/test/functional/api/cas/cache.py @@ -9,7 +9,7 @@ from api.cas.core import Core from api.cas.dmesg import get_metadata_size_on_device from api.cas.statistics import CacheStats, CacheIoClassStats from test_utils.os_utils import * -from test_utils.output import Output +from connection.utils.output import Output class Cache: diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py index fdc64ed..f1270b8 100644 --- a/test/functional/api/cas/casadm.py +++ b/test/functional/api/cas/casadm.py @@ -21,7 +21,7 @@ from api.cas.core import Core 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 connection.utils.output import CmdException, Output from types.size import Size, Unit diff --git a/test/functional/api/cas/casadm_parser.py b/test/functional/api/cas/casadm_parser.py index 1285d99..da3090a 100644 --- a/test/functional/api/cas/casadm_parser.py +++ b/test/functional/api/cas/casadm_parser.py @@ -18,7 +18,7 @@ from api.cas.ioclass_config import IoClass from api.cas.version import CasVersion from core.test_run_utils import TestRun from storage_devices.device import Device -from test_utils.output import CmdException +from connection.utils.output import CmdException class Stats(dict): diff --git a/test/functional/api/cas/cli_messages.py b/test/functional/api/cas/cli_messages.py index fc3104b..78da17b 100644 --- a/test/functional/api/cas/cli_messages.py +++ b/test/functional/api/cas/cli_messages.py @@ -7,7 +7,7 @@ import re from core.test_run import TestRun -from test_utils.output import Output +from connection.utils.output import Output load_inactive_core_missing = [ r"WARNING: Can not resolve path to core \d+ from cache \d+\. By-id path will be shown for that " diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py index abf06d0..4861286 100644 --- a/test/functional/api/cas/installer.py +++ b/test/functional/api/cas/installer.py @@ -10,7 +10,7 @@ from core.test_run import TestRun from api.cas import cas_module from api.cas.version import get_installed_cas_version from test_utils import os_utils, git -from test_utils.output import CmdException +from connection.utils.output import CmdException def rsync_opencas_sources(): diff --git a/test/functional/api/cas/version.py b/test/functional/api/cas/version.py index 72129d6..1ce6583 100644 --- a/test/functional/api/cas/version.py +++ b/test/functional/api/cas/version.py @@ -8,7 +8,7 @@ import re from test_utils import git from core.test_run import TestRun -from test_utils.output import CmdException +from connection.utils.output import CmdException class CasVersion: diff --git a/test/functional/test-framework b/test/functional/test-framework index 513f006..161cc79 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 513f006d17468ead7a768e13f48014e725b9ddd1 +Subproject commit 161cc7957afb70256cf07a69673dad63889ccbfc diff --git a/test/functional/tests/basic/test_basic.py b/test/functional/tests/basic/test_basic.py index 7dba5ed..4a68996 100644 --- a/test/functional/tests/basic/test_basic.py +++ b/test/functional/tests/basic/test_basic.py @@ -21,7 +21,7 @@ from test_tools import fs_utils 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 connection.utils.output import CmdException from types.size import Size, Unit version_file_path = r"/var/lib/opencas/cas_version" diff --git a/test/functional/tests/cache_ops/test_concurrent_flushes.py b/test/functional/tests/cache_ops/test_concurrent_flushes.py index 3dc950d..da777e1 100644 --- a/test/functional/tests/cache_ops/test_concurrent_flushes.py +++ b/test/functional/tests/cache_ops/test_concurrent_flushes.py @@ -15,7 +15,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 IoEngine, ReadWrite -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/cache_ops/test_core_remove.py b/test/functional/tests/cache_ops/test_core_remove.py index 41088b3..fdd4d1e 100644 --- a/test/functional/tests/cache_ops/test_core_remove.py +++ b/test/functional/tests/cache_ops/test_core_remove.py @@ -12,7 +12,7 @@ from api.cas import casadm 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 connection.utils.output import CmdException from types.size import Size, Unit mount_point = "/mnt/cas" 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 1969c6e..0604981 100644 --- a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py @@ -25,7 +25,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 Udev -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit random_thresholds = random.sample(range(1028, 1024**2, 4), 3) diff --git a/test/functional/tests/cli/test_cli_standby.py b/test/functional/tests/cli/test_cli_standby.py index afee549..800063b 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/test/functional/tests/cli/test_cli_standby.py @@ -16,7 +16,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 -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit from api.cas.cli_messages import ( check_stderr_msg, diff --git a/test/functional/tests/cli/test_zero_metadata_command.py b/test/functional/tests/cli/test_zero_metadata_command.py index 0907bcd..e33eee2 100644 --- a/test/functional/tests/cli/test_zero_metadata_command.py +++ b/test/functional/tests/cli/test_zero_metadata_command.py @@ -16,7 +16,7 @@ from test_tools.disk_utils import get_device_filesystem_type, Filesystem 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 connection.utils.output import CmdException from types.size import Size, Unit 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 646cef3..597a26b 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_unplug.py +++ b/test/functional/tests/data_integrity/test_data_integrity_unplug.py @@ -21,7 +21,7 @@ from test_tools.fio.fio import Fio 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 connection.utils.output import CmdException from types.size import Unit, Size ram_disk, tmp_dir, fio_seed = None, None, None 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 a8a791b..25c7222 100644 --- a/test/functional/tests/fault_injection/test_fault_power_reboot.py +++ b/test/functional/tests/fault_injection/test_fault_power_reboot.py @@ -10,7 +10,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.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit log_path = "/var/log/opencas.log" 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 9cc7d64..7bfc1d2 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 @@ -16,7 +16,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, ErrorFilter -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/incremental_load/test_core_pool.py b/test/functional/tests/incremental_load/test_core_pool.py index 182c2de..1f3c8f7 100644 --- a/test/functional/tests/incremental_load/test_core_pool.py +++ b/test/functional/tests/incremental_load/test_core_pool.py @@ -10,7 +10,7 @@ from api.cas.core import CoreStatus 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 connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index b3a041a..a77b16c 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -30,7 +30,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.filesystem.file import File from test_utils.os_utils import Udev, sync -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit from types.time import Time 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 6cd9072..060f79a 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 @@ -10,7 +10,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.output import CmdException +from connection.utils.output import CmdException from types.size import Unit, Size from tests.io_class.io_class_common import prepare, ioclass_config_path 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 664cffb..a348140 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 @@ -15,7 +15,7 @@ from test_tools.disk_utils import Filesystem 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 connection.utils.output import CmdException 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 1f0a7a5..db76560 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py @@ -13,7 +13,7 @@ from api.cas.cache_config import CacheMode, CacheModeTrait, CacheLineSize 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 connection.utils.output import CmdException 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_parallel_core_flushing.py b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py index b31aa87..2857cf5 100644 --- a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py +++ b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py @@ -14,7 +14,7 @@ from core.test_run_utils import TestRun 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 connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/misc/test_device_capabilities.py b/test/functional/tests/misc/test_device_capabilities.py index 98d3249..dc7f136 100644 --- a/test/functional/tests/misc/test_device_capabilities.py +++ b/test/functional/tests/misc/test_device_capabilities.py @@ -14,7 +14,7 @@ from core.test_run import TestRun from storage_devices.device import Device from storage_devices.disk import DiskTypeSet, DiskType from test_tools import disk_utils -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/performance/test_100p_hits.py b/test/functional/tests/performance/test_100p_hits.py index 344b447..848f43d 100644 --- a/test/functional/tests/performance/test_100p_hits.py +++ b/test/functional/tests/performance/test_100p_hits.py @@ -18,7 +18,7 @@ from storage_devices.disk import DiskTypeSet, DiskTypeLowerThan, DiskType 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 connection.utils.output import CmdException from types.size import Size, Unit from utils.performance import WorkloadParameter diff --git a/test/functional/tests/security/test_load_corrupted_metadata.py b/test/functional/tests/security/test_load_corrupted_metadata.py index bda46ff..e6fa727 100644 --- a/test/functional/tests/security/test_load_corrupted_metadata.py +++ b/test/functional/tests/security/test_load_corrupted_metadata.py @@ -19,7 +19,7 @@ from storage_devices.device import Device 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 connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/security/test_security_user.py b/test/functional/tests/security/test_security_user.py index 53baa11..d85a16a 100644 --- a/test/functional/tests/security/test_security_user.py +++ b/test/functional/tests/security/test_security_user.py @@ -15,7 +15,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 create_user, check_if_user_exists -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index 287c6e7..b4fb11a 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -28,7 +28,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan 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 connection.utils.output import CmdException from types.size import Size, Unit IoClass = ioclass_config.IoClass From 4a6d6d39cd267f891e521a00bc662033b9049700 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:50:43 +0100 Subject: [PATCH 04/24] Move asynchronous to connection utils Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- .../tests/data_integrity/test_data_integrity_unplug.py | 2 +- .../lazy_writes/cleaning_policy/test_switch_cleaning_policy.py | 2 +- .../tests/stress/test_stress_change_io_class_config_io.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index 161cc79..f508707 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 161cc7957afb70256cf07a69673dad63889ccbfc +Subproject commit f5087073947cb49f587e17a6b823640751c98f9b 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 597a26b..3494cfb 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_unplug.py +++ b/test/functional/tests/data_integrity/test_data_integrity_unplug.py @@ -19,7 +19,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.ramdisk import RamDisk from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite -from test_utils.asynchronous import start_async_func +from connection.utils.asynchronous import start_async_func from test_utils.filesystem.directory import Directory from connection.utils.output import CmdException from types.size import Unit, Size 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 0d93c13..02816e4 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 @@ -13,7 +13,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.asynchronous import start_async_func +from connection.utils.asynchronous import start_async_func from types.size import Size, Unit 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 0fd98bd..391998a 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 @@ -18,7 +18,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan 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 connection.utils.asynchronous import start_async_func from types.size import Size, Unit from tests.io_class.io_class_common import generate_and_load_random_io_class_config From ee8b7b757f8d302f065972b4ee999a8469c3d0bf Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:54:44 +0100 Subject: [PATCH 05/24] Move retry to connection utils Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index f508707..5409fa9 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit f5087073947cb49f587e17a6b823640751c98f9b +Subproject commit 5409fa9a40de5c56eddf79742546f863c0cc6d37 From 5121831bd8c8c7c82d54bc222c68776232b7a17e Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 13:24:57 +0100 Subject: [PATCH 06/24] Move singleton to common utils Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- test/functional/tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index 5409fa9..de4305a 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 5409fa9a40de5c56eddf79742546f863c0cc6d37 +Subproject commit de4305af8c7f270cef906829c88a544ea7269062 diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index ab00408..d3435ce 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -32,7 +32,7 @@ from test_tools.mdadm import Mdadm from test_tools.fs_utils import remove from test_tools import initramfs from log.logger import create_log, Log -from test_utils.singleton import Singleton +from test_utils.common.singleton import Singleton from storage_devices.lvm import Lvm, LvmConfiguration From 0be330ac1d4e92c7d89a71160a51b7f68bec2bbf Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 13:39:16 +0100 Subject: [PATCH 07/24] Move checksec to scripts Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index de4305a..8a7e848 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit de4305af8c7f270cef906829c88a544ea7269062 +Subproject commit 8a7e848afc0056439d1bd62fae3a9f956d583b77 From cde7a3af16ad108da1a030a3cb75dd9de0aa0b2c Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 13:47:18 +0100 Subject: [PATCH 08/24] Move error device to storage devices Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- .../tests/fault_injection/test_cache_insert_error.py | 3 ++- .../tests/fault_injection/test_error_device_as_cache.py | 3 ++- .../tests/fault_injection/test_primary_device_error.py | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index 8a7e848..f60e901 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 8a7e848afc0056439d1bd62fae3a9f956d583b77 +Subproject commit f60e90192e61b2f4a9864283de76f31d7b397393 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 5a711cb..e86c2bc 100644 --- a/test/functional/tests/fault_injection/test_cache_insert_error.py +++ b/test/functional/tests/fault_injection/test_cache_insert_error.py @@ -16,7 +16,8 @@ from api.cas.cache_config import ( from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools.device_mapper import ErrorDevice, DmTable +from test_tools.device_mapper import DmTable +from storage_devices.error_device import ErrorDevice from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter, VerifyMethod from test_utils.os_utils import Udev 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 1f9695b..94bb683 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 @@ -9,7 +9,8 @@ from time import sleep from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter -from test_tools.device_mapper import ErrorDevice, DmTable +from test_tools.device_mapper import DmTable +from storage_devices.error_device import ErrorDevice from core.test_run import TestRun from api.cas import casadm from api.cas.cache_config import ( 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 b8842a9..4e7841b 100644 --- a/test/functional/tests/fault_injection/test_primary_device_error.py +++ b/test/functional/tests/fault_injection/test_primary_device_error.py @@ -7,7 +7,8 @@ import pytest from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter, VerifyMethod -from test_tools.device_mapper import ErrorDevice, DmTable +from test_tools.device_mapper import DmTable +from storage_devices.error_device import ErrorDevice from core.test_run import TestRun from api.cas import casadm from api.cas.cache_config import ( From 4dca1c3c00573390d6cf7463f3835aa66d686aa2 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 13:58:04 +0100 Subject: [PATCH 09/24] Move linux command and wait method to common tools Signed-off-by: Katarzyna Treder --- test/functional/api/cas/core.py | 3 ++- test/functional/api/cas/progress_bar.py | 2 +- test/functional/test-framework | 2 +- .../tests/lazy_writes/recovery/recovery_tests_methods.py | 7 ++++--- test/functional/tests/lazy_writes/test_wb_throttling.py | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py index 12396e1..baa263f 100644 --- a/test/functional/api/cas/core.py +++ b/test/functional/api/cas/core.py @@ -16,7 +16,8 @@ from api.cas.statistics import CoreStats, CoreIoClassStats from core.test_run_utils import TestRun from storage_devices.device import Device from test_tools import fs_utils, disk_utils -from test_utils.os_utils import wait, sync +from test_utils.os_utils import sync +from test_tools.common.wait import wait from types.size import Unit, Size diff --git a/test/functional/api/cas/progress_bar.py b/test/functional/api/cas/progress_bar.py index b2b9679..3b98b45 100644 --- a/test/functional/api/cas/progress_bar.py +++ b/test/functional/api/cas/progress_bar.py @@ -10,7 +10,7 @@ from datetime import timedelta import paramiko from core.test_run import TestRun -from test_utils.os_utils import wait +from test_tools.common.wait import wait def check_progress_bar(command: str, progress_bar_expected: bool = True): diff --git a/test/functional/test-framework b/test/functional/test-framework index f60e901..a954e47 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit f60e90192e61b2f4a9864283de76f31d7b397393 +Subproject commit a954e47b33de846810bb6d74d14bc3a3a23c1901 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 5d84531..6202d17 100644 --- a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py +++ b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py @@ -5,6 +5,7 @@ from datetime import timedelta +import test_tools.common.wait from core.test_run import TestRun from test_tools import fs_utils from test_tools.dd import Dd @@ -47,8 +48,8 @@ def power_cycle_dut(wait_for_flush_begin=False, core_device=None): raise Exception("Core device is None.") TestRun.LOGGER.info("Waiting for flushing to begin...") core_writes_before = core_device.get_io_stats().sectors_written - os_utils.wait(lambda: core_writes_before < core_device.get_io_stats().sectors_written, - timedelta(minutes=3), - timedelta(milliseconds=100)) + test_tools.common.wait.wait(lambda: core_writes_before < core_device.get_io_stats().sectors_written, + timedelta(minutes=3), + timedelta(milliseconds=100)) power_control = TestRun.plugin_manager.get_plugin('power_control') power_control.power_cycle() diff --git a/test/functional/tests/lazy_writes/test_wb_throttling.py b/test/functional/tests/lazy_writes/test_wb_throttling.py index afa0abc..b0b170a 100644 --- a/test/functional/tests/lazy_writes/test_wb_throttling.py +++ b/test/functional/tests/lazy_writes/test_wb_throttling.py @@ -17,8 +17,8 @@ from test_utils.os_utils import ( set_wbt_lat, get_wbt_lat, get_dut_cpu_number, - wait, ) +from test_tools.common.wait import wait from api.cas import casadm from api.cas.cache_config import ( CacheMode, From 0cc3b3270d5f16b02fa0dc4a1263d7e8b77645a6 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 14:06:08 +0100 Subject: [PATCH 10/24] Move dmesg to tools Signed-off-by: Katarzyna Treder --- test/functional/api/cas/dmesg.py | 2 +- test/functional/test-framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/api/cas/dmesg.py b/test/functional/api/cas/dmesg.py index 4ebb58e..6a7dff8 100644 --- a/test/functional/api/cas/dmesg.py +++ b/test/functional/api/cas/dmesg.py @@ -6,7 +6,7 @@ import re -from test_utils.dmesg import get_dmesg +from test_tools.dmesg import get_dmesg from types.size import Size, Unit diff --git a/test/functional/test-framework b/test/functional/test-framework index a954e47..7f5bbb5 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit a954e47b33de846810bb6d74d14bc3a3a23c1901 +Subproject commit 7f5bbb5240cc22ad5a50ad1231bc3ade34b26334 From 241a0c545aea38026b11af2db5c7e12dcee67c0e Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 14:25:27 +0100 Subject: [PATCH 11/24] Remove generator from test utils Signed-off-by: Katarzyna Treder --- test/functional/api/cas/ioclass_config.py | 6 +++--- test/functional/test-framework | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/functional/api/cas/ioclass_config.py b/test/functional/api/cas/ioclass_config.py index 32974db..e730998 100644 --- a/test/functional/api/cas/ioclass_config.py +++ b/test/functional/api/cas/ioclass_config.py @@ -16,7 +16,6 @@ from packaging import version from core.test_run import TestRun from test_tools import fs_utils from test_utils import os_utils -from test_utils.generator import random_string default_config_file_path = "/tmp/opencas_ioclass.conf" @@ -178,13 +177,14 @@ class IoClass: def add_random_params(rule: str): if rule == "directory": allowed_chars = string.ascii_letters + string.digits + "/" - rule += f":/{random_string(random.randint(1, 40), allowed_chars)}" + rule += f":/{''.join(random.choices(allowed_chars, k=random.randint(1, 40)))}" elif rule in ["file_size", "lba", "pid", "file_offset", "request_size", "wlth"]: rule += f":{Operator(random.randrange(len(Operator))).name}:{random.randrange(1000000)}" elif rule == "io_class": rule += f":{random.randrange(MAX_IO_CLASS_PRIORITY + 1)}" elif rule in ["extension", "process_name", "file_name_prefix"]: - rule += f":{random_string(random.randint(1, 10))}" + allowed_chars = string.ascii_letters + string.digits + rule += f":{''.join(random.choices(allowed_chars, k=random.randint(1, 10)))}" if random.randrange(2): rule += "&done" return rule diff --git a/test/functional/test-framework b/test/functional/test-framework index 7f5bbb5..2390e4c 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 7f5bbb5240cc22ad5a50ad1231bc3ade34b26334 +Subproject commit 2390e4c2af1e64ac2c28d1aa21be87ab84eba392 From 4e8ea659daf06f76bbc5e5ac8f7626223708e70f Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 14:28:35 +0100 Subject: [PATCH 12/24] Move fstab to tools Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- test/functional/tests/example/example_test.py | 2 +- test/functional/tests/initialize/test_startup_init_config.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index 2390e4c..324edb0 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 2390e4c2af1e64ac2c28d1aa21be87ab84eba392 +Subproject commit 324edb0eba157b21374ce730bfb6b85f78fd0126 diff --git a/test/functional/tests/example/example_test.py b/test/functional/tests/example/example_test.py index 89b7eab..5ff0fa4 100644 --- a/test/functional/tests/example/example_test.py +++ b/test/functional/tests/example/example_test.py @@ -20,7 +20,7 @@ from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File from types.size import Size, Unit from test_utils.emergency_escape import EmergencyEscape -from test_utils.fstab import add_mountpoint +from test_tools.fstab import add_mountpoint from storage_devices.lvm import Lvm diff --git a/test/functional/tests/initialize/test_startup_init_config.py b/test/functional/tests/initialize/test_startup_init_config.py index c72349d..67a29da 100644 --- a/test/functional/tests/initialize/test_startup_init_config.py +++ b/test/functional/tests/initialize/test_startup_init_config.py @@ -15,7 +15,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_utils.filesystem.file import File from test_tools.disk_utils import Filesystem -from test_utils import fstab +from test_tools import fstab from test_tools.dd import Dd from types.size import Unit, Size from test_utils.os_utils import sync, Udev From b724419a4fe0fee4170b65aa02f9e506fcdc3986 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 14:32:50 +0100 Subject: [PATCH 13/24] Move git to tools Signed-off-by: Katarzyna Treder --- test/functional/api/cas/installer.py | 3 ++- test/functional/api/cas/version.py | 4 ++-- test/functional/test-framework | 2 +- test/functional/tests/conftest.py | 3 +-- test/functional/tests/misc/test_files_permissions.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py index 4861286..638fc11 100644 --- a/test/functional/api/cas/installer.py +++ b/test/functional/api/cas/installer.py @@ -9,7 +9,8 @@ import os from core.test_run import TestRun from api.cas import cas_module from api.cas.version import get_installed_cas_version -from test_utils import os_utils, git +from test_utils import os_utils +from test_tools import git from connection.utils.output import CmdException diff --git a/test/functional/api/cas/version.py b/test/functional/api/cas/version.py index 1ce6583..116494c 100644 --- a/test/functional/api/cas/version.py +++ b/test/functional/api/cas/version.py @@ -6,7 +6,7 @@ import re -from test_utils import git +from test_tools import git from core.test_run import TestRun from connection.utils.output import CmdException @@ -43,7 +43,7 @@ class CasVersion: def get_available_cas_versions(): - release_tags = git.get_release_tags() + release_tags = git.get_tags() versions = [CasVersion.from_git_tag(tag) for tag in release_tags] diff --git a/test/functional/test-framework b/test/functional/test-framework index 324edb0..40f850c 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 324edb0eba157b21374ce730bfb6b85f78fd0126 +Subproject commit 40f850c1f9077039ec8f50f713bf75adfc9a0170 diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index d3435ce..49ccdb9 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -20,7 +20,6 @@ from core.test_run import Blocked from core.test_run_utils import TestRun from api.cas import installer from api.cas import casadm -from test_utils import git from api.cas.cas_service import opencas_drop_in_directory from storage_devices.raid import Raid from storage_devices.ramdisk import RamDisk @@ -30,7 +29,7 @@ from test_tools.disk_utils import PartitionTable, create_partition_table from test_tools.device_mapper import DeviceMapper from test_tools.mdadm import Mdadm from test_tools.fs_utils import remove -from test_tools import initramfs +from test_tools import initramfs, git from log.logger import create_log, Log from test_utils.common.singleton import Singleton from storage_devices.lvm import Lvm, LvmConfiguration diff --git a/test/functional/tests/misc/test_files_permissions.py b/test/functional/tests/misc/test_files_permissions.py index b96cf86..34c9a0e 100644 --- a/test/functional/tests/misc/test_files_permissions.py +++ b/test/functional/tests/misc/test_files_permissions.py @@ -7,7 +7,7 @@ import os -from test_utils.git import get_repo_files +from test_tools.git import get_repo_files from api.cas.installer import ( clean_opencas_repo, build_opencas, From c8ce05617d7d2095dbae6f5862be972f55207ae1 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 14:36:35 +0100 Subject: [PATCH 14/24] Move scsi_debug to tools Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- test/functional/tests/lazy_writes/test_lazy_writes_signals.py | 2 +- test/functional/tests/misc/test_flush_propagation.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index 40f850c..a6551b0 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 40f850c1f9077039ec8f50f713bf75adfc9a0170 +Subproject commit a6551b032a9f0abc2626c34a07ea42dc31508e66 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 e1a9048..569bd51 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_signals.py @@ -16,7 +16,7 @@ from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun 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_tools.scsi_debug import Logs, syslog_path from test_utils import os_utils from types.size import Size, Unit diff --git a/test/functional/tests/misc/test_flush_propagation.py b/test/functional/tests/misc/test_flush_propagation.py index 1926ffa..df2dc92 100644 --- a/test/functional/tests/misc/test_flush_propagation.py +++ b/test/functional/tests/misc/test_flush_propagation.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: BSD-3-Clause # -import re import pytest from time import sleep @@ -16,7 +15,7 @@ from api.cas.cache_config import ( from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun from test_tools.disk_utils import Filesystem -from test_utils.scsi_debug import Logs, syslog_path +from test_tools.scsi_debug import Logs, syslog_path from test_tools.fs_utils import create_random_test_file from test_utils import os_utils from types.size import Size, Unit From a11e3ca8904c481dfa764e87358abde0aee6ab7b Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 14:39:56 +0100 Subject: [PATCH 15/24] Remove kedr and kedr tests Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- test/functional/tests/stress/test_kedr.py | 291 ---------------------- 2 files changed, 1 insertion(+), 292 deletions(-) delete mode 100644 test/functional/tests/stress/test_kedr.py diff --git a/test/functional/test-framework b/test/functional/test-framework index a6551b0..a6848ed 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit a6551b032a9f0abc2626c34a07ea42dc31508e66 +Subproject commit a6848ed8254a7ef90f73be8eea0b62b8f96f15d3 diff --git a/test/functional/tests/stress/test_kedr.py b/test/functional/tests/stress/test_kedr.py deleted file mode 100644 index 89105ac..0000000 --- a/test/functional/tests/stress/test_kedr.py +++ /dev/null @@ -1,291 +0,0 @@ -# -# Copyright(c) 2020-2022 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# - -import pytest - -from datetime import timedelta - -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 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 -from test_tools.fio.fio_param import ReadWrite, IoEngine -from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan - -mountpoint = "/tmp/cas1-1" - -@pytest.fixture(scope="module") -def install_kedr(): - TestRun.LOGGER.info("Checking if kedr is installed") - if not Kedr.is_installed(): - TestRun.LOGGER.info("Installing kedr") - Kedr.install() - - -@pytest.fixture(scope="function") -def unload_modules(): - TestRun.LOGGER.info("Check if CAS is installed") - if installer.check_if_installed(): - TestRun.LOGGER.info("Unloading modules") - cas_module.unload_all_cas_modules() - - TestRun.LOGGER.info("Stop kedr if it is running") - if Kedr.is_loaded(): - Kedr.stop() - - TestRun.LOGGER.info("Mounting debugfs") - os_utils.mount_debugfs() - - -@pytest.mark.skip(reason="kedr not supported") -@pytest.mark.parametrize("module", cas_module.CasModule) -def test_kedr_memleak_load_cas_module(module, unload_modules, install_kedr): - """ - title: Loading modules with kedr started with 'memleak' configuration - description: Load and unload modules with kedr started to watch for memory leaks - pass_criteria: - - No memory leaks observed after loading and unloading module - """ - with TestRun.step(f"Starting kedr against {module}"): - Kedr.start(module.value) - - with TestRun.step(f"Loading {module}"): - os_utils.load_kernel_module(module.value) - - with TestRun.step(f"Unloading {module}"): - os_utils.unload_kernel_module(module.value, os_utils.ModuleRemoveMethod.modprobe) - - with TestRun.step(f"Checking for memory leaks for {module}"): - try: - Kedr.check_for_mem_leaks(module.value) - except Exception as e: - TestRun.LOGGER.error(f"{e}") - - with TestRun.step(f"Stopping kedr"): - Kedr.stop() - - -@pytest.mark.skip(reason="kedr not supported") -@pytest.mark.parametrize("module", cas_module.CasModule) -def test_kedr_fsim_load_cas_module(module, unload_modules, install_kedr): - """ - title: Loading modules with kedr started with 'fsim' configuration - description: Load and unload modules with kedr started to simulate kmalloc fails - pass_criteria: - - Module fails to load - """ - with TestRun.step(f"Starting kedr against {module}"): - Kedr.start(module.value, KedrProfile.FAULT_SIM) - - with TestRun.step("Setting up fault simulation parameters"): - Kedr.setup_fault_injections() - - with TestRun.step(f"Trying to load {module}"): - out = os_utils.load_kernel_module(module.value) - if out.exit_code == 0 \ - or "Cannot allocate memory" not in out.stderr: - TestRun.LOGGER.error(f"Loading module should fail because of alloc error, instead " - f"modprobe's output is: {out}") - - with TestRun.step(f"Stopping kedr"): - Kedr.stop() - - -@pytest.mark.skip(reason="kedr not supported") -@pytest.mark.parametrize("module", cas_module.CasModule) -@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) -@pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) -def test_kedr_start_cache(module, unload_modules, install_kedr): - """ - title: Start cache and add core with kedr started against one of CAS modules - description: | - Load CAS modules, start kedr against one of them, start cache and add core, - stop cache and unload modules - pass_criteria: - - No memory leaks observed - """ - with TestRun.step("Preparing cache device"): - cache_device = TestRun.disks['cache'] - cache_device.create_partitions([Size(500, Unit.MebiByte)]) - cache_part = cache_device.partitions[0] - - with TestRun.step("Preparing core device"): - core_device = TestRun.disks['core'] - core_device.create_partitions([Size(1, Unit.GibiByte)]) - core_part = core_device.partitions[0] - - with TestRun.step("Unload CAS modules if needed"): - if os_utils.is_kernel_module_loaded(module.value): - cas_module.unload_all_cas_modules() - - with TestRun.step(f"Starting kedr against {module.value}"): - Kedr.start(module.value) - - with TestRun.step(f"Loading CAS modules"): - os_utils.load_kernel_module(cas_module.CasModule.cache.value) - - with TestRun.step("Starting cache"): - cache = casadm.start_cache(cache_part, force=True) - - with TestRun.step("Adding core"): - cache.add_core(core_dev=core_part) - - with TestRun.step("Stopping cache"): - cache.stop() - - with TestRun.step(f"Unloading CAS modules"): - cas_module.unload_all_cas_modules() - - with TestRun.step(f"Checking for memory leaks for {module}"): - try: - Kedr.check_for_mem_leaks(module.value) - except Exception as e: - TestRun.LOGGER.error(f"{e}") - - with TestRun.step(f"Stopping kedr"): - Kedr.stop() - - -@pytest.mark.skip(reason="kedr not supported") -@pytest.mark.os_dependent -@pytest.mark.parametrize("module", cas_module.CasModule) -@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) -@pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) -def test_kedr_basic_io_raw(module, unload_modules, install_kedr): - """ - title: Basic IO test with kedr started with memory leaks profile - description: | - Load CAS modules, start kedr against one of them, start cache and add core, - run simple 4 minute random IO, stop cache and unload modules - pass_criteria: - - No memory leaks observed - """ - with TestRun.step("Preparing cache device"): - cache_device = TestRun.disks['cache'] - cache_device.create_partitions([Size(500, Unit.MebiByte)]) - cache_part = cache_device.partitions[0] - - with TestRun.step("Preparing core device"): - core_device = TestRun.disks['core'] - core_device.create_partitions([Size(1, Unit.GibiByte)]) - core_part = core_device.partitions[0] - - with TestRun.step("Unload CAS modules if needed"): - if os_utils.is_kernel_module_loaded(module.value): - cas_module.unload_all_cas_modules() - - with TestRun.step(f"Starting kedr against {module.value}"): - Kedr.start(module.value) - - with TestRun.step(f"Loading CAS modules"): - os_utils.load_kernel_module(cas_module.CasModule.cache.value) - - with TestRun.step("Starting cache"): - cache = casadm.start_cache(cache_part, force=True) - - with TestRun.step("Adding core"): - core = cache.add_core(core_dev=core_part) - - with TestRun.step(f"Running IO"): - (Fio().create_command() - .io_engine(IoEngine.libaio) - .run_time(timedelta(minutes=4)) - .time_based() - .read_write(ReadWrite.randrw) - .target(f"{core.path}") - .direct() - ).run() - - with TestRun.step("Stopping cache"): - cache.stop() - - with TestRun.step(f"Unloading CAS modules"): - cas_module.unload_all_cas_modules() - - with TestRun.step(f"Checking for memory leaks for {module.value}"): - try: - Kedr.check_for_mem_leaks(module.value) - except Exception as e: - TestRun.LOGGER.error(f"{e}") - - with TestRun.step(f"Stopping kedr"): - Kedr.stop() - - -@pytest.mark.skip(reason="kedr not supported") -@pytest.mark.os_dependent -@pytest.mark.parametrize("module", cas_module.CasModule) -@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) -@pytest.mark.require_disk("core", DiskTypeLowerThan("cache")) -def test_kedr_basic_io_fs(module, unload_modules, install_kedr): - """ - title: Basic IO test on core with ext4 filesystem with kedr started with memory leaks profile - description: | - Load CAS modules, start kedr against one of them, create filesystem on core, start cache - and add core, run simple random IO, stop cache and unload modules - pass_criteria: - - No memory leaks observed - """ - with TestRun.step("Preparing cache device"): - cache_device = TestRun.disks['cache'] - cache_device.create_partitions([Size(500, Unit.MebiByte)]) - cache_part = cache_device.partitions[0] - - with TestRun.step("Preparing core device (creating partition, " - "filesystem and mounting core)"): - core_device = TestRun.disks['core'] - core_device.create_partitions([Size(1, Unit.GibiByte)]) - core_part = core_device.partitions[0] - core_part.create_filesystem(Filesystem.ext4) - sync() - - with TestRun.step("Unload CAS modules if needed"): - if os_utils.is_kernel_module_loaded(module.value): - cas_module.unload_all_cas_modules() - - with TestRun.step(f"Starting kedr against {module.value}"): - Kedr.start(module.value) - - with TestRun.step(f"Loading CAS modules"): - os_utils.load_kernel_module(cas_module.CasModule.cache.value) - - with TestRun.step("Starting cache"): - cache = casadm.start_cache(cache_part, force=True) - - with TestRun.step("Adding core"): - core = cache.add_core(core_part) - - with TestRun.step("Mounting core"): - core.mount(mountpoint) - - with TestRun.step(f"Running IO"): - (Fio().create_command() - .io_engine(IoEngine.libaio) - .size(cache.size * 2) - .read_write(ReadWrite.randrw) - .target(f"{core.mount_point}/test_file") - ).run() - - with TestRun.step("Unmounting core"): - core.unmount() - - with TestRun.step("Stopping cache"): - cache.stop() - - with TestRun.step(f"Unloading CAS modules"): - cas_module.unload_all_cas_modules() - - with TestRun.step(f"Checking for memory leaks for {module.value}"): - try: - Kedr.check_for_mem_leaks(module.value) - except Exception as e: - TestRun.LOGGER.error(f"{e}") - - with TestRun.step(f"Stopping kedr"): - Kedr.stop() From 3e67a8c0f5e9b82759fc6a29566e86e3c87432d9 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 14:46:53 +0100 Subject: [PATCH 16/24] Rename systemd to systemctl and move it to tools Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cas_service.py | 2 +- test/functional/test-framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/api/cas/cas_service.py b/test/functional/api/cas/cas_service.py index 6984c80..ea18a5d 100644 --- a/test/functional/api/cas/cas_service.py +++ b/test/functional/api/cas/cas_service.py @@ -15,7 +15,7 @@ from test_tools.fs_utils import ( write_file, remove, ) -from test_utils.systemd import reload_daemon +from test_tools.systemctl import reload_daemon opencas_drop_in_directory = Path("/etc/systemd/system/open-cas.service.d/") test_drop_in_file = Path("10-modified-timeout.conf") diff --git a/test/functional/test-framework b/test/functional/test-framework index a6848ed..ae9b036 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit a6848ed8254a7ef90f73be8eea0b62b8f96f15d3 +Subproject commit ae9b036b4716934406a01f62277558f86a40bf46 From 8a5d531a32501630f57b532e9e790a74aa34810a Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Wed, 11 Dec 2024 07:58:50 +0100 Subject: [PATCH 17/24] OS tools refactor Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache.py | 2 +- test/functional/api/cas/cache_config.py | 2 +- test/functional/api/cas/cas_module.py | 9 ++-- test/functional/api/cas/casadm.py | 2 +- test/functional/api/cas/core.py | 2 +- test/functional/api/cas/installer.py | 3 +- test/functional/api/cas/ioclass_config.py | 4 +- test/functional/test-framework | 2 +- .../test_cleaning_policy_operation.py | 2 +- .../test_dynamic_cache_mode_switching.py | 3 +- .../cache_ops/test_multistream_seq_cutoff.py | 2 +- .../tests/cache_ops/test_seq_cutoff.py | 3 +- .../functional/tests/ci/test_ci_read_write.py | 2 +- .../tests/cli/test_cas_memory_usage.py | 6 +-- .../tests/cli/test_cleaning_policy.py | 2 +- test/functional/tests/cli/test_cli_script.py | 2 +- test/functional/tests/cli/test_cli_standby.py | 2 +- .../tests/cli/test_manual_casadm_flush.py | 2 +- test/functional/tests/conftest.py | 3 +- .../data_integrity/test_data_integrity_5d.py | 2 +- .../test_cache_activation_perf.py | 2 +- .../test_failover_multihost.py | 4 +- .../test_cache_insert_error.py | 2 +- .../test_fault_injection_interrupts.py | 24 +++++----- .../test_fault_injection_many_to_one.py | 2 +- .../test_fault_injection_opencas_load.py | 4 +- .../test_fault_injection_standby.py | 2 +- .../test_max_io_greater_in_core.py | 2 +- .../test_primary_device_error.py | 2 +- ...t_standby_activate_different_cache_path.py | 2 +- .../incremental_load/test_incremental_load.py | 3 +- .../tests/initialize/test_clean_reboot.py | 2 +- .../initialize/test_initialize_runlevel.py | 14 +++--- .../initialize/test_initialize_status.py | 4 +- .../tests/initialize/test_recovery.py | 2 +- .../initialize/test_startup_init_config.py | 3 +- test/functional/tests/io/test_io_engines.py | 2 +- test/functional/tests/io/test_write_fetch.py | 2 +- test/functional/tests/io/trim/test_trim.py | 16 +++---- .../tests/io_class/io_class_common.py | 5 ++- .../tests/io_class/test_io_class_core_id.py | 3 +- .../tests/io_class/test_io_class_directory.py | 3 +- ...st_io_class_eviction_pinned_after_unpin.py | 3 +- .../tests/io_class/test_io_class_file.py | 2 +- .../tests/io_class/test_io_class_occupancy.py | 3 +- .../io_class/test_io_class_occupancy_load.py | 3 +- .../test_io_class_occupancy_repart.py | 3 +- .../test_io_class_occupancy_resize.py | 3 +- .../tests/io_class/test_io_class_process.py | 3 +- .../tests/io_class/test_io_class_purge.py | 3 +- .../io_class/test_io_class_service_support.py | 14 +++--- .../test_io_class_stats_file_size_core.py | 2 +- .../tests/io_class/test_io_class_wlth.py | 3 +- .../tests/io_class/test_io_classification.py | 3 +- .../lazy_writes/cleaning_policy/test_acp.py | 2 +- .../lazy_writes/cleaning_policy/test_alru.py | 3 +- .../cleaning_policy/test_cleaning_params.py | 2 +- .../recovery/recovery_tests_methods.py | 1 - .../recovery/test_recovery_all_options.py | 9 ++-- .../recovery/test_recovery_flush_reset.py | 8 ++-- .../tests/lazy_writes/test_clean_load.py | 2 +- .../lazy_writes/test_flush_huge_dirty_data.py | 3 +- .../lazy_writes/test_lazy_writes_clean.py | 3 +- .../lazy_writes/test_lazy_writes_signals.py | 44 +++++++++---------- .../tests/lazy_writes/test_wb_throttling.py | 8 +--- .../memory/test_check_number_of_processes.py | 2 +- .../test_memory_metadata_consumption.py | 5 ++- .../tests/misc/test_flush_propagation.py | 10 ++--- .../tests/performance/test_100p_hits.py | 3 +- .../performance/test_performance_reads.py | 2 +- .../performance/test_performance_write.py | 2 +- .../test_fuzzy_add_core_cache_id.py | 2 +- .../test_fuzzy_add_core_core_id.py | 2 +- .../test_fuzzy_add_core_device.py | 2 +- ..._fuzzy_script_add_core_try_add_cache_id.py | 2 +- ...t_fuzzy_script_add_core_try_add_core_id.py | 2 +- ...st_fuzzy_script_add_core_try_add_device.py | 2 +- .../test_fuzzy_start_cache_flags.py | 2 +- .../test_fuzzy_remove_core_cache_id.py | 2 +- .../test_fuzzy_remove_core_core_id.py | 2 +- .../test_fuzzy_remove_core_flag.py | 2 +- .../test_fuzzy_remove_inactive_cache_id.py | 2 +- .../test_fuzzy_remove_inactive_core_id.py | 2 +- .../test_fuzzy_stop_cache_cache_id.py | 2 +- .../test_fuzzy_stop_cache_flag.py | 2 +- .../tests/security/test_security_user.py | 2 +- .../tests/stats/test_block_stats.py | 2 +- .../tests/stats/test_ioclass_stats.py | 4 +- test/functional/tests/stats/test_stat_max.py | 2 +- .../tests/stats/test_statistics_integrity.py | 2 +- .../test_stress_cleaning_policy_change.py | 2 +- test/functional/tests/volumes/common.py | 2 +- 92 files changed, 187 insertions(+), 173 deletions(-) diff --git a/test/functional/api/cas/cache.py b/test/functional/api/cas/cache.py index fe1e667..fde0c23 100644 --- a/test/functional/api/cas/cache.py +++ b/test/functional/api/cas/cache.py @@ -8,7 +8,7 @@ from api.cas.casadm_parser import * from api.cas.core import Core from api.cas.dmesg import get_metadata_size_on_device from api.cas.statistics import CacheStats, CacheIoClassStats -from test_utils.os_utils import * +from test_tools.os_tools import * from connection.utils.output import Output diff --git a/test/functional/api/cas/cache_config.py b/test/functional/api/cas/cache_config.py index dcd04c5..602626a 100644 --- a/test/functional/api/cas/cache_config.py +++ b/test/functional/api/cas/cache_config.py @@ -6,7 +6,7 @@ from enum import Enum, IntFlag -from test_utils.os_utils import get_kernel_module_parameter +from test_tools.os_tools import get_kernel_module_parameter from types.size import Size, Unit from types.time import Time diff --git a/test/functional/api/cas/cas_module.py b/test/functional/api/cas/cas_module.py index e843a48..f6f89d7 100644 --- a/test/functional/api/cas/cas_module.py +++ b/test/functional/api/cas/cas_module.py @@ -6,8 +6,7 @@ from enum import Enum from core.test_run import TestRun -from test_utils import os_utils -from test_utils.os_utils import ModuleRemoveMethod +from test_tools import os_tools class CasModule(Enum): @@ -15,12 +14,12 @@ class CasModule(Enum): def reload_all_cas_modules(): - os_utils.unload_kernel_module(CasModule.cache.value, ModuleRemoveMethod.modprobe) - os_utils.load_kernel_module(CasModule.cache.value) + os_tools.unload_kernel_module(CasModule.cache.value) + os_tools.load_kernel_module(CasModule.cache.value) def unload_all_cas_modules(): - os_utils.unload_kernel_module(CasModule.cache.value, os_utils.ModuleRemoveMethod.rmmod) + os_tools.unload_kernel_module(CasModule.cache.value) def is_cas_management_dev_present(): diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py index f1270b8..b7d2a31 100644 --- a/test/functional/api/cas/casadm.py +++ b/test/functional/api/cas/casadm.py @@ -20,7 +20,7 @@ from api.cas.cli import * from api.cas.core import Core from core.test_run import TestRun from storage_devices.device import Device -from test_utils.os_utils import reload_kernel_module +from test_tools.os_tools import reload_kernel_module from connection.utils.output import CmdException, Output from types.size import Size, Unit diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py index baa263f..47c0e48 100644 --- a/test/functional/api/cas/core.py +++ b/test/functional/api/cas/core.py @@ -16,7 +16,7 @@ from api.cas.statistics import CoreStats, CoreIoClassStats from core.test_run_utils import TestRun from storage_devices.device import Device from test_tools import fs_utils, disk_utils -from test_utils.os_utils import sync +from test_tools.os_tools import sync from test_tools.common.wait import wait from types.size import Unit, Size diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py index 638fc11..d4afa45 100644 --- a/test/functional/api/cas/installer.py +++ b/test/functional/api/cas/installer.py @@ -9,8 +9,7 @@ import os from core.test_run import TestRun from api.cas import cas_module from api.cas.version import get_installed_cas_version -from test_utils import os_utils -from test_tools import git +from test_tools import git, os_tools from connection.utils.output import CmdException diff --git a/test/functional/api/cas/ioclass_config.py b/test/functional/api/cas/ioclass_config.py index e730998..0613b93 100644 --- a/test/functional/api/cas/ioclass_config.py +++ b/test/functional/api/cas/ioclass_config.py @@ -15,7 +15,7 @@ from packaging import version from core.test_run import TestRun from test_tools import fs_utils -from test_utils import os_utils +from test_tools.os_tools import get_kernel_version default_config_file_path = "/tmp/opencas_ioclass.conf" @@ -166,7 +166,7 @@ class IoClass: "file_offset", "request_size", ] - if os_utils.get_kernel_version() >= version.Version("4.13"): + if get_kernel_version() >= version.Version("4.13"): rules.append("wlth") rule = random.choice(rules) diff --git a/test/functional/test-framework b/test/functional/test-framework index ae9b036..7512420 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit ae9b036b4716934406a01f62277558f86a40bf46 +Subproject commit 7512420e2adbecf2a83847f963f61326d17c77fc 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 365e481..b40b977 100644 --- a/test/functional/tests/cache_ops/test_cleaning_policy_operation.py +++ b/test/functional/tests/cache_ops/test_cleaning_policy_operation.py @@ -18,7 +18,7 @@ from api.cas.cache_config import ( from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from types.size import Size, Unit -from test_utils.os_utils import Udev +from test_tools.udev import Udev from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine diff --git a/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py b/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py index 3fc4245..9a6f4db 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 @@ -15,7 +15,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod -from test_utils.os_utils import Udev, sync +from test_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Size, Unit io_size = Size(10000, Unit.Blocks4096) 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 0604981..cfc9741 100644 --- a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py @@ -24,7 +24,7 @@ from test_tools.dd import Dd 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 Udev +from test_tools.udev import Udev from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/cache_ops/test_seq_cutoff.py b/test/functional/tests/cache_ops/test_seq_cutoff.py index f527204..90bea73 100644 --- a/test/functional/tests/cache_ops/test_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_seq_cutoff.py @@ -15,7 +15,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, CpusAllowedPolicy -from test_utils.os_utils import Udev, sync, get_dut_cpu_physical_cores +from test_tools.os_tools import sync, get_dut_cpu_physical_cores +from test_tools.udev import Udev from types.size import Size, Unit diff --git a/test/functional/tests/ci/test_ci_read_write.py b/test/functional/tests/ci/test_ci_read_write.py index 4f4ee81..ec05540 100644 --- a/test/functional/tests/ci/test_ci_read_write.py +++ b/test/functional/tests/ci/test_ci_read_write.py @@ -9,7 +9,7 @@ from api.cas import casadm 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_tools.udev import Udev 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 2338366..bb33b62 100644 --- a/test/functional/tests/cli/test_cas_memory_usage.py +++ b/test/functional/tests/cli/test_cas_memory_usage.py @@ -9,14 +9,12 @@ import pytest from api.cas.cas_module import CasModule from core.test_run import TestRun from types.size import Unit -from test_utils.os_utils import (allocate_memory, - disable_memory_affecting_functions, - drop_caches, - get_mem_free, +from test_tools.os_tools import (drop_caches, is_kernel_module_loaded, load_kernel_module, unload_kernel_module, ) +from test_tools.memory import disable_memory_affecting_functions, get_mem_free, allocate_memory @pytest.mark.os_dependent diff --git a/test/functional/tests/cli/test_cleaning_policy.py b/test/functional/tests/cli/test_cleaning_policy.py index c8f00aa..8d065f1 100644 --- a/test/functional/tests/cli/test_cleaning_policy.py +++ b/test/functional/tests/cli/test_cleaning_policy.py @@ -15,7 +15,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from api.cas import casadm from api.cas.cache_config import CacheMode, CleaningPolicy -from test_utils.os_utils import Udev +from test_tools.udev import Udev @pytest.mark.CI diff --git a/test/functional/tests/cli/test_cli_script.py b/test/functional/tests/cli/test_cli_script.py index 35972b0..9334b69 100644 --- a/test/functional/tests/cli/test_cli_script.py +++ b/test/functional/tests/cli/test_cli_script.py @@ -8,7 +8,7 @@ import pytest from api.cas import casadm from core.test_run import TestRun -from test_utils.os_utils import sync +from test_tools.os_tools import sync from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan 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 800063b..7f6ed15 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/test/functional/tests/cli/test_cli_standby.py @@ -15,7 +15,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File -from test_utils.os_utils import sync +from test_tools.os_tools import sync from connection.utils.output import CmdException from types.size import Size, Unit from api.cas.cli_messages import ( diff --git a/test/functional/tests/cli/test_manual_casadm_flush.py b/test/functional/tests/cli/test_manual_casadm_flush.py index 2369127..e759c9c 100644 --- a/test/functional/tests/cli/test_manual_casadm_flush.py +++ b/test/functional/tests/cli/test_manual_casadm_flush.py @@ -15,7 +15,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from api.cas import casadm from api.cas.cache_config import CacheMode, CleaningPolicy -from test_utils.os_utils import Udev +from test_tools.udev import Udev @pytest.mark.CI diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index 49ccdb9..b5f7efd 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -23,7 +23,8 @@ from api.cas import casadm from api.cas.cas_service import opencas_drop_in_directory from storage_devices.raid import Raid from storage_devices.ramdisk import RamDisk -from test_utils.os_utils import Udev, kill_all_io +from test_tools.os_tools import kill_all_io +from test_tools.udev import Udev from test_utils.disk_finder import get_disk_serial_number from test_tools.disk_utils import PartitionTable, create_partition_table from test_tools.device_mapper import DeviceMapper 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 6d0e974..5e8062a 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_5d.py +++ b/test/functional/tests/data_integrity/test_data_integrity_5d.py @@ -18,7 +18,7 @@ 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.filesystem.file import File -from test_utils.os_utils import sync +from test_tools.os_tools import sync from types.size import Unit, Size 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 c853eb7..e97b3f9 100644 --- a/test/functional/tests/failover_standby/test_cache_activation_perf.py +++ b/test/functional/tests/failover_standby/test_cache_activation_perf.py @@ -10,7 +10,7 @@ from core.test_run import TestRun from test_tools.dd import Dd from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from test_utils.os_utils import Udev +from test_tools.udev import Udev from types.size import Size, Unit from storage_devices.disk import DiskType, DiskTypeSet from storage_devices.device import Device diff --git a/test/functional/tests/failover_standby/test_failover_multihost.py b/test/functional/tests/failover_standby/test_failover_multihost.py index 14a3b2b..1d65b1f 100644 --- a/test/functional/tests/failover_standby/test_failover_multihost.py +++ b/test/functional/tests/failover_standby/test_failover_multihost.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: BSD-3-Clause # -from time import sleep import pytest from api.cas import casadm @@ -27,7 +26,8 @@ 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_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Size, Unit from test_tools import fs_utils 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 e86c2bc..f2a1513 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 DmTable from storage_devices.error_device import ErrorDevice from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter, VerifyMethod -from test_utils.os_utils import Udev +from test_tools.udev import Udev from types.size import Size, Unit start_size = Size(512, Unit.Byte) 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 c5375fa..fa23cfa 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_interrupts.py +++ b/test/functional/tests/fault_injection/test_fault_injection_interrupts.py @@ -14,8 +14,8 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.dd import Dd from test_tools.disk_utils import Filesystem -from test_utils import os_utils -from test_utils.os_utils import Udev, DropCachesMode +from test_tools.os_tools import DropCachesMode, sync, drop_caches +from test_tools.udev import Udev from types.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import compare_files @@ -65,8 +65,8 @@ def test_interrupt_core_flush(cache_mode, filesystem): test_file_md5sum_before = test_file.md5sum() with TestRun.step("Get number of dirty data on exported object before interruption."): - os_utils.sync() - os_utils.drop_caches(DropCachesMode.ALL) + sync() + drop_caches(DropCachesMode.ALL) core_dirty_blocks_before = core.get_dirty_blocks() with TestRun.step("Start flushing core device."): @@ -149,8 +149,8 @@ def test_interrupt_cache_flush(cache_mode, filesystem): test_file_md5sum_before = test_file.md5sum() with TestRun.step("Get number of dirty data on exported object before interruption."): - os_utils.sync() - os_utils.drop_caches(DropCachesMode.ALL) + sync() + drop_caches(DropCachesMode.ALL) cache_dirty_blocks_before = cache.get_dirty_blocks() with TestRun.step("Start flushing cache."): @@ -238,8 +238,8 @@ def test_interrupt_core_remove(cache_mode, filesystem): with TestRun.step( "Get number of dirty data on exported object before core removal interruption" ): - os_utils.sync() - os_utils.drop_caches(DropCachesMode.ALL) + sync() + drop_caches(DropCachesMode.ALL) cache_dirty_blocks_before = cache.get_dirty_blocks() with TestRun.step("Unmount core"): @@ -358,8 +358,8 @@ def test_interrupt_cache_mode_switch_parametrized(cache_mode, stop_percentage): dd.run() with TestRun.step("Get number of dirty data on exported object before interruption"): - os_utils.sync() - os_utils.drop_caches(DropCachesMode.ALL) + sync() + drop_caches(DropCachesMode.ALL) cache_dirty_blocks_before = cache.get_dirty_blocks() with TestRun.step("Start switching cache mode"): @@ -450,8 +450,8 @@ def test_interrupt_cache_stop(cache_mode, filesystem): test_file = create_test_file() with TestRun.step("Get number of dirty data on exported object before interruption."): - os_utils.sync() - os_utils.drop_caches(DropCachesMode.ALL) + sync() + drop_caches(DropCachesMode.ALL) cache_dirty_blocks_before = cache.get_dirty_blocks() with TestRun.step("Unmount core."): 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 b5ad1a7..fc18253 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,7 +12,7 @@ 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 +from test_tools.udev 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 b6dffe1..7e0617c 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 @@ -5,13 +5,13 @@ import pytest +import test_tools.udev from api.cas import casadm, casadm_parser, cli, cli_messages from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait from tests.lazy_writes.recovery.recovery_tests_methods import copy_file, compare_files from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils -from test_utils import os_utils from types.size import Size, Unit mount_point = "/mnt/cas" @@ -99,5 +99,5 @@ def prepare(): core_dev = TestRun.disks['core'] core_dev.create_partitions([Size(2, Unit.GibiByte)]) core_part = core_dev.partitions[0] - os_utils.Udev.disable() + test_tools.udev.Udev.disable() return cache_part, core_part 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 15a0f98..8f6f3f8 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_standby.py +++ b/test/functional/tests/fault_injection/test_fault_injection_standby.py @@ -15,7 +15,7 @@ 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 test_tools.dd import Dd -from test_utils.os_utils import sync +from test_tools.os_tools import sync from test_utils.filesystem.file import File 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 98b0b06..b1b4b2b 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 @@ -9,7 +9,7 @@ from api.cas.cache_config import CacheMode, CacheLineSize 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_tools.udev import Udev from types.size import Size, Unit 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 4e7841b..7856dce 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 ( CleaningPolicy, ) from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_utils.os_utils import Udev +from test_tools.udev import Udev from types.size import Size, Unit 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 74dfef1..03abcd8 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 @@ -16,7 +16,7 @@ from api.cas.cache_config import CacheLineSize from api.cas.cache import CacheStatus from test_tools.dd import Dd from test_tools.fs_utils import check_if_symlink_exists -from test_utils.os_utils import sync +from test_tools.os_tools import sync @pytest.mark.CI diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index a77b16c..1ba3a0e 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -29,7 +29,8 @@ 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.filesystem.file import File -from test_utils.os_utils import Udev, sync +from test_tools.os_tools import sync +from test_tools.udev import Udev from connection.utils.output import CmdException from types.size import Size, Unit from types.time import Time diff --git a/test/functional/tests/initialize/test_clean_reboot.py b/test/functional/tests/initialize/test_clean_reboot.py index eac621f..6383b0c 100644 --- a/test/functional/tests/initialize/test_clean_reboot.py +++ b/test/functional/tests/initialize/test_clean_reboot.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File -from test_utils.os_utils import drop_caches, DropCachesMode, sync +from test_tools.os_tools import drop_caches, DropCachesMode, sync from types.size import Size, Unit diff --git a/test/functional/tests/initialize/test_initialize_runlevel.py b/test/functional/tests/initialize/test_initialize_runlevel.py index 1c36db8..566b385 100644 --- a/test/functional/tests/initialize/test_initialize_runlevel.py +++ b/test/functional/tests/initialize/test_initialize_runlevel.py @@ -6,6 +6,8 @@ import os import pytest import time + +import test_tools.runlevel from api.cas import casadm, casadm_parser from api.cas.cache_config import CacheMode from api.cas.init_config import InitConfig @@ -14,8 +16,8 @@ from storage_devices.disk import DiskTypeLowerThan, DiskTypeSet, DiskType 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 import os_utils -from test_utils.os_utils import Runlevel +from test_tools.os_tools import sync, drop_caches +from test_tools.runlevel import Runlevel from types.size import Size, Unit @@ -36,7 +38,7 @@ def test_init_reboot_runlevels(runlevel, cache_mode): - Cache should be loaded successfully after reboot. """ with TestRun.step(f"Set runlevel to {runlevel.value}."): - os_utils.change_runlevel(runlevel) + test_tools.runlevel.change_runlevel(runlevel) with TestRun.step("Prepare CAS device."): cache_disk = TestRun.disks['cache'] @@ -65,8 +67,8 @@ def test_init_reboot_runlevels(runlevel, cache_mode): .file_size(Size(30, Unit.GibiByte)) fio.run_in_background() - os_utils.sync() - os_utils.drop_caches() + sync() + drop_caches() time.sleep(10) TestRun.executor.run_expect_success("pgrep fio") @@ -86,5 +88,5 @@ def test_init_reboot_runlevels(runlevel, cache_mode): with TestRun.step("Stop cache and set default runlevel."): if len(caches) != 0: casadm.stop_all_caches() - os_utils.change_runlevel(Runlevel.runlevel3) + test_tools.runlevel.change_runlevel(Runlevel.runlevel3) TestRun.executor.reboot() diff --git a/test/functional/tests/initialize/test_initialize_status.py b/test/functional/tests/initialize/test_initialize_status.py index 7f24192..4233484 100644 --- a/test/functional/tests/initialize/test_initialize_status.py +++ b/test/functional/tests/initialize/test_initialize_status.py @@ -10,7 +10,7 @@ import pytest from api.cas import cas_module, casctl from api.cas.cas_module import CasModule from core.test_run import TestRun -from test_utils import os_utils +from test_tools.os_tools import load_kernel_module @pytest.mark.os_dependent @@ -46,5 +46,5 @@ def test_init_status(): TestRun.fail("CAS management device is present in OS when CAS module is not loaded.") with TestRun.step("Load CAS modules and start CAS service"): - os_utils.load_kernel_module(CasModule.cache.value) + load_kernel_module(CasModule.cache.value) casctl.start() diff --git a/test/functional/tests/initialize/test_recovery.py b/test/functional/tests/initialize/test_recovery.py index 26b4a57..80a61a3 100644 --- a/test/functional/tests/initialize/test_recovery.py +++ b/test/functional/tests/initialize/test_recovery.py @@ -17,7 +17,7 @@ from test_tools.dd import Dd 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_tools.os_tools import sync from types.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/initialize/test_startup_init_config.py b/test/functional/tests/initialize/test_startup_init_config.py index 67a29da..82a2e1e 100644 --- a/test/functional/tests/initialize/test_startup_init_config.py +++ b/test/functional/tests/initialize/test_startup_init_config.py @@ -18,7 +18,8 @@ from test_tools.disk_utils import Filesystem from test_tools import fstab from test_tools.dd import Dd from types.size import Unit, Size -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import 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 c1d3690..f4b0512 100644 --- a/test/functional/tests/io/test_io_engines.py +++ b/test/functional/tests/io/test_io_engines.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan 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_tools.os_tools import get_dut_cpu_physical_cores from types.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/io/test_write_fetch.py b/test/functional/tests/io/test_write_fetch.py index deb8ddd..456149f 100644 --- a/test/functional/tests/io/test_write_fetch.py +++ b/test/functional/tests/io/test_write_fetch.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskTypeSet, DiskTypeLowerThan, DiskType 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_tools.udev import Udev from types.size import Size, Unit diff --git a/test/functional/tests/io/trim/test_trim.py b/test/functional/tests/io/trim/test_trim.py index b37c04b..e2674a7 100644 --- a/test/functional/tests/io/trim/test_trim.py +++ b/test/functional/tests/io/trim/test_trim.py @@ -3,12 +3,13 @@ # Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # -import os import posixpath import time import pytest +from test_tools.os_tools import sync, drop_caches +from test_tools.udev import Udev from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy from core.test_run import TestRun @@ -18,7 +19,6 @@ from test_tools.blktrace import BlkTrace, BlkTraceMask, RwbsKind from test_tools.disk_utils import Filesystem, check_if_device_supports_trim from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from test_utils import os_utils from types.size import Size, Unit from api.cas.dmesg import get_metadata_size_on_device @@ -129,7 +129,7 @@ def test_trim_propagation(): raise Exception("Core device doesn't support discards") with TestRun.step(f"Disable udev"): - os_utils.Udev.disable() + Udev.disable() with TestRun.step(f"Prepare cache instance in WB with one core"): cache = casadm.start_cache(cache_dev, CacheMode.WB, force=True) @@ -161,7 +161,7 @@ def test_trim_propagation(): with TestRun.step("Power cycle"): power_control = TestRun.plugin_manager.get_plugin("power_control") power_control.power_cycle() - os_utils.Udev.disable() + Udev.disable() with TestRun.step("Load cache"): cache = casadm.start_cache(cache_dev, load=True) @@ -246,8 +246,8 @@ def test_trim_device_discard_support( with TestRun.step("Remove file."): test_file.remove() - os_utils.sync() - os_utils.drop_caches() + sync() + drop_caches() time.sleep(5) with TestRun.step("Ensure that discards were detected by blktrace on proper devices."): @@ -315,8 +315,8 @@ def compare_properties(value, expected_value, property_name): def stop_monitoring_and_check_discards(blktraces, discard_support): time.sleep(60) - os_utils.sync() - os_utils.drop_caches() + sync() + drop_caches() time.sleep(5) discard_flag = RwbsKind.D # Discard diff --git a/test/functional/tests/io_class/io_class_common.py b/test/functional/tests/io_class/io_class_common.py index 23256bb..373b826 100644 --- a/test/functional/tests/io_class/io_class_common.py +++ b/test/functional/tests/io_class/io_class_common.py @@ -16,8 +16,9 @@ from core.test_run import TestRun from test_tools.dd import Dd from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from test_utils.os_utils import Udev, sync -from test_utils.os_utils import drop_caches, DropCachesMode +from test_tools.os_tools import sync +from test_tools.udev import Udev +from test_tools.os_tools import drop_caches, DropCachesMode from types.size import Size, Unit ioclass_config_path = "/etc/opencas/ioclass.conf" 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 842f556..7cc60aa 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 @@ -10,7 +10,8 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd -from test_utils.os_utils import sync, Udev, drop_caches +from test_tools.os_tools import sync, drop_caches +from test_tools.udev import Udev from types.size import Unit, Size dd_bs = Size(1, Unit.Blocks4096) 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 9a9b0c9..7e506d9 100644 --- a/test/functional/tests/io_class/test_io_class_directory.py +++ b/test/functional/tests/io_class/test_io_class_directory.py @@ -17,7 +17,8 @@ from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File -from test_utils.os_utils import drop_caches, DropCachesMode, sync, Udev +from test_tools.os_tools import drop_caches, DropCachesMode, sync +from test_tools.udev import Udev from types.size import Size, Unit from tests.io_class.io_class_common import mountpoint, prepare, ioclass_config_path 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 2574680..e75fd3b 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 @@ -12,7 +12,8 @@ from core.test_run import TestRun from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from .io_class_common import ioclass_config, get_io_class_occupancy, run_io_dir from api.cas import casadm -from test_utils.os_utils import sync, Udev, drop_caches +from test_tools.os_tools import sync, drop_caches +from test_tools.udev import Udev from types.size import Unit, Size 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 fce1f6e..1cc7002 100644 --- a/test/functional/tests/io_class/test_io_class_file.py +++ b/test/functional/tests/io_class/test_io_class_file.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File -from test_utils.os_utils import sync, DropCachesMode, drop_caches +from test_tools.os_tools import sync, DropCachesMode, drop_caches from types.size import Size, Unit from tests.io_class.io_class_common import mountpoint, prepare, ioclass_config_path 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 c2fad88..dd65cf7 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/test/functional/tests/io_class/test_io_class_occupancy.py @@ -16,7 +16,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Unit, Size from tests.io_class.io_class_common import ( prepare, diff --git a/test/functional/tests/io_class/test_io_class_occupancy_load.py b/test/functional/tests/io_class/test_io_class_occupancy_load.py index d50a22d..0c4abc0 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy_load.py +++ b/test/functional/tests/io_class/test_io_class_occupancy_load.py @@ -15,7 +15,8 @@ from storage_devices.device import Device from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import Udev from tests.io_class.io_class_common import ( prepare, mountpoint, 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 0171ac9..68b5690 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 @@ -15,7 +15,8 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Unit from tests.io_class.io_class_common import ( prepare, 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 4be7d59..7e9e45f 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 @@ -13,7 +13,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Unit from tests.io_class.io_class_common import ( mountpoint, 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 285144a..4783adc 100644 --- a/test/functional/tests/io_class/test_io_class_process.py +++ b/test/functional/tests/io_class/test_io_class_process.py @@ -11,7 +11,8 @@ from api.cas import ioclass_config, casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Size, Unit from tests.io_class.io_class_common import prepare, ioclass_config_path 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 ea02797..46e47d0 100644 --- a/test/functional/tests/io_class/test_io_class_purge.py +++ b/test/functional/tests/io_class/test_io_class_purge.py @@ -14,7 +14,8 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.dd import Dd from test_tools.disk_utils import Filesystem -from test_utils.os_utils import drop_caches, DropCachesMode, sync, Udev +from test_tools.os_tools import drop_caches, DropCachesMode, sync +from test_tools.udev import Udev from types.size import Unit, Size from tests.io_class.io_class_common import prepare, mountpoint, ioclass_config_path 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 f96d8e7..32b570a 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 @@ -6,6 +6,8 @@ import os import pytest from datetime import timedelta + +import test_tools.runlevel from api.cas import ioclass_config, casadm_parser from api.cas.cache_config import CacheMode from api.cas.casadm_params import StatsFilter @@ -17,8 +19,8 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from test_utils import os_utils -from test_utils.os_utils import Runlevel +from test_tools.os_tools import sync, drop_caches +from test_tools.runlevel import Runlevel from types.size import Size, Unit from tests.io_class.io_class_common import ( prepare, @@ -73,10 +75,10 @@ def test_io_class_service_load(runlevel): InitConfig.create_init_config_from_running_configuration( cache_extra_flags=f"ioclass_file={ioclass_config_path}" ) - os_utils.sync() + sync() with TestRun.step(f"Reboot system to runlevel {runlevel}."): - os_utils.change_runlevel(runlevel) + test_tools.runlevel.change_runlevel(runlevel) TestRun.executor.reboot() with TestRun.step( @@ -152,8 +154,8 @@ def run_io(): ) fio.run() - os_utils.sync() - os_utils.drop_caches() + sync() + drop_caches() def prepare_and_load_io_class_config(cache, metadata_not_cached=False): 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 ef67c94..078dffa 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 @@ -17,7 +17,7 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from test_utils.os_utils import sync, drop_caches +from test_tools.os_tools import sync, drop_caches from types.size import Size, Unit from tests.io_class.io_class_common import template_config_path 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 822ff05..4d09b23 100644 --- a/test/functional/tests/io_class/test_io_class_wlth.py +++ b/test/functional/tests/io_class/test_io_class_wlth.py @@ -10,7 +10,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from test_utils.os_utils import sync, Udev, drop_caches +from test_tools.os_tools import sync, drop_caches +from test_tools.udev import Udev from types.size import Unit, Size from tests.io_class.io_class_common import prepare diff --git a/test/functional/tests/io_class/test_io_classification.py b/test/functional/tests/io_class/test_io_classification.py index ab3dce5..a9c91cd 100644 --- a/test/functional/tests/io_class/test_io_classification.py +++ b/test/functional/tests/io_class/test_io_classification.py @@ -19,7 +19,8 @@ from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.filesystem.file import File -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Size, Unit from tests.io_class.io_class_common import prepare, ioclass_config_path, mountpoint 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 6faacd5..2134f6c 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py @@ -24,7 +24,7 @@ from storage_devices.disk import DiskTypeSet, DiskTypeLowerThan, DiskType 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_tools.os_tools import kill_all_io from types.size import Size, Unit from types.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 f53f503..bcd5802 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py @@ -14,7 +14,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from test_utils.os_utils import Udev, kill_all_io +from test_tools.os_tools import kill_all_io +from test_tools.udev import Udev from types.size import Size, Unit from types.time import Time 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 962e239..d47d821 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 @@ -18,7 +18,7 @@ from api.cas.cache_config import ( 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_tools.udev import Udev from types.size import Size, Unit from types.time import Time 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 6202d17..472c692 100644 --- a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py +++ b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py @@ -9,7 +9,6 @@ import test_tools.common.wait from core.test_run import TestRun 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 types.size import Size, Unit 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 e04cedc..9a19a46 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 @@ -15,9 +15,8 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from test_utils import os_utils from test_utils.filesystem.file import File -from test_utils.os_utils import DropCachesMode +from test_tools.os_tools import DropCachesMode, drop_caches, sync from types.size import Size, Unit from types.time import Time from tests.lazy_writes.recovery.recovery_tests_methods import power_cycle_dut @@ -63,7 +62,7 @@ def test_recovery_all_options(cache_mode, cache_line_size, cleaning_policy, file with TestRun.step("Mount core device."): core_device.mount(mount_point) file_operation(test_file.full_path, other_pattern, ReadWrite.write) - os_utils.drop_caches(DropCachesMode.ALL) + drop_caches(DropCachesMode.ALL) with TestRun.step("Unmount core device."): core_device.unmount() @@ -85,9 +84,9 @@ def test_recovery_all_options(cache_mode, cache_line_size, cleaning_policy, file cache.set_cache_mode(CacheMode.WT, flush=False) with TestRun.step("Reset platform."): - os_utils.sync() + sync() core.unmount() - os_utils.drop_caches(DropCachesMode.ALL) + drop_caches(DropCachesMode.ALL) TestRun.LOGGER.info(f"Number of dirty blocks in cache: {cache.get_dirty_blocks()}") 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 a348140..66d085a 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 @@ -13,8 +13,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.disk_utils import Filesystem from test_tools.fs_utils import readlink -from test_utils import os_utils -from test_utils.os_utils import Udev, DropCachesMode +from test_tools.os_tools import DropCachesMode, sync, drop_caches +from test_tools.udev import Udev from connection.utils.output import CmdException from types.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \ @@ -62,13 +62,13 @@ def test_recovery_flush_reset_raw(cache_mode): direct="oflag") with TestRun.step("Sync and flush buffers."): - os_utils.sync() + sync() output = TestRun.executor.run(f"hdparm -f {core.path}") if output.exit_code != 0: raise CmdException("Error during hdparm", output) with TestRun.step("Trigger flush."): - os_utils.drop_caches(DropCachesMode.ALL) + drop_caches(DropCachesMode.ALL) TestRun.executor.run_in_background(cli.flush_cache_cmd(f"{cache.cache_id}")) with TestRun.step("Hard reset DUT during data flushing."): diff --git a/test/functional/tests/lazy_writes/test_clean_load.py b/test/functional/tests/lazy_writes/test_clean_load.py index a70c938..e6df380 100644 --- a/test/functional/tests/lazy_writes/test_clean_load.py +++ b/test/functional/tests/lazy_writes/test_clean_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.os_utils import Udev +from test_tools.udev import Udev from types.size import Size, Unit 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 a27cd4f..bbad151 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 @@ -18,7 +18,8 @@ from test_tools.fio.fio import Fio 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_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Size, Unit file_size = Size(640, Unit.GiB) 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 4bc49d8..98cd4a1 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py @@ -15,7 +15,8 @@ from test_tools.disk_utils import Filesystem 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_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Size, Unit bs = Size(512, Unit.KibiByte) 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 569bd51..2bb823d 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_signals.py @@ -16,8 +16,8 @@ from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file +from test_tools.os_tools import sync from test_tools.scsi_debug import Logs, syslog_path -from test_utils import os_utils from types.size import Size, Unit mount_point = "/mnt/cas" @@ -60,11 +60,11 @@ def test_flush_signal_core(cache_mode): with TestRun.step("Create temporary file on exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Flush cache."): cache.flush_cache() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush request and delete temporary file."): Logs.check_syslog_for_signals() @@ -72,11 +72,11 @@ def test_flush_signal_core(cache_mode): with TestRun.step("Create temporary file on exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Flush core."): core.flush_core() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush request and delete temporary file."): Logs.check_syslog_for_signals() @@ -90,7 +90,7 @@ def test_flush_signal_core(cache_mode): with TestRun.step("Create big temporary file on exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(5, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Wait for automatic flush from alru cleaning policy and check log."): wait_time = ( @@ -107,12 +107,12 @@ def test_flush_signal_core(cache_mode): with TestRun.step("Create temporary file on exported object."): create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Unmount exported object and remove it from cache."): core.unmount() core.remove_core() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush request."): Logs.check_syslog_for_signals() @@ -158,11 +158,11 @@ def test_flush_signal_cache(cache_mode): with TestRun.step("Create temporary file on exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Flush cache."): cache.flush_cache() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush and FUA requests and delete temporary file."): Logs.check_syslog_for_signals() @@ -170,11 +170,11 @@ def test_flush_signal_cache(cache_mode): with TestRun.step("Create temporary file on exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Flush core."): core.flush_core() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush request and delete temporary file."): Logs.check_syslog_for_signals() @@ -188,7 +188,7 @@ def test_flush_signal_cache(cache_mode): with TestRun.step("Create big temporary file on exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(5, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Wait for automatic flush from alru cleaning policy and check log."): wait_time = ( @@ -205,12 +205,12 @@ def test_flush_signal_cache(cache_mode): with TestRun.step("Create temporary file on exported object."): create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Unmount exported object and remove it from cache."): core.unmount() core.remove_core() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush and FUA requests."): Logs.check_syslog_for_signals() @@ -262,12 +262,12 @@ def test_flush_signal_multilevel_cache(cache_mode): with TestRun.step("Create temporary file on the 2nd exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(512, Unit.MebiByte)) - os_utils.sync() + sync() with TestRun.step("Flush both caches."): cache2.flush_cache() cache1.flush_cache() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush and FUA requests and delete temporary file."): Logs.check_syslog_for_signals() @@ -275,12 +275,12 @@ def test_flush_signal_multilevel_cache(cache_mode): with TestRun.step("Create temporary file on the 2nd exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(512, Unit.MebiByte)) - os_utils.sync() + sync() with TestRun.step("Flush both cores."): core2.flush_core() core1.flush_core() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush request and delete temporary file."): Logs.check_syslog_for_signals() @@ -298,7 +298,7 @@ def test_flush_signal_multilevel_cache(cache_mode): with TestRun.step("Create big temporary file on the 2nd exported object."): tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(3, Unit.GibiByte)) - os_utils.sync() + sync() with TestRun.step("Wait for automatic flush from alru cleaning policy and check log."): wait_time = ( @@ -315,13 +315,13 @@ def test_flush_signal_multilevel_cache(cache_mode): with TestRun.step("Create temporary file on the 2nd exported object."): create_random_test_file(f"{mount_point}/tmp.file", Size(512, Unit.MebiByte)) - os_utils.sync() + sync() with TestRun.step("Unmount the 2nd exported object and remove cores from caches."): core2.unmount() core2.remove_core() core1.remove_core() - os_utils.sync() + sync() with TestRun.step(f"Check {syslog_path} for flush request."): Logs.check_syslog_for_signals() diff --git a/test/functional/tests/lazy_writes/test_wb_throttling.py b/test/functional/tests/lazy_writes/test_wb_throttling.py index b0b170a..91085ab 100644 --- a/test/functional/tests/lazy_writes/test_wb_throttling.py +++ b/test/functional/tests/lazy_writes/test_wb_throttling.py @@ -12,25 +12,19 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.iostat import IOstatExtended -from test_utils.os_utils import ( +from test_tools.os_tools import ( kill_all_io, set_wbt_lat, get_wbt_lat, - get_dut_cpu_number, ) from test_tools.common.wait import wait from api.cas import casadm from api.cas.cache_config import ( CacheMode, - CacheModeTrait, CleaningPolicy, - FlushParametersAcp, SeqCutOffPolicy, CacheLineSize, - Time, ) -from test_tools.blktrace import BlkTrace, BlkTraceMask, ActionKind, RwbsKind - runtime = timedelta(days=30) 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 eaba832..b13be24 100644 --- a/test/functional/tests/memory/test_check_number_of_processes.py +++ b/test/functional/tests/memory/test_check_number_of_processes.py @@ -8,7 +8,7 @@ import pytest from api.cas import casadm 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, +from test_tools.os_tools import (get_number_of_processors_from_cpuinfo, get_number_of_processes) from types.size import Size, Unit diff --git a/test/functional/tests/memory/test_memory_metadata_consumption.py b/test/functional/tests/memory/test_memory_metadata_consumption.py index fbdbc72..c3ebf43 100644 --- a/test/functional/tests/memory/test_memory_metadata_consumption.py +++ b/test/functional/tests/memory/test_memory_metadata_consumption.py @@ -13,8 +13,9 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from test_utils.os_utils import get_mem_available, get_module_mem_footprint -from test_utils.os_utils import sync, Udev +from test_tools.memory import get_mem_available, get_module_mem_footprint +from test_tools.os_tools import sync +from test_tools.udev import Udev from types.size import Size, Unit cores_count = 16 diff --git a/test/functional/tests/misc/test_flush_propagation.py b/test/functional/tests/misc/test_flush_propagation.py index df2dc92..9bb0d5b 100644 --- a/test/functional/tests/misc/test_flush_propagation.py +++ b/test/functional/tests/misc/test_flush_propagation.py @@ -15,9 +15,9 @@ from api.cas.cache_config import ( from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun from test_tools.disk_utils import Filesystem +from test_tools.os_tools import sync from test_tools.scsi_debug import Logs, syslog_path from test_tools.fs_utils import create_random_test_file -from test_utils import os_utils from types.size import Size, Unit mount_point = "/mnt/cas" @@ -56,12 +56,12 @@ def test_flush_signal_propagation_cache(): if core.is_mounted(): core.unmount() core.mount(mount_point) - os_utils.sync() + sync() with TestRun.step("Create temporary file on the exported object."): Logs._read_syslog(Logs.last_read_line) tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() sleep(3) with TestRun.step(f"Check {syslog_path} for flush request and delete temporary file."): @@ -102,12 +102,12 @@ def test_flush_signal_propagation_core(): if core.is_mounted(): core.unmount() core.mount(mount_point) - os_utils.sync() + sync() with TestRun.step("Create temporary file on the exported object."): Logs._read_syslog(Logs.last_read_line) tmp_file = create_random_test_file(f"{mount_point}/tmp.file", Size(1, Unit.GibiByte)) - os_utils.sync() + sync() sleep(3) with TestRun.step(f"Check {syslog_path} for flush request and delete temporary file."): diff --git a/test/functional/tests/performance/test_100p_hits.py b/test/functional/tests/performance/test_100p_hits.py index 848f43d..5a63275 100644 --- a/test/functional/tests/performance/test_100p_hits.py +++ b/test/functional/tests/performance/test_100p_hits.py @@ -17,7 +17,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskTypeLowerThan, DiskType 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_tools.os_tools import set_wbt_lat, get_dut_cpu_physical_cores +from test_tools.udev import Udev from connection.utils.output import CmdException from types.size import Size, Unit from 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 8561ead..e93e8ee 100644 --- a/test/functional/tests/performance/test_performance_reads.py +++ b/test/functional/tests/performance/test_performance_reads.py @@ -13,7 +13,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, CpusAllowedPolicy -from test_utils.os_utils import ( +from test_tools.os_tools import ( get_number_of_processors_from_cpuinfo, set_wbt_lat, get_dut_cpu_physical_cores, diff --git a/test/functional/tests/performance/test_performance_write.py b/test/functional/tests/performance/test_performance_write.py index e60090a..1e3a684 100644 --- a/test/functional/tests/performance/test_performance_write.py +++ b/test/functional/tests/performance/test_performance_write.py @@ -13,7 +13,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, CpusAllowedPolicy -from test_utils.os_utils import ( +from test_tools.os_tools import ( set_wbt_lat, get_number_of_processors_from_cpuinfo, get_dut_cpu_physical_cores, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_cache_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_cache_id.py index 3cf6804..6fc3a3c 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_cache_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_cache_id.py @@ -20,7 +20,7 @@ from api.cas.cli import add_core_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev 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_add_core/test_fuzzy_add_core_core_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_core_id.py index 53e38ac..94b5487 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_core_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_core_id.py @@ -24,7 +24,7 @@ from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, run_cmd_and_validate, ) -from test_utils.os_utils import Udev +from test_tools.udev import Udev core_id_min = 0 core_id_max = 4095 diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_device.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_device.py index 9fda5ae..213fa80 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_device.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_add_core_device.py @@ -20,7 +20,7 @@ from api.cas.cli import add_core_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev 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_add_core/test_fuzzy_script_add_core_try_add_cache_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_cache_id.py index 92b57aa..1866eb4 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_cache_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_cache_id.py @@ -9,7 +9,7 @@ from api.cas.cli import script_try_add_cmd, remove_detached_cmd from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev 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_add_core/test_fuzzy_script_add_core_try_add_core_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_core_id.py index 5f132e9..924d5b4 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_core_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_core_id.py @@ -9,7 +9,7 @@ from api.cas.cli import script_try_add_cmd, remove_detached_cmd from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev 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_add_core/test_fuzzy_script_add_core_try_add_device.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_device.py index 637f1a7..d38008e 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_device.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_add_core/test_fuzzy_script_add_core_try_add_device.py @@ -7,7 +7,7 @@ from api.cas.cli import script_try_add_cmd, remove_detached_cmd from core.test_run import TestRun from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev 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 3a8f92e..fa93a23 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 @@ -19,7 +19,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.os_utils import Udev +from test_tools.udev import Udev from types.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_cache_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_cache_id.py index 5f5552d..6e127b0 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_cache_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_cache_id.py @@ -18,7 +18,7 @@ from api.cas.cli import remove_core_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev from tests.security.fuzzy.kernel.common.common import ( prepare_cas_instance, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_core_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_core_id.py index 012f690..65c69da 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_core_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_core_id.py @@ -18,7 +18,7 @@ from api.cas.cli import remove_core_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev from tests.security.fuzzy.kernel.common.common import ( prepare_cas_instance, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_flag.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_flag.py index 7674d9c..e1c85d3 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_flag.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_core_flag.py @@ -17,7 +17,7 @@ from api.cas.cli import remove_core_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev from tests.security.fuzzy.kernel.common.common import ( prepare_cas_instance, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_cache_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_cache_id.py index a0661ed..412cddb 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_cache_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_cache_id.py @@ -20,7 +20,7 @@ from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev from tests.security.fuzzy.kernel.common.common import ( prepare_cas_instance, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_core_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_core_id.py index 18c23be..8b85f8d 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_core_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_remove_inactive_core_id.py @@ -19,7 +19,7 @@ from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev from tests.security.fuzzy.kernel.common.common import ( prepare_cas_instance, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_cache_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_cache_id.py index 1cc7f8a..60cb245 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_cache_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_cache_id.py @@ -18,7 +18,7 @@ from api.cas.cli import stop_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev from tests.security.fuzzy.kernel.common.common import ( prepare_cas_instance, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_flag.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_flag.py index 3baffcd..ac8825a 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_flag.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_stop_remove/test_fuzzy_stop_cache_flag.py @@ -18,7 +18,7 @@ from api.cas.cli import stop_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from test_utils.os_utils import Udev +from test_tools.udev import Udev from tests.security.fuzzy.kernel.common.common import ( prepare_cas_instance, get_fuzz_config, diff --git a/test/functional/tests/security/test_security_user.py b/test/functional/tests/security/test_security_user.py index d85a16a..b7aa5db 100644 --- a/test/functional/tests/security/test_security_user.py +++ b/test/functional/tests/security/test_security_user.py @@ -14,7 +14,7 @@ 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 create_user, check_if_user_exists +from test_tools.os_tools import create_user, check_if_user_exists from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/stats/test_block_stats.py b/test/functional/tests/stats/test_block_stats.py index 69865d4..08c106d 100644 --- a/test/functional/tests/stats/test_block_stats.py +++ b/test/functional/tests/stats/test_block_stats.py @@ -15,7 +15,7 @@ from api.cas.statistics import get_stats_dict, get_stat_value, OperationType 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_tools.udev import Udev from types.size import Size, Unit iterations = 10 diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index b4fb11a..a2210a3 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -17,7 +17,6 @@ from api.cas.cli_messages import ( ) from api.cas.statistics import ( config_stats_ioclass, - usage_stats, usage_stats_ioclass, request_stats, block_stats_core, @@ -27,7 +26,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File -from test_utils.os_utils import sync, Udev +from test_tools.os_tools import sync +from test_tools.udev import Udev from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/stats/test_stat_max.py b/test/functional/tests/stats/test_stat_max.py index 2bbbeed..c0ea5f1 100644 --- a/test/functional/tests/stats/test_stat_max.py +++ b/test/functional/tests/stats/test_stat_max.py @@ -16,7 +16,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.os_utils import Udev +from test_tools.udev import Udev from types.size import Size, Unit cache_size = Size(1, Unit.GibiByte) diff --git a/test/functional/tests/stats/test_statistics_integrity.py b/test/functional/tests/stats/test_statistics_integrity.py index e83dc2f..039caaf 100644 --- a/test/functional/tests/stats/test_statistics_integrity.py +++ b/test/functional/tests/stats/test_statistics_integrity.py @@ -16,7 +16,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.os_utils import Udev +from test_tools.udev import Udev from types.size import Size, Unit # One cache instance per every cache mode: 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 890a18e..0e0bfa4 100644 --- a/test/functional/tests/stress/test_stress_cleaning_policy_change.py +++ b/test/functional/tests/stress/test_stress_cleaning_policy_change.py @@ -16,7 +16,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from test_tools.disk_utils import Filesystem from types.size import Size, Unit -from test_utils.os_utils import Udev +from test_tools.udev import Udev from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine diff --git a/test/functional/tests/volumes/common.py b/test/functional/tests/volumes/common.py index a3eb48c..35be295 100644 --- a/test/functional/tests/volumes/common.py +++ b/test/functional/tests/volumes/common.py @@ -7,7 +7,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_tools.disk_utils import get_block_device_names_list from types.size import Size, Unit test_file_size = Size(500, Unit.KiloByte) From e0f6d58d803ac9dfc28bc64ddaf5976fb5c3a46b Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Wed, 11 Dec 2024 09:04:46 +0100 Subject: [PATCH 18/24] Disk finder refactor Signed-off-by: Katarzyna Treder --- test/functional/test-framework | 2 +- test/functional/tests/cli/test_zero_metadata_command.py | 2 +- test/functional/tests/conftest.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index 7512420..6970a43 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 7512420e2adbecf2a83847f963f61326d17c77fc +Subproject commit 6970a4310790fc56023661a5c7c1bddca714ceba diff --git a/test/functional/tests/cli/test_zero_metadata_command.py b/test/functional/tests/cli/test_zero_metadata_command.py index e33eee2..efb1ee1 100644 --- a/test/functional/tests/cli/test_zero_metadata_command.py +++ b/test/functional/tests/cli/test_zero_metadata_command.py @@ -15,7 +15,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.disk_utils import get_device_filesystem_type, Filesystem 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_tools.disk_finder import get_system_disks from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index b5f7efd..648362e 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -25,7 +25,6 @@ from storage_devices.raid import Raid from storage_devices.ramdisk import RamDisk from test_tools.os_tools import kill_all_io from test_tools.udev import Udev -from test_utils.disk_finder import get_disk_serial_number from test_tools.disk_utils import PartitionTable, create_partition_table from test_tools.device_mapper import DeviceMapper from test_tools.mdadm import Mdadm @@ -34,6 +33,7 @@ from test_tools import initramfs, git from log.logger import create_log, Log from test_utils.common.singleton import Singleton from storage_devices.lvm import Lvm, LvmConfiguration +from storage_devices.disk import Disk def pytest_addoption(parser): @@ -185,7 +185,7 @@ def base_prepare(item): RamDisk.remove_all() for disk in TestRun.disks.values(): - disk_serial = get_disk_serial_number(disk.path) + disk_serial = Disk.get_disk_serial_number(disk.path) if disk.serial_number and disk.serial_number != disk_serial: raise Exception( f"Serial for {disk.path} doesn't match the one from the config." From 58d89121ad52636303d0b27f0feb0232d4ade63b Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Wed, 11 Dec 2024 18:10:46 +0100 Subject: [PATCH 19/24] Fix names: rename types to type_def Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache_config.py | 4 ++-- 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/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 +- .../functional/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 | 2 +- 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 +- .../functional/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 | 2 +- .../tests/failover_standby/test_cache_activation_perf.py | 2 +- .../tests/failover_standby/test_failover_advanced.py | 2 +- .../tests/failover_standby/test_failover_multihost.py | 2 +- .../tests/fault_injection/test_another_device_with_same_id.py | 2 +- .../tests/fault_injection/test_cache_insert_error.py | 2 +- .../tests/fault_injection/test_error_device_as_cache.py | 2 +- .../tests/fault_injection/test_fault_injection_interrupts.py | 2 +- .../tests/fault_injection/test_fault_injection_many_to_one.py | 2 +- .../fault_injection/test_fault_injection_opencas_load.py | 2 +- .../tests/fault_injection/test_fault_injection_standby.py | 2 +- .../fault_injection/test_fault_injection_standby_core.py | 2 +- .../fault_injection/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 +- test/functional/tests/incremental_load/test_inactive_cores.py | 2 +- .../tests/incremental_load/test_incremental_load.py | 4 ++-- 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 +- test/functional/tests/initialize/test_initialize_runlevel.py | 2 +- test/functional/tests/initialize/test_negative_load.py | 2 +- test/functional/tests/initialize/test_recovery.py | 2 +- test/functional/tests/initialize/test_simulation_startup.py | 2 +- test/functional/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 | 2 +- .../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 | 2 +- .../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 +- test/functional/tests/lazy_writes/cleaning_policy/test_acp.py | 4 ++-- .../functional/tests/lazy_writes/cleaning_policy/test_alru.py | 4 ++-- .../tests/lazy_writes/cleaning_policy/test_cleaning_params.py | 4 ++-- .../cleaning_policy/test_switch_cleaning_policy.py | 2 +- .../tests/lazy_writes/recovery/recovery_tests_methods.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_all_options.py | 4 ++-- .../tests/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 +- test/functional/tests/lazy_writes/test_lazy_writes_clean.py | 2 +- test/functional/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 | 2 +- .../functional/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 | 2 +- test/functional/tests/misc/test_flush_propagation.py | 2 +- test/functional/tests/performance/test_100p_hits.py | 2 +- test/functional/tests/performance/test_performance_reads.py | 2 +- test/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 +- test/functional/tests/security/fuzzy/kernel/common/common.py | 2 +- .../fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py | 2 +- .../fuzzy/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 +- .../kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py | 2 +- .../fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py | 2 +- .../security/fuzzy/kernel/fuzzy_with_io/common/common.py | 2 +- .../functional/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_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 +- test/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 +- test/functional/tests/volumes/test_many_cores_on_many_lvms.py | 2 +- test/functional/tests/volumes/test_many_lvms_on_many_cores.py | 2 +- .../functional/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 +- 140 files changed, 146 insertions(+), 146 deletions(-) diff --git a/test/functional/api/cas/cache_config.py b/test/functional/api/cas/cache_config.py index 602626a..8f46766 100644 --- a/test/functional/api/cas/cache_config.py +++ b/test/functional/api/cas/cache_config.py @@ -7,8 +7,8 @@ from enum import Enum, IntFlag from test_tools.os_tools import get_kernel_module_parameter -from types.size import Size, Unit -from types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time class CacheLineSize(Enum): diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py index b7d2a31..ef033a1 100644 --- a/test/functional/api/cas/casadm.py +++ b/test/functional/api/cas/casadm.py @@ -22,7 +22,7 @@ from core.test_run import TestRun from storage_devices.device import Device from test_tools.os_tools import reload_kernel_module from connection.utils.output import CmdException, Output -from types.size import Size, Unit +from type_def.size import Size, Unit # casadm commands diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py index 47c0e48..37e50b9 100644 --- a/test/functional/api/cas/core.py +++ b/test/functional/api/cas/core.py @@ -18,7 +18,7 @@ from storage_devices.device import Device from test_tools import fs_utils, disk_utils from test_tools.os_tools import sync from test_tools.common.wait import wait -from types.size import Unit, Size +from type_def.size import Unit, Size class CoreStatus(Enum): diff --git a/test/functional/api/cas/dmesg.py b/test/functional/api/cas/dmesg.py index 6a7dff8..89e8ffa 100644 --- a/test/functional/api/cas/dmesg.py +++ b/test/functional/api/cas/dmesg.py @@ -7,7 +7,7 @@ import re from test_tools.dmesg import get_dmesg -from types.size import Size, Unit +from type_def.size import Size, Unit def get_metadata_size_on_device(cache_id: int) -> Size: diff --git a/test/functional/api/cas/statistics.py b/test/functional/api/cas/statistics.py index eda4642..e103bc5 100644 --- a/test/functional/api/cas/statistics.py +++ b/test/functional/api/cas/statistics.py @@ -11,7 +11,7 @@ from typing import List from api.cas import casadm from api.cas.casadm_params import StatsFilter -from types.size import Size, Unit +from type_def.size import Size, Unit class UnitType(Enum): diff --git a/test/functional/tests/512b/test_different_io_sizes_support.py b/test/functional/tests/512b/test_different_io_sizes_support.py index 14b65cc..0c7e24f 100644 --- a/test/functional/tests/512b/test_different_io_sizes_support.py +++ b/test/functional/tests/512b/test_different_io_sizes_support.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet from api.cas.cache_config import CacheMode from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine diff --git a/test/functional/tests/basic/test_basic.py b/test/functional/tests/basic/test_basic.py index 4a68996..7381879 100644 --- a/test/functional/tests/basic/test_basic.py +++ b/test/functional/tests/basic/test_basic.py @@ -22,7 +22,7 @@ from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit version_file_path = r"/var/lib/opencas/cas_version" mountpoint = "/mnt" diff --git a/test/functional/tests/basic/test_start_cas.py b/test/functional/tests/basic/test_start_cas.py index 4f3f926..affa40b 100644 --- a/test/functional/tests/basic/test_start_cas.py +++ b/test/functional/tests/basic/test_start_cas.py @@ -9,7 +9,7 @@ import pytest from api.cas import casadm from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.CI diff --git a/test/functional/tests/cache_ops/test_cleaning_policy_operation.py b/test/functional/tests/cache_ops/test_cleaning_policy_operation.py index b40b977..79d5d5e 100644 --- a/test/functional/tests/cache_ops/test_cleaning_policy_operation.py +++ b/test/functional/tests/cache_ops/test_cleaning_policy_operation.py @@ -17,7 +17,7 @@ from api.cas.cache_config import ( ) from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit from test_tools.udev import Udev from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine diff --git a/test/functional/tests/cache_ops/test_concurrent_flushes.py b/test/functional/tests/cache_ops/test_concurrent_flushes.py index da777e1..b6f6b57 100644 --- a/test/functional/tests/cache_ops/test_concurrent_flushes.py +++ b/test/functional/tests/cache_ops/test_concurrent_flushes.py @@ -16,7 +16,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.parametrize("cache_mode", CacheMode.with_traits(CacheModeTrait.LazyWrites)) diff --git a/test/functional/tests/cache_ops/test_core_remove.py b/test/functional/tests/cache_ops/test_core_remove.py index fdd4d1e..a7b3aa7 100644 --- a/test/functional/tests/cache_ops/test_core_remove.py +++ b/test/functional/tests/cache_ops/test_core_remove.py @@ -13,7 +13,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet from test_tools.disk_utils import Filesystem from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" cores_amount = 3 diff --git a/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py b/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py index 9a6f4db..e253a20 100644 --- a/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py +++ b/test/functional/tests/cache_ops/test_dynamic_cache_mode_switching.py @@ -17,7 +17,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit io_size = Size(10000, Unit.Blocks4096) diff --git a/test/functional/tests/cache_ops/test_multilevel_cache.py b/test/functional/tests/cache_ops/test_multilevel_cache.py index 9d625f4..d67ecb9 100644 --- a/test/functional/tests/cache_ops/test_multilevel_cache.py +++ b/test/functional/tests/cache_ops/test_multilevel_cache.py @@ -9,7 +9,7 @@ import pytest from api.cas import casadm, cli, cli_messages from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py index cfc9741..65face6 100644 --- a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py @@ -26,7 +26,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.udev import Udev from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit random_thresholds = random.sample(range(1028, 1024**2, 4), 3) random_stream_numbers = random.sample(range(2, 128), 3) diff --git a/test/functional/tests/cache_ops/test_seq_cutoff.py b/test/functional/tests/cache_ops/test_seq_cutoff.py index 90bea73..77b1995 100644 --- a/test/functional/tests/cache_ops/test_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_seq_cutoff.py @@ -17,7 +17,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, CpusAllowedPolicy from test_tools.os_tools import sync, get_dut_cpu_physical_cores from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit class VerifyType(Enum): diff --git a/test/functional/tests/ci/test_ci_read_write.py b/test/functional/tests/ci/test_ci_read_write.py index ec05540..3821c84 100644 --- a/test/functional/tests/ci/test_ci_read_write.py +++ b/test/functional/tests/ci/test_ci_read_write.py @@ -10,7 +10,7 @@ from api.cas.cache_config import CacheMode from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size from test_tools.dd import Dd from test_tools.iostat import IOstatBasic diff --git a/test/functional/tests/cli/test_cas_memory_usage.py b/test/functional/tests/cli/test_cas_memory_usage.py index bb33b62..32a4ba1 100644 --- a/test/functional/tests/cli/test_cas_memory_usage.py +++ b/test/functional/tests/cli/test_cas_memory_usage.py @@ -8,7 +8,7 @@ import pytest from api.cas.cas_module import CasModule from core.test_run import TestRun -from types.size import Unit +from type_def.size import Unit from test_tools.os_tools import (drop_caches, is_kernel_module_loaded, load_kernel_module, diff --git a/test/functional/tests/cli/test_cleaning_policy.py b/test/functional/tests/cli/test_cleaning_policy.py index 8d065f1..432ec26 100644 --- a/test/functional/tests/cli/test_cleaning_policy.py +++ b/test/functional/tests/cli/test_cleaning_policy.py @@ -8,7 +8,7 @@ import pytest import time from core.test_run_utils import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio diff --git a/test/functional/tests/cli/test_cli_script.py b/test/functional/tests/cli/test_cli_script.py index 9334b69..6f24c81 100644 --- a/test/functional/tests/cli/test_cli_script.py +++ b/test/functional/tests/cli/test_cli_script.py @@ -10,7 +10,7 @@ from api.cas import casadm from core.test_run import TestRun from test_tools.os_tools import sync from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Unit, Size +from type_def.size import Unit, Size from test_tools.dd import Dd diff --git a/test/functional/tests/cli/test_cli_standby.py b/test/functional/tests/cli/test_cli_standby.py index 7f6ed15..e9b9c80 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/test/functional/tests/cli/test_cli_standby.py @@ -17,7 +17,7 @@ from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import sync from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit from api.cas.cli_messages import ( check_stderr_msg, missing_param, diff --git a/test/functional/tests/cli/test_cli_start_stop.py b/test/functional/tests/cli/test_cli_start_stop.py index ee4096d..47efd99 100644 --- a/test/functional/tests/cli/test_cli_start_stop.py +++ b/test/functional/tests/cli/test_cli_start_stop.py @@ -10,7 +10,7 @@ from api.cas import casadm, casadm_parser, cli_messages from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Unit, Size +from type_def.size import Unit, Size CACHE_ID_RANGE = (1, 16384) CORE_ID_RANGE = (0, 4095) diff --git a/test/functional/tests/cli/test_manual_casadm_flush.py b/test/functional/tests/cli/test_manual_casadm_flush.py index e759c9c..585d80b 100644 --- a/test/functional/tests/cli/test_manual_casadm_flush.py +++ b/test/functional/tests/cli/test_manual_casadm_flush.py @@ -8,7 +8,7 @@ import time from core.test_run_utils import TestRun from storage_devices.device import Device -from types.size import Size, Unit +from type_def.size import Size, Unit from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio diff --git a/test/functional/tests/cli/test_seq_cutoff_settings.py b/test/functional/tests/cli/test_seq_cutoff_settings.py index 1c7c4c7..fb3fcf1 100644 --- a/test/functional/tests/cli/test_seq_cutoff_settings.py +++ b/test/functional/tests/cli/test_seq_cutoff_settings.py @@ -14,7 +14,7 @@ from api.cas.casadm import set_param_cutoff_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/cli/test_set_get_params.py b/test/functional/tests/cli/test_set_get_params.py index 93cf2c1..aaea922 100644 --- a/test/functional/tests/cli/test_set_get_params.py +++ b/test/functional/tests/cli/test_set_get_params.py @@ -19,7 +19,7 @@ from api.cas.cache_config import ( ) from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit # There should be at least 2 cache instances and 2 cores per cache diff --git a/test/functional/tests/cli/test_zero_metadata_command.py b/test/functional/tests/cli/test_zero_metadata_command.py index efb1ee1..92d63e6 100644 --- a/test/functional/tests/cli/test_zero_metadata_command.py +++ b/test/functional/tests/cli/test_zero_metadata_command.py @@ -17,7 +17,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.disk_finder import get_system_disks from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/common/lvm_common_utils.py b/test/functional/tests/common/lvm_common_utils.py index a9cede6..9923af5 100644 --- a/test/functional/tests/common/lvm_common_utils.py +++ b/test/functional/tests/common/lvm_common_utils.py @@ -10,7 +10,7 @@ from storage_devices.lvm import get_block_devices_list from api.cas.init_config import InitConfig from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite, VerifyMethod -from types.size import Size, Unit +from type_def.size import Size, Unit def run_fio_on_lvm(volumes: []): diff --git a/test/functional/tests/data_integrity/test_data_integrity_12h.py b/test/functional/tests/data_integrity/test_data_integrity_12h.py index ad5c8a6..f868ee4 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_12h.py +++ b/test/functional/tests/data_integrity/test_data_integrity_12h.py @@ -14,7 +14,7 @@ from core.test_run import TestRun from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Unit, Size +from type_def.size import Unit, Size start_size = int(Size(512, Unit.Byte)) diff --git a/test/functional/tests/data_integrity/test_data_integrity_5d.py b/test/functional/tests/data_integrity/test_data_integrity_5d.py index 5e8062a..dcfc93c 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_5d.py +++ b/test/functional/tests/data_integrity/test_data_integrity_5d.py @@ -19,7 +19,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_utils.filesystem.file import File from test_tools.os_tools import sync -from types.size import Unit, Size +from type_def.size import Unit, Size start_size = Size(512, Unit.Byte).get_value() diff --git a/test/functional/tests/data_integrity/test_data_integrity_unplug.py b/test/functional/tests/data_integrity/test_data_integrity_unplug.py index 3494cfb..898f1b3 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_unplug.py +++ b/test/functional/tests/data_integrity/test_data_integrity_unplug.py @@ -22,7 +22,7 @@ from test_tools.fio.fio_param import ReadWrite from connection.utils.asynchronous import start_async_func from test_utils.filesystem.directory import Directory from connection.utils.output import CmdException -from types.size import Unit, Size +from type_def.size import Unit, Size ram_disk, tmp_dir, fio_seed = None, None, None num_jobs = 8 diff --git a/test/functional/tests/example/example_test.py b/test/functional/tests/example/example_test.py index 5ff0fa4..e27b385 100644 --- a/test/functional/tests/example/example_test.py +++ b/test/functional/tests/example/example_test.py @@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fs_utils import copy from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File -from types.size import Size, Unit +from type_def.size import Size, Unit from test_utils.emergency_escape import EmergencyEscape from test_tools.fstab import add_mountpoint from storage_devices.lvm import Lvm diff --git a/test/functional/tests/failover_standby/test_cache_activation_perf.py b/test/functional/tests/failover_standby/test_cache_activation_perf.py index e97b3f9..7e32fb3 100644 --- a/test/functional/tests/failover_standby/test_cache_activation_perf.py +++ b/test/functional/tests/failover_standby/test_cache_activation_perf.py @@ -11,7 +11,7 @@ from test_tools.dd import Dd from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit from storage_devices.disk import DiskType, DiskTypeSet from storage_devices.device import Device from api.cas import casadm, dmesg diff --git a/test/functional/tests/failover_standby/test_failover_advanced.py b/test/functional/tests/failover_standby/test_failover_advanced.py index 6bbb900..2bfde1a 100644 --- a/test/functional/tests/failover_standby/test_failover_advanced.py +++ b/test/functional/tests/failover_standby/test_failover_advanced.py @@ -28,7 +28,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite from test_tools.fs_utils import create_directory from test_utils.drbd import Resource, Node -from types.size import Size, Unit +from type_def.size import Size, Unit from test_failover_multihost import check_drbd_installed diff --git a/test/functional/tests/failover_standby/test_failover_multihost.py b/test/functional/tests/failover_standby/test_failover_multihost.py index 1d65b1f..467f83f 100644 --- a/test/functional/tests/failover_standby/test_failover_multihost.py +++ b/test/functional/tests/failover_standby/test_failover_multihost.py @@ -28,7 +28,7 @@ from test_tools.fs_utils import readlink from test_utils.drbd import Resource, Node from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit from test_tools import fs_utils diff --git a/test/functional/tests/fault_injection/test_another_device_with_same_id.py b/test/functional/tests/fault_injection/test_another_device_with_same_id.py index 9bf17b4..4cd322a 100644 --- a/test/functional/tests/fault_injection/test_another_device_with_same_id.py +++ b/test/functional/tests/fault_injection/test_another_device_with_same_id.py @@ -8,7 +8,7 @@ import pytest from api.cas import cli, casadm from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache_1", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/fault_injection/test_cache_insert_error.py b/test/functional/tests/fault_injection/test_cache_insert_error.py index f2a1513..bed641a 100644 --- a/test/functional/tests/fault_injection/test_cache_insert_error.py +++ b/test/functional/tests/fault_injection/test_cache_insert_error.py @@ -21,7 +21,7 @@ from storage_devices.error_device import ErrorDevice from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter, VerifyMethod from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit start_size = Size(512, Unit.Byte) stop_size = Size(128, Unit.KibiByte) diff --git a/test/functional/tests/fault_injection/test_error_device_as_cache.py b/test/functional/tests/fault_injection/test_error_device_as_cache.py index 94bb683..af924d7 100644 --- a/test/functional/tests/fault_injection/test_error_device_as_cache.py +++ b/test/functional/tests/fault_injection/test_error_device_as_cache.py @@ -22,7 +22,7 @@ from api.cas.cache_config import ( ) from storage_devices.disk import DiskTypeSet, DiskType from test_utils.io_stats import IoStats -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.parametrizex("cache_line_size", CacheLineSize) diff --git a/test/functional/tests/fault_injection/test_fault_injection_interrupts.py b/test/functional/tests/fault_injection/test_fault_injection_interrupts.py index fa23cfa..871a27d 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_interrupts.py +++ b/test/functional/tests/fault_injection/test_fault_injection_interrupts.py @@ -16,7 +16,7 @@ from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_tools.os_tools import DropCachesMode, sync, drop_caches from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import compare_files mount_point = "/mnt/cas" diff --git a/test/functional/tests/fault_injection/test_fault_injection_many_to_one.py b/test/functional/tests/fault_injection/test_fault_injection_many_to_one.py index fc18253..14b5211 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_many_to_one.py +++ b/test/functional/tests/fault_injection/test_fault_injection_many_to_one.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from test_tools.dd import Dd from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit block_size = Size(1, Unit.Blocks4096) diff --git a/test/functional/tests/fault_injection/test_fault_injection_opencas_load.py b/test/functional/tests/fault_injection/test_fault_injection_opencas_load.py index 7e0617c..c88bc63 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_opencas_load.py +++ b/test/functional/tests/fault_injection/test_fault_injection_opencas_load.py @@ -12,7 +12,7 @@ from tests.lazy_writes.recovery.recovery_tests_methods import copy_file, compare from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" test_file_path = f"{mount_point}/test_file" diff --git a/test/functional/tests/fault_injection/test_fault_injection_standby.py b/test/functional/tests/fault_injection/test_fault_injection_standby.py index 8f6f3f8..01053a3 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_standby.py +++ b/test/functional/tests/fault_injection/test_fault_injection_standby.py @@ -10,7 +10,7 @@ from api.cas import casadm from api.cas import dmesg from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit from api.cas.cache_config import CacheLineSize, CacheMode from api.cas.cli import standby_activate_cmd, standby_load_cmd from api.cas.dmesg import get_md_section_size diff --git a/test/functional/tests/fault_injection/test_fault_injection_standby_core.py b/test/functional/tests/fault_injection/test_fault_injection_standby_core.py index 285079f..b0bc4b9 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_standby_core.py +++ b/test/functional/tests/fault_injection/test_fault_injection_standby_core.py @@ -9,7 +9,7 @@ import pytest from api.cas import casadm from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit from api.cas.cache_config import CacheLineSize, CacheStatus from api.cas.casadm_params import StatsFilter from api.cas.casadm_parser import get_core_info_for_cache_by_path diff --git a/test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py b/test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py index 2a4c1ea..c20bd14 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py +++ b/test/functional/tests/fault_injection/test_fault_injection_with_mounted_core.py @@ -13,7 +13,7 @@ from test_tools import fs_utils, disk_utils from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from test_utils.filesystem.symlink import Symlink -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point, mount_point2 = "/mnt/cas", "/mnt/cas2" test_file_path = f"{mount_point}/test_file" diff --git a/test/functional/tests/fault_injection/test_fault_power_reboot.py b/test/functional/tests/fault_injection/test_fault_power_reboot.py index 25c7222..2d25ba1 100644 --- a/test/functional/tests/fault_injection/test_fault_power_reboot.py +++ b/test/functional/tests/fault_injection/test_fault_power_reboot.py @@ -11,7 +11,7 @@ from api.cas import casadm, cli, cli_messages from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit log_path = "/var/log/opencas.log" wait_long_time = 180 diff --git a/test/functional/tests/fault_injection/test_max_io_greater_in_core.py b/test/functional/tests/fault_injection/test_max_io_greater_in_core.py index b1b4b2b..001b1f6 100644 --- a/test/functional/tests/fault_injection/test_max_io_greater_in_core.py +++ b/test/functional/tests/fault_injection/test_max_io_greater_in_core.py @@ -10,7 +10,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.dd import Dd from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/fault_injection/test_primary_device_error.py b/test/functional/tests/fault_injection/test_primary_device_error.py index 7856dce..6624b1c 100644 --- a/test/functional/tests/fault_injection/test_primary_device_error.py +++ b/test/functional/tests/fault_injection/test_primary_device_error.py @@ -20,7 +20,7 @@ from api.cas.cache_config import ( ) from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.parametrizex("cache_mode", CacheMode.without_traits(CacheModeTrait.LazyWrites)) diff --git a/test/functional/tests/fault_injection/test_soft_hot_plug_device.py b/test/functional/tests/fault_injection/test_soft_hot_plug_device.py index 7bfc1d2..c93ec60 100644 --- a/test/functional/tests/fault_injection/test_soft_hot_plug_device.py +++ b/test/functional/tests/fault_injection/test_soft_hot_plug_device.py @@ -17,7 +17,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.parametrizex("cache_mode", CacheMode) diff --git a/test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py b/test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py index 03abcd8..927b10b 100644 --- a/test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py +++ b/test/functional/tests/fault_injection/test_standby_activate_different_cache_path.py @@ -11,7 +11,7 @@ from api.cas.cli import standby_activate_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_utils.filesystem.symlink import Symlink -from types.size import Size, Unit +from type_def.size import Size, Unit from api.cas.cache_config import CacheLineSize from api.cas.cache import CacheStatus from test_tools.dd import Dd diff --git a/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py b/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py index f02ceed..f1605ba 100644 --- a/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py +++ b/test/functional/tests/fault_injection/test_standby_activate_the_same_cache_path.py @@ -10,7 +10,7 @@ from api.cas import casadm from api.cas.casadm_parser import get_caches from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit from api.cas.cache_config import CacheStatus diff --git a/test/functional/tests/incremental_load/test_core_pool.py b/test/functional/tests/incremental_load/test_core_pool.py index 1f3c8f7..376af5c 100644 --- a/test/functional/tests/incremental_load/test_core_pool.py +++ b/test/functional/tests/incremental_load/test_core_pool.py @@ -11,7 +11,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.disk_utils import Filesystem from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/incremental_load/test_inactive_cores.py b/test/functional/tests/incremental_load/test_inactive_cores.py index 5150b22..d5a80c3 100644 --- a/test/functional/tests/incremental_load/test_inactive_cores.py +++ b/test/functional/tests/incremental_load/test_inactive_cores.py @@ -13,7 +13,7 @@ from api.cas.core import Core, CoreStatus from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index 1ba3a0e..32f947d 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -32,8 +32,8 @@ from test_utils.filesystem.file import File from test_tools.os_tools import sync from test_tools.udev import Udev from connection.utils.output import CmdException -from types.size import Size, Unit -from types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.CI diff --git a/test/functional/tests/incremental_load/test_udev.py b/test/functional/tests/incremental_load/test_udev.py index a471e44..857d1cc 100644 --- a/test/functional/tests/incremental_load/test_udev.py +++ b/test/functional/tests/incremental_load/test_udev.py @@ -16,7 +16,7 @@ from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType from storage_devices.raid import RaidConfiguration, Raid, Level, MetadataVariant -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.os_dependent diff --git a/test/functional/tests/initialize/test_clean_reboot.py b/test/functional/tests/initialize/test_clean_reboot.py index 6383b0c..769c1cd 100644 --- a/test/functional/tests/initialize/test_clean_reboot.py +++ b/test/functional/tests/initialize/test_clean_reboot.py @@ -15,7 +15,7 @@ from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import drop_caches, DropCachesMode, sync -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.os_dependent diff --git a/test/functional/tests/initialize/test_initialize_load.py b/test/functional/tests/initialize/test_initialize_load.py index d727463..6801ee4 100644 --- a/test/functional/tests/initialize/test_initialize_load.py +++ b/test/functional/tests/initialize/test_initialize_load.py @@ -15,7 +15,7 @@ from api.cas.cache_config import (CleaningPolicy, from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import * -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.parametrizex("cores_amount", [1, 4]) diff --git a/test/functional/tests/initialize/test_initialize_runlevel.py b/test/functional/tests/initialize/test_initialize_runlevel.py index 566b385..81b200f 100644 --- a/test/functional/tests/initialize/test_initialize_runlevel.py +++ b/test/functional/tests/initialize/test_initialize_runlevel.py @@ -18,7 +18,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.os_tools import sync, drop_caches from test_tools.runlevel import Runlevel -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/initialize/test_negative_load.py b/test/functional/tests/initialize/test_negative_load.py index 6e92e4f..08608d8 100644 --- a/test/functional/tests/initialize/test_negative_load.py +++ b/test/functional/tests/initialize/test_negative_load.py @@ -8,7 +8,7 @@ import pytest from api.cas import casadm, casadm_parser, cli, cli_messages from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/initialize/test_recovery.py b/test/functional/tests/initialize/test_recovery.py index 80a61a3..1cd8be2 100644 --- a/test/functional/tests/initialize/test_recovery.py +++ b/test/functional/tests/initialize/test_recovery.py @@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fs_utils import check_if_file_exists from test_utils.filesystem.file import File from test_tools.os_tools import sync -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/initialize/test_simulation_startup.py b/test/functional/tests/initialize/test_simulation_startup.py index f090fec..d82943a 100644 --- a/test/functional/tests/initialize/test_simulation_startup.py +++ b/test/functional/tests/initialize/test_simulation_startup.py @@ -13,7 +13,7 @@ from api.cas.core import CoreStatus from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskTypeLowerThan, DiskTypeSet, DiskType -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.CI diff --git a/test/functional/tests/initialize/test_startup_init_config.py b/test/functional/tests/initialize/test_startup_init_config.py index 82a2e1e..e02824f 100644 --- a/test/functional/tests/initialize/test_startup_init_config.py +++ b/test/functional/tests/initialize/test_startup_init_config.py @@ -17,7 +17,7 @@ from test_utils.filesystem.file import File from test_tools.disk_utils import Filesystem from test_tools import fstab from test_tools.dd import Dd -from types.size import Unit, Size +from type_def.size import Unit, Size from test_tools.os_tools import sync from test_tools.udev import Udev from test_utils.emergency_escape import EmergencyEscape diff --git a/test/functional/tests/io/test_io_engines.py b/test/functional/tests/io/test_io_engines.py index f4b0512..e4c9fc0 100644 --- a/test/functional/tests/io/test_io_engines.py +++ b/test/functional/tests/io/test_io_engines.py @@ -15,7 +15,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, CpusAllowedPolicy, ReadWrite from test_tools.os_tools import get_dut_cpu_physical_cores -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" runtime = timedelta(minutes=15) diff --git a/test/functional/tests/io/test_remove_device_during_io.py b/test/functional/tests/io/test_remove_device_during_io.py index dcfe1d2..40b2e6d 100644 --- a/test/functional/tests/io/test_remove_device_during_io.py +++ b/test/functional/tests/io/test_remove_device_during_io.py @@ -13,7 +13,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/io/test_write_fetch.py b/test/functional/tests/io/test_write_fetch.py index 456149f..6840199 100644 --- a/test/functional/tests/io/test_write_fetch.py +++ b/test/functional/tests/io/test_write_fetch.py @@ -14,7 +14,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.filesystem.symlink import Symlink from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/io/trim/test_trim.py b/test/functional/tests/io/trim/test_trim.py index e2674a7..cb48057 100644 --- a/test/functional/tests/io/trim/test_trim.py +++ b/test/functional/tests/io/trim/test_trim.py @@ -19,7 +19,7 @@ from test_tools.blktrace import BlkTrace, BlkTraceMask, RwbsKind from test_tools.disk_utils import Filesystem, check_if_device_supports_trim from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from types.size import Size, Unit +from type_def.size import Size, Unit from api.cas.dmesg import get_metadata_size_on_device diff --git a/test/functional/tests/io/trim/test_trim_stress.py b/test/functional/tests/io/trim/test_trim_stress.py index 85d47fe..9ca60be 100644 --- a/test/functional/tests/io/trim/test_trim_stress.py +++ b/test/functional/tests/io/trim/test_trim_stress.py @@ -11,7 +11,7 @@ from api.cas.cache_config import CacheMode, CacheLineSize from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.os_dependent diff --git a/test/functional/tests/io_class/io_class_common.py b/test/functional/tests/io_class/io_class_common.py index 373b826..7c6c3ef 100644 --- a/test/functional/tests/io_class/io_class_common.py +++ b/test/functional/tests/io_class/io_class_common.py @@ -19,7 +19,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.os_tools import sync from test_tools.udev import Udev from test_tools.os_tools import drop_caches, DropCachesMode -from types.size import Size, Unit +from type_def.size import Size, Unit ioclass_config_path = "/etc/opencas/ioclass.conf" template_config_path = "/etc/opencas/ioclass-config.csv" diff --git a/test/functional/tests/io_class/test_io_class_cli.py b/test/functional/tests/io_class/test_io_class_cli.py index 730eb5c..73feb62 100644 --- a/test/functional/tests/io_class/test_io_class_cli.py +++ b/test/functional/tests/io_class/test_io_class_cli.py @@ -13,7 +13,7 @@ from api.cas.ioclass_config import IoClass from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils -from types.size import Size, Unit +from type_def.size import Size, Unit ioclass_config_path = "/tmp/opencas_ioclass.conf" diff --git a/test/functional/tests/io_class/test_io_class_core_id.py b/test/functional/tests/io_class/test_io_class_core_id.py index 7cc60aa..8332ec6 100644 --- a/test/functional/tests/io_class/test_io_class_core_id.py +++ b/test/functional/tests/io_class/test_io_class_core_id.py @@ -12,7 +12,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.os_tools import sync, drop_caches from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size dd_bs = Size(1, Unit.Blocks4096) dd_count = 1230 diff --git a/test/functional/tests/io_class/test_io_class_directory.py b/test/functional/tests/io_class/test_io_class_directory.py index 7e506d9..b7f264b 100644 --- a/test/functional/tests/io_class/test_io_class_directory.py +++ b/test/functional/tests/io_class/test_io_class_directory.py @@ -19,7 +19,7 @@ from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File from test_tools.os_tools import drop_caches, DropCachesMode, sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import mountpoint, prepare, ioclass_config_path diff --git a/test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py b/test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py index e75fd3b..1a0aa2a 100644 --- a/test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py +++ b/test/functional/tests/io_class/test_io_class_eviction_pinned_after_unpin.py @@ -14,7 +14,7 @@ from .io_class_common import ioclass_config, get_io_class_occupancy, run_io_dir from api.cas import casadm from test_tools.os_tools import sync, drop_caches from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size cache_size = Size(100, Unit.MiB) diff --git a/test/functional/tests/io_class/test_io_class_file.py b/test/functional/tests/io_class/test_io_class_file.py index 1cc7002..ac01f18 100644 --- a/test/functional/tests/io_class/test_io_class_file.py +++ b/test/functional/tests/io_class/test_io_class_file.py @@ -14,7 +14,7 @@ from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import sync, DropCachesMode, drop_caches -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import mountpoint, prepare, ioclass_config_path diff --git a/test/functional/tests/io_class/test_io_class_lvm_on_cas.py b/test/functional/tests/io_class/test_io_class_lvm_on_cas.py index 6fd91de..ec5cab1 100644 --- a/test/functional/tests/io_class/test_io_class_lvm_on_cas.py +++ b/test/functional/tests/io_class/test_io_class_lvm_on_cas.py @@ -16,7 +16,7 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.volumes.common import lvm_filters mount_point = "/mnt/" diff --git a/test/functional/tests/io_class/test_io_class_occupancy.py b/test/functional/tests/io_class/test_io_class_occupancy.py index dd65cf7..0f3a039 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/test/functional/tests/io_class/test_io_class_occupancy.py @@ -18,7 +18,7 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.io_class.io_class_common import ( prepare, mountpoint, diff --git a/test/functional/tests/io_class/test_io_class_occupancy_repart.py b/test/functional/tests/io_class/test_io_class_occupancy_repart.py index 68b5690..501a7a1 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy_repart.py +++ b/test/functional/tests/io_class/test_io_class_occupancy_repart.py @@ -17,7 +17,7 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Unit +from type_def.size import Unit from tests.io_class.io_class_common import ( prepare, mountpoint, diff --git a/test/functional/tests/io_class/test_io_class_occupancy_resize.py b/test/functional/tests/io_class/test_io_class_occupancy_resize.py index 7e9e45f..3e01deb 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy_resize.py +++ b/test/functional/tests/io_class/test_io_class_occupancy_resize.py @@ -15,7 +15,7 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Unit +from type_def.size import Unit from tests.io_class.io_class_common import ( mountpoint, prepare, diff --git a/test/functional/tests/io_class/test_io_class_pinning_eviction.py b/test/functional/tests/io_class/test_io_class_pinning_eviction.py index 2e66a19..ece7ee3 100644 --- a/test/functional/tests/io_class/test_io_class_pinning_eviction.py +++ b/test/functional/tests/io_class/test_io_class_pinning_eviction.py @@ -13,7 +13,7 @@ from api.cas.ioclass_config import IoClass, default_config_file_path from test_tools import fs_utils from test_tools.disk_utils import Filesystem from core.test_run import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit from .io_class_common import ( prepare, mountpoint, diff --git a/test/functional/tests/io_class/test_io_class_preserve_config.py b/test/functional/tests/io_class/test_io_class_preserve_config.py index 89c2fe2..be9abec 100644 --- a/test/functional/tests/io_class/test_io_class_preserve_config.py +++ b/test/functional/tests/io_class/test_io_class_preserve_config.py @@ -9,7 +9,7 @@ from api.cas import casadm, ioclass_config from api.cas.ioclass_config import IoClass from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import ( compare_io_classes_list, generate_and_load_random_io_class_config, diff --git a/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py b/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py index 060f79a..43540f7 100644 --- a/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py +++ b/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py @@ -11,7 +11,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from connection.utils.output import CmdException -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.io_class.io_class_common import prepare, ioclass_config_path headerless_configuration = "1,unclassified,22,1.00" diff --git a/test/functional/tests/io_class/test_io_class_process.py b/test/functional/tests/io_class/test_io_class_process.py index 4783adc..f30299e 100644 --- a/test/functional/tests/io_class/test_io_class_process.py +++ b/test/functional/tests/io_class/test_io_class_process.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import prepare, ioclass_config_path diff --git a/test/functional/tests/io_class/test_io_class_purge.py b/test/functional/tests/io_class/test_io_class_purge.py index 46e47d0..6300d46 100644 --- a/test/functional/tests/io_class/test_io_class_purge.py +++ b/test/functional/tests/io_class/test_io_class_purge.py @@ -16,7 +16,7 @@ from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_tools.os_tools import drop_caches, DropCachesMode, sync from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.io_class.io_class_common import prepare, mountpoint, ioclass_config_path diff --git a/test/functional/tests/io_class/test_io_class_service_support.py b/test/functional/tests/io_class/test_io_class_service_support.py index 32b570a..d62d244 100644 --- a/test/functional/tests/io_class/test_io_class_service_support.py +++ b/test/functional/tests/io_class/test_io_class_service_support.py @@ -21,7 +21,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import sync, drop_caches from test_tools.runlevel import Runlevel -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import ( prepare, mountpoint, diff --git a/test/functional/tests/io_class/test_io_class_stats_file_size_core.py b/test/functional/tests/io_class/test_io_class_stats_file_size_core.py index 078dffa..3d377cd 100644 --- a/test/functional/tests/io_class/test_io_class_stats_file_size_core.py +++ b/test/functional/tests/io_class/test_io_class_stats_file_size_core.py @@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import sync, drop_caches -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import template_config_path diff --git a/test/functional/tests/io_class/test_io_class_wlth.py b/test/functional/tests/io_class/test_io_class_wlth.py index 4d09b23..14b8c90 100644 --- a/test/functional/tests/io_class/test_io_class_wlth.py +++ b/test/functional/tests/io_class/test_io_class_wlth.py @@ -12,7 +12,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.os_tools import sync, drop_caches from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.io_class.io_class_common import prepare diff --git a/test/functional/tests/io_class/test_io_classification.py b/test/functional/tests/io_class/test_io_classification.py index a9c91cd..31cf460 100644 --- a/test/functional/tests/io_class/test_io_classification.py +++ b/test/functional/tests/io_class/test_io_classification.py @@ -21,7 +21,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.filesystem.file import File from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import prepare, ioclass_config_path, mountpoint diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py index 2134f6c..22c2c13 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py @@ -25,8 +25,8 @@ from test_tools.blktrace import BlkTrace, BlkTraceMask, ActionKind, RwbsKind from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import kill_all_io -from types.size import Size, Unit -from types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py index bcd5802..3cbb03e 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py @@ -16,8 +16,8 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.os_tools import kill_all_io from test_tools.udev import Udev -from types.size import Size, Unit -from types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py b/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py index d47d821..219e233 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py @@ -19,8 +19,8 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.udev import Udev -from types.size import Size, Unit -from types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py b/test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py index 02816e4..df9ea76 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_switch_cleaning_policy.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from connection.utils.asynchronous import start_async_func -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py index 472c692..8f1a0eb 100644 --- a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py +++ b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py @@ -10,7 +10,7 @@ from core.test_run import TestRun from test_tools import fs_utils from test_tools.dd import Dd from test_utils.filesystem.file import File -from types.size import Size, Unit +from type_def.size import Size, Unit def create_test_files(test_file_size): diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py b/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py index 9a19a46..674f7ae 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py @@ -17,8 +17,8 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.filesystem.file import File from test_tools.os_tools import DropCachesMode, drop_caches, sync -from types.size import Size, Unit -from types.time import Time +from type_def.size import Size, Unit +from type_def.time import Time from tests.lazy_writes.recovery.recovery_tests_methods import power_cycle_dut test_file_size = Size(300, Unit.MebiByte) diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py b/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py index 66d085a..28bfb33 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py @@ -16,7 +16,7 @@ from test_tools.fs_utils import readlink from test_tools.os_tools import DropCachesMode, sync, drop_caches from test_tools.udev import Udev from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \ compare_files, power_cycle_dut diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py index db76560..5e1b65a 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py @@ -14,7 +14,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.disk_utils import Filesystem from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \ compare_files diff --git a/test/functional/tests/lazy_writes/test_clean_load.py b/test/functional/tests/lazy_writes/test_clean_load.py index e6df380..c408503 100644 --- a/test/functional/tests/lazy_writes/test_clean_load.py +++ b/test/functional/tests/lazy_writes/test_clean_load.py @@ -11,7 +11,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/test_dirty_load.py b/test/functional/tests/lazy_writes/test_dirty_load.py index 5608fbc..afbd16f 100644 --- a/test/functional/tests/lazy_writes/test_dirty_load.py +++ b/test/functional/tests/lazy_writes/test_dirty_load.py @@ -10,7 +10,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py b/test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py index bbad151..1409708 100644 --- a/test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py +++ b/test/functional/tests/lazy_writes/test_flush_huge_dirty_data.py @@ -20,7 +20,7 @@ from test_tools.fs_utils import remove from test_utils.filesystem.file import File from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit file_size = Size(640, Unit.GiB) required_disk_size = file_size * 1.02 diff --git a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py index 98cd4a1..b6405f2 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py @@ -17,7 +17,7 @@ from test_tools.iostat import IOstatBasic from test_utils.filesystem.file import File from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit bs = Size(512, Unit.KibiByte) mnt_point = "/mnt/cas/" diff --git a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py b/test/functional/tests/lazy_writes/test_lazy_writes_signals.py index 2bb823d..0c41f8c 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_signals.py @@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file from test_tools.os_tools import sync from test_tools.scsi_debug import Logs, syslog_path -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py index 2857cf5..f6a00ef 100644 --- a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py +++ b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py @@ -15,7 +15,7 @@ from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.dd import Dd from test_utils.filesystem.file import File from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/test_wb_throttling.py b/test/functional/tests/lazy_writes/test_wb_throttling.py index 91085ab..158dae5 100644 --- a/test/functional/tests/lazy_writes/test_wb_throttling.py +++ b/test/functional/tests/lazy_writes/test_wb_throttling.py @@ -6,7 +6,7 @@ import pytest from datetime import timedelta -from types.size import Size, Unit +from type_def.size import Size, Unit from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio diff --git a/test/functional/tests/memory/test_check_number_of_processes.py b/test/functional/tests/memory/test_check_number_of_processes.py index b13be24..8a4b18e 100644 --- a/test/functional/tests/memory/test_check_number_of_processes.py +++ b/test/functional/tests/memory/test_check_number_of_processes.py @@ -10,7 +10,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.os_tools import (get_number_of_processors_from_cpuinfo, get_number_of_processes) -from types.size import Size, Unit +from type_def.size import Size, Unit cleaning_threads_expected = 1 management_thread_expected = 1 diff --git a/test/functional/tests/memory/test_memory_metadata_consumption.py b/test/functional/tests/memory/test_memory_metadata_consumption.py index c3ebf43..5c27326 100644 --- a/test/functional/tests/memory/test_memory_metadata_consumption.py +++ b/test/functional/tests/memory/test_memory_metadata_consumption.py @@ -16,7 +16,7 @@ from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.memory import get_mem_available, get_module_mem_footprint from test_tools.os_tools import sync from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit cores_count = 16 cache_size = Size(50, Unit.GibiByte) diff --git a/test/functional/tests/misc/test_device_capabilities.py b/test/functional/tests/misc/test_device_capabilities.py index dc7f136..cb8b2bc 100644 --- a/test/functional/tests/misc/test_device_capabilities.py +++ b/test/functional/tests/misc/test_device_capabilities.py @@ -15,7 +15,7 @@ from storage_devices.device import Device from storage_devices.disk import DiskTypeSet, DiskType from test_tools import disk_utils from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.os_dependent diff --git a/test/functional/tests/misc/test_flush_propagation.py b/test/functional/tests/misc/test_flush_propagation.py index 9bb0d5b..261af0f 100644 --- a/test/functional/tests/misc/test_flush_propagation.py +++ b/test/functional/tests/misc/test_flush_propagation.py @@ -18,7 +18,7 @@ from test_tools.disk_utils import Filesystem from test_tools.os_tools import sync from test_tools.scsi_debug import Logs, syslog_path from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/performance/test_100p_hits.py b/test/functional/tests/performance/test_100p_hits.py index 5a63275..659e265 100644 --- a/test/functional/tests/performance/test_100p_hits.py +++ b/test/functional/tests/performance/test_100p_hits.py @@ -20,7 +20,7 @@ from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import set_wbt_lat, get_dut_cpu_physical_cores from test_tools.udev import Udev from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit from utils.performance import WorkloadParameter diff --git a/test/functional/tests/performance/test_performance_reads.py b/test/functional/tests/performance/test_performance_reads.py index e93e8ee..b2c2e47 100644 --- a/test/functional/tests/performance/test_performance_reads.py +++ b/test/functional/tests/performance/test_performance_reads.py @@ -18,7 +18,7 @@ from test_tools.os_tools import ( set_wbt_lat, get_dut_cpu_physical_cores, ) -from types.size import Unit, Size +from type_def.size import Unit, Size def fill_cas_cache(target, bs): diff --git a/test/functional/tests/performance/test_performance_write.py b/test/functional/tests/performance/test_performance_write.py index 1e3a684..4c2b14c 100644 --- a/test/functional/tests/performance/test_performance_write.py +++ b/test/functional/tests/performance/test_performance_write.py @@ -18,7 +18,7 @@ from test_tools.os_tools import ( get_number_of_processors_from_cpuinfo, get_dut_cpu_physical_cores, ) -from types.size import Unit, Size +from type_def.size import Unit, Size # TODO: for disks other than Intel Optane, fio ramp is needed before fio tests on raw disk diff --git a/test/functional/tests/progress_bar/test_progress_bar_big_files.py b/test/functional/tests/progress_bar/test_progress_bar_big_files.py index 499f719..e2496e9 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_big_files.py +++ b/test/functional/tests/progress_bar/test_progress_bar_big_files.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/progress_bar/test_progress_bar_during_io.py b/test/functional/tests/progress_bar/test_progress_bar_during_io.py index 3680f19..b89c2f2 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_during_io.py +++ b/test/functional/tests/progress_bar/test_progress_bar_during_io.py @@ -14,7 +14,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py b/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py index cdcb196..8e1de28 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py +++ b/test/functional/tests/progress_bar/test_progress_bar_output_redirection.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py b/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py index c871805..1101c6a 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py +++ b/test/functional/tests/progress_bar/test_progress_bar_supported_commands.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from types.size import Size, Unit +from type_def.size import Size, Unit progress_bar_cmd_cache = [cli.stop_cmd, cli.flush_cache_cmd, cli.script_purge_cache_cmd] diff --git a/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py b/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py index 0d976de..3666f27 100644 --- a/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py +++ b/test/functional/tests/progress_bar/test_progress_bar_wt_cache_mode.py @@ -11,7 +11,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType from test_tools.disk_utils import Filesystem from test_tools.fs_utils import create_random_test_file -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/security/fuzzy/kernel/common/common.py b/test/functional/tests/security/fuzzy/kernel/common/common.py index 87ca5ed..fcdc92b 100644 --- a/test/functional/tests/security/fuzzy/kernel/common/common.py +++ b/test/functional/tests/security/fuzzy/kernel/common/common.py @@ -15,7 +15,7 @@ from api.cas import casadm from api.cas.cache_config import CacheMode, CacheLineSize, KernelParameters, CleaningPolicy from core.test_run import TestRun from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit def get_fuzz_config(config_name: str): diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py index 5001ac9..6b11f86 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_device.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( run_cmd_and_validate, get_device_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py index fa93a23..e4a502a 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_flags.py @@ -20,7 +20,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer from test_tools.udev import Udev -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, run_cmd_and_validate, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py index 558ea4e..65ac303 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_id.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, run_cmd_and_validate, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py index 60528d5..3781e5c 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_line_size.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( run_cmd_and_validate, get_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py index 3dd3beb..e8f4736 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_load_device.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( run_cmd_and_validate, get_device_fuzz_config, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py index 0ca5f32..3272379 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_start/test_fuzzy_start_cache_mode.py @@ -18,7 +18,7 @@ from api.cas.cli import start_cmd from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from test_tools.peach_fuzzer.peach_fuzzer import PeachFuzzer -from types.size import Unit, Size +from type_def.size import Unit, Size from tests.security.fuzzy.kernel.common.common import ( get_fuzz_config, run_cmd_and_validate, diff --git a/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py b/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py index 47e2994..c592e6c 100644 --- a/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py +++ b/test/functional/tests/security/fuzzy/kernel/fuzzy_with_io/common/common.py @@ -7,7 +7,7 @@ from datetime import timedelta from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/security/test_load_corrupted_metadata.py b/test/functional/tests/security/test_load_corrupted_metadata.py index e6fa727..79ef2e0 100644 --- a/test/functional/tests/security/test_load_corrupted_metadata.py +++ b/test/functional/tests/security/test_load_corrupted_metadata.py @@ -20,7 +20,7 @@ from core.test_run import TestRun from storage_devices.ramdisk import RamDisk from test_tools.dd import Dd from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.parametrizex("cache_mode", CacheMode) diff --git a/test/functional/tests/security/test_security_user.py b/test/functional/tests/security/test_security_user.py index b7aa5db..ef20c1d 100644 --- a/test/functional/tests/security/test_security_user.py +++ b/test/functional/tests/security/test_security_user.py @@ -16,7 +16,7 @@ from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_tools.os_tools import create_user, check_if_user_exists from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" system_casadm_bin_path = "/sbin/casadm" diff --git a/test/functional/tests/stats/test_block_stats.py b/test/functional/tests/stats/test_block_stats.py index 08c106d..b45121c 100644 --- a/test/functional/tests/stats/test_block_stats.py +++ b/test/functional/tests/stats/test_block_stats.py @@ -16,7 +16,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit iterations = 10 dd_block_size = Size(1, Unit.Blocks4096) diff --git a/test/functional/tests/stats/test_consistency_between_outputs.py b/test/functional/tests/stats/test_consistency_between_outputs.py index cf60acf..bbc30cf 100644 --- a/test/functional/tests/stats/test_consistency_between_outputs.py +++ b/test/functional/tests/stats/test_consistency_between_outputs.py @@ -13,7 +13,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit iterations = 64 cache_size = Size(8, Unit.GibiByte) diff --git a/test/functional/tests/stats/test_display_statistics.py b/test/functional/tests/stats/test_display_statistics.py index ab8c55b..468ff37 100644 --- a/test/functional/tests/stats/test_display_statistics.py +++ b/test/functional/tests/stats/test_display_statistics.py @@ -27,7 +27,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine -from types.size import Size, Unit +from type_def.size import Size, Unit # One cache instance per every cache mode: caches_count = len(CacheMode) diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index a2210a3..5fdf6a1 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -29,7 +29,7 @@ from test_utils.filesystem.file import File from test_tools.os_tools import sync from test_tools.udev import Udev from connection.utils.output import CmdException -from types.size import Size, Unit +from type_def.size import Size, Unit IoClass = ioclass_config.IoClass diff --git a/test/functional/tests/stats/test_stat_max.py b/test/functional/tests/stats/test_stat_max.py index c0ea5f1..815cd45 100644 --- a/test/functional/tests/stats/test_stat_max.py +++ b/test/functional/tests/stats/test_stat_max.py @@ -17,7 +17,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit cache_size = Size(1, Unit.GibiByte) core_size = Size(2, Unit.GibiByte) diff --git a/test/functional/tests/stats/test_statistics_integrity.py b/test/functional/tests/stats/test_statistics_integrity.py index 039caaf..8a67679 100644 --- a/test/functional/tests/stats/test_statistics_integrity.py +++ b/test/functional/tests/stats/test_statistics_integrity.py @@ -17,7 +17,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.udev import Udev -from types.size import Size, Unit +from type_def.size import Size, Unit # One cache instance per every cache mode: caches_count = len(CacheMode) diff --git a/test/functional/tests/stress/test_stress_attach_detach.py b/test/functional/tests/stress/test_stress_attach_detach.py index e468986..f10a29f 100644 --- a/test/functional/tests/stress/test_stress_attach_detach.py +++ b/test/functional/tests/stress/test_stress_attach_detach.py @@ -9,7 +9,7 @@ import random from api.cas import casadm from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from types.size import Size, Unit +from type_def.size import Size, Unit @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/stress/test_stress_change_io_class_config_io.py b/test/functional/tests/stress/test_stress_change_io_class_config_io.py index 391998a..224858c 100644 --- a/test/functional/tests/stress/test_stress_change_io_class_config_io.py +++ b/test/functional/tests/stress/test_stress_change_io_class_config_io.py @@ -19,7 +19,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine from connection.utils.asynchronous import start_async_func -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.io_class.io_class_common import generate_and_load_random_io_class_config diff --git a/test/functional/tests/stress/test_stress_cleaning_policy_change.py b/test/functional/tests/stress/test_stress_cleaning_policy_change.py index 0e0bfa4..a194dd8 100644 --- a/test/functional/tests/stress/test_stress_cleaning_policy_change.py +++ b/test/functional/tests/stress/test_stress_cleaning_policy_change.py @@ -15,7 +15,7 @@ from api.cas.cache_config import ( from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit from test_tools.udev import Udev from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine diff --git a/test/functional/tests/stress/test_stress_io_small_device.py b/test/functional/tests/stress/test_stress_io_small_device.py index 5a3b07a..fc362ba 100644 --- a/test/functional/tests/stress/test_stress_io_small_device.py +++ b/test/functional/tests/stress/test_stress_io_small_device.py @@ -12,7 +12,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet from test_tools.fio.fio import Fio from test_tools.fio.fio_param import CpusAllowedPolicy, IoEngine, ReadWrite -from types.size import Size, Unit +from type_def.size import Size, Unit stress_time = timedelta(minutes=30) diff --git a/test/functional/tests/stress/test_stress_shutdown.py b/test/functional/tests/stress/test_stress_shutdown.py index 76f0225..73712da 100644 --- a/test/functional/tests/stress/test_stress_shutdown.py +++ b/test/functional/tests/stress/test_stress_shutdown.py @@ -13,7 +13,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from types.size import Size, Unit +from type_def.size import Size, Unit cores_number = 2 iterations_per_config = 5 diff --git a/test/functional/tests/stress/test_stress_without_io.py b/test/functional/tests/stress/test_stress_without_io.py index 47da3c4..4710dc6 100644 --- a/test/functional/tests/stress/test_stress_without_io.py +++ b/test/functional/tests/stress/test_stress_without_io.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit iterations_per_config = 50 cas_conf_path = "/etc/opencas/opencas.conf" diff --git a/test/functional/tests/volumes/common.py b/test/functional/tests/volumes/common.py index 35be295..45c8914 100644 --- a/test/functional/tests/volumes/common.py +++ b/test/functional/tests/volumes/common.py @@ -8,7 +8,7 @@ from api.cas.init_config import InitConfig, opencas_conf_path from test_tools import fs_utils from core.test_run import TestRun from test_tools.disk_utils import get_block_device_names_list -from types.size import Size, Unit +from type_def.size import Size, Unit test_file_size = Size(500, Unit.KiloByte) lvm_filters = [ diff --git a/test/functional/tests/volumes/test_discard_on_huge_core.py b/test/functional/tests/volumes/test_discard_on_huge_core.py index 919a219..34c9376 100644 --- a/test/functional/tests/volumes/test_discard_on_huge_core.py +++ b/test/functional/tests/volumes/test_discard_on_huge_core.py @@ -8,7 +8,7 @@ import pytest from api.cas import casadm from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun -from types.size import Size, Unit +from type_def.size import Size, Unit scsi_dev_size_gb = str(40 * 1024) diff --git a/test/functional/tests/volumes/test_many_cores_on_many_lvms.py b/test/functional/tests/volumes/test_many_cores_on_many_lvms.py index fa529ae..1c82e9c 100644 --- a/test/functional/tests/volumes/test_many_cores_on_many_lvms.py +++ b/test/functional/tests/volumes/test_many_cores_on_many_lvms.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet from test_tools import initramfs from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.volumes.common import get_test_configuration diff --git a/test/functional/tests/volumes/test_many_lvms_on_many_cores.py b/test/functional/tests/volumes/test_many_lvms_on_many_cores.py index b70bbae..2a74ead 100644 --- a/test/functional/tests/volumes/test_many_lvms_on_many_cores.py +++ b/test/functional/tests/volumes/test_many_lvms_on_many_cores.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import initramfs from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.volumes.common import get_test_configuration, lvm_filters diff --git a/test/functional/tests/volumes/test_many_lvms_on_single_core.py b/test/functional/tests/volumes/test_many_lvms_on_single_core.py index 9d35668..51407cc 100644 --- a/test/functional/tests/volumes/test_many_lvms_on_single_core.py +++ b/test/functional/tests/volumes/test_many_lvms_on_single_core.py @@ -14,7 +14,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import initramfs from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, VerifyMethod -from types.size import Size, Unit +from type_def.size import Size, Unit from tests.volumes.common import get_test_configuration, lvm_filters diff --git a/test/functional/tests/volumes/test_multilevel_cache_3.py b/test/functional/tests/volumes/test_multilevel_cache_3.py index 160fe60..bee7936 100644 --- a/test/functional/tests/volumes/test_multilevel_cache_3.py +++ b/test/functional/tests/volumes/test_multilevel_cache_3.py @@ -8,7 +8,7 @@ import pytest from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from api.cas.cache import CacheMode, casadm -from types.size import Size, Unit +from type_def.size import Size, Unit from test_tools.disk_utils import Filesystem from .common import create_files_with_md5sums, compare_md5sums diff --git a/test/functional/tests/volumes/test_raid_as_cache.py b/test/functional/tests/volumes/test_raid_as_cache.py index 0312b33..e772465 100644 --- a/test/functional/tests/volumes/test_raid_as_cache.py +++ b/test/functional/tests/volumes/test_raid_as_cache.py @@ -13,7 +13,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.raid import Raid, RaidConfiguration, MetadataVariant, Level from test_tools import fs_utils from test_tools.disk_utils import Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/test" mount_point2 = "/mnt/test2" diff --git a/test/functional/tests/volumes/test_volume_partitions.py b/test/functional/tests/volumes/test_volume_partitions.py index 17565ca..30ef489 100644 --- a/test/functional/tests/volumes/test_volume_partitions.py +++ b/test/functional/tests/volumes/test_volume_partitions.py @@ -12,7 +12,7 @@ from core.test_run import TestRun from storage_devices.partition import Partition from test_tools import fs_utils, disk_utils from test_tools.disk_utils import PartitionTable, Filesystem -from types.size import Size, Unit +from type_def.size import Size, Unit mount_point = "/mnt/cas" cores_number = 16 From 70defbdf0defb3ad046f80166a768cf7a45aa631 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Wed, 11 Dec 2024 18:12:16 +0100 Subject: [PATCH 20/24] Move is_kernel_module_loaded to tools Signed-off-by: Katarzyna Treder --- test/functional/api/cas/installer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py index d4afa45..6743e7c 100644 --- a/test/functional/api/cas/installer.py +++ b/test/functional/api/cas/installer.py @@ -11,6 +11,7 @@ from api.cas import cas_module from api.cas.version import get_installed_cas_version from test_tools import git, os_tools from connection.utils.output import CmdException +from test_tools.os_tools import is_kernel_module_loaded def rsync_opencas_sources(): @@ -98,7 +99,7 @@ def reinstall_opencas(version: str = ""): def check_if_installed(version: str = ""): TestRun.LOGGER.info("Check if Open CAS Linux is installed") output = TestRun.executor.run("which casadm") - modules_loaded = os_utils.is_kernel_module_loaded(cas_module.CasModule.cache.value) + modules_loaded = is_kernel_module_loaded(cas_module.CasModule.cache.value) if output.exit_code != 0 or not modules_loaded: TestRun.LOGGER.info("CAS is not installed") From 940990e37abdd98b27229e12c002753c701178fc Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Wed, 11 Dec 2024 18:12:54 +0100 Subject: [PATCH 21/24] Iostat refactor Signed-off-by: Katarzyna Treder --- .../functional/tests/ci/test_ci_read_write.py | 28 +++++++++---------- .../lazy_writes/test_lazy_writes_clean.py | 2 +- .../tests/lazy_writes/test_wb_throttling.py | 8 ++++-- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/test/functional/tests/ci/test_ci_read_write.py b/test/functional/tests/ci/test_ci_read_write.py index 3821c84..91b54bf 100644 --- a/test/functional/tests/ci/test_ci_read_write.py +++ b/test/functional/tests/ci/test_ci_read_write.py @@ -62,7 +62,7 @@ def test_ci_read(cache_mode): dd.run() with TestRun.step("Collect iostat"): - iostat = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) read_cache_1 = iostat[0].total_reads with TestRun.step("Generate cache hits using reads"): @@ -77,7 +77,7 @@ def test_ci_read(cache_mode): dd.run() with TestRun.step("Collect iostat"): - iostat = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) read_cache_2 = iostat[0].total_reads with TestRun.step("Stop cache"): @@ -117,10 +117,10 @@ def test_ci_write_around_write(): casadm.add_core(cache, core_device) with TestRun.step("Collect iostat before I/O"): - iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device]) + iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device.get_device_id()]) write_core_0 = iostat_core[0].total_writes - iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) write_cache_0 = iostat_cache[0].total_writes with TestRun.step("Submit writes to exported object"): @@ -136,11 +136,11 @@ def test_ci_write_around_write(): dd.run() with TestRun.step("Collect iostat"): - iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device]) + iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device.get_device_id()]) write_core_1 = iostat_core[0].total_writes read_core_1 = iostat_core[0].total_reads - iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) write_cache_1 = iostat_cache[0].total_writes read_cache_1 = iostat_cache[0].total_reads @@ -156,10 +156,10 @@ def test_ci_write_around_write(): dd.run() with TestRun.step("Collect iostat"): - iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device]) + iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device.get_device_id()]) read_core_2 = iostat_core[0].total_reads - iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) read_cache_2 = iostat_cache[0].total_reads with TestRun.step("Stop cache"): @@ -221,10 +221,10 @@ def test_ci_write_through_write(): casadm.add_core(cache, core_device) with TestRun.step("Collect iostat before I/O"): - iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device]) + iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device.get_device_id()]) write_core_0 = iostat_core[0].total_writes - iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) write_cache_0 = iostat_cache[0].total_writes with TestRun.step("Insert data into the cache using writes"): @@ -241,11 +241,11 @@ def test_ci_write_through_write(): dd.run() with TestRun.step("Collect iostat"): - iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device]) + iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device.get_device_id()]) write_core_1 = iostat_core[0].total_writes read_core_1 = iostat_core[0].total_reads - iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) write_cache_1 = iostat_cache[0].total_writes read_cache_1 = iostat_cache[0].total_reads @@ -262,10 +262,10 @@ def test_ci_write_through_write(): dd.run() with TestRun.step("Collect iostat"): - iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device]) + iostat_core = IOstatBasic.get_iostat_list([core_device.parent_device.get_device_id()]) read_core_2 = iostat_core[0].total_reads - iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device]) + iostat_cache = IOstatBasic.get_iostat_list([cache_device.parent_device.get_device_id()]) read_cache_2 = iostat_cache[0].total_reads with TestRun.step("Stop cache"): 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 b6405f2..e4b8647 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py @@ -372,4 +372,4 @@ def test_clean_remove_core_without_fs(cache_mode): def check_device_write_stats(device: Device): - return IOstatBasic.get_iostat_list(devices_list=[device])[0].total_writes.value + return IOstatBasic.get_iostat_list(devices_list=[device.get_device_id()])[0].total_writes.value diff --git a/test/functional/tests/lazy_writes/test_wb_throttling.py b/test/functional/tests/lazy_writes/test_wb_throttling.py index 158dae5..39e9b50 100644 --- a/test/functional/tests/lazy_writes/test_wb_throttling.py +++ b/test/functional/tests/lazy_writes/test_wb_throttling.py @@ -89,10 +89,14 @@ def test_wb_throttling(): with TestRun.step("Wait for IO processes to finish and print debug informations"): sleep_interval = timedelta(seconds=5) eta = runtime - while eta.total_seconds() > 0: + while int(eta.total_seconds()) > 0: # Instead of explicit sleeping with `time.sleep()` iostat is used for waiting iostat = IOstatExtended.get_iostat_list( - [core, cache_device, core_device], + [ + core.get_device_id(), + cache_device.get_device_id(), + core_device.get_device_id() + ], since_boot=False, interval=int(sleep_interval.total_seconds()), ) From f7e7d3aa7fda85eb392de6ef51b9485c89e53929 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Wed, 11 Dec 2024 18:58:26 +0100 Subject: [PATCH 22/24] Disk tools and fs tools refactor Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cas_packaging.py | 2 +- test/functional/api/cas/cas_service.py | 2 +- test/functional/api/cas/core.py | 5 +++-- test/functional/api/cas/init_config.py | 2 +- test/functional/api/cas/ioclass_config.py | 2 +- test/functional/test-framework | 2 +- .../512b/test_different_io_sizes_support.py | 4 ++-- test/functional/tests/basic/test_basic.py | 4 ++-- .../tests/cache_ops/test_core_remove.py | 7 ++++--- .../cache_ops/test_multistream_seq_cutoff.py | 5 +++-- test/functional/tests/cli/test_cli_standby.py | 5 +++-- .../tests/cli/test_zero_metadata_command.py | 5 +++-- test/functional/tests/conftest.py | 4 ++-- .../data_integrity/test_data_integrity_5d.py | 4 ++-- test/functional/tests/example/example_test.py | 8 ++++---- .../failover_standby/test_failover_advanced.py | 3 +-- .../failover_standby/test_failover_multihost.py | 5 ++--- .../test_fault_injection_interrupts.py | 13 +++++++------ .../test_fault_injection_opencas_load.py | 2 +- .../test_fault_injection_with_mounted_core.py | 11 ++++++----- ...est_standby_activate_different_cache_path.py | 2 +- .../tests/incremental_load/test_core_pool.py | 7 ++++--- .../incremental_load/test_incremental_load.py | 2 +- .../tests/initialize/test_clean_reboot.py | 2 +- .../initialize/test_initialize_runlevel.py | 2 +- .../tests/initialize/test_recovery.py | 3 +-- .../initialize/test_startup_init_config.py | 2 +- test/functional/tests/io/test_io_engines.py | 5 +++-- test/functional/tests/io/trim/test_trim.py | 8 +++++--- .../tests/io/trim/test_trim_stress.py | 2 +- .../tests/io_class/test_io_class_cli.py | 2 +- .../tests/io_class/test_io_class_directory.py | 11 ++++++----- .../io_class/test_io_class_eviction_priority.py | 7 ++++--- .../tests/io_class/test_io_class_file.py | 13 +++++++------ .../tests/io_class/test_io_class_lvm_on_cas.py | 7 ++++--- .../tests/io_class/test_io_class_occupancy.py | 11 ++++++----- .../io_class/test_io_class_occupancy_load.py | 7 ++++--- .../io_class/test_io_class_occupancy_repart.py | 7 ++++--- .../io_class/test_io_class_occupancy_resize.py | 7 ++++--- .../io_class/test_io_class_pinning_eviction.py | 10 +++++----- ...test_io_class_prevent_wrong_configuration.py | 2 +- .../tests/io_class/test_io_class_purge.py | 7 ++++--- .../io_class/test_io_class_service_support.py | 7 ++++--- .../test_io_class_stats_file_size_core.py | 4 ++-- .../tests/io_class/test_io_classification.py | 17 +++++++++-------- .../recovery/recovery_tests_methods.py | 2 +- .../recovery/test_recovery_all_options.py | 5 +++-- .../recovery/test_recovery_flush_reset.py | 6 +++--- .../recovery/test_recovery_unplug.py | 5 +++-- .../lazy_writes/test_flush_huge_dirty_data.py | 8 ++++---- .../tests/lazy_writes/test_lazy_writes_clean.py | 6 +++--- .../lazy_writes/test_lazy_writes_signals.py | 8 ++++---- .../tests/misc/test_device_capabilities.py | 2 +- .../tests/misc/test_files_permissions.py | 2 +- .../tests/misc/test_flush_propagation.py | 8 ++++---- test/functional/tests/misc/test_weak_modules.py | 2 +- .../progress_bar/test_progress_bar_big_files.py | 3 +-- .../test_progress_bar_output_redirection.py | 3 +-- .../test_progress_bar_wt_cache_mode.py | 3 +-- .../security/fuzzy/kernel/common/common.py | 5 +++-- .../tests/security/test_compilation_flags.py | 2 +- .../tests/security/test_security_user.py | 9 +++++---- .../stats/test_consistency_between_outputs.py | 5 +++-- .../tests/stats/test_ioclass_stats.py | 5 +++-- .../test_stress_change_io_class_config_io.py | 2 +- .../test_stress_cleaning_policy_change.py | 5 +++-- .../tests/stress/test_stress_without_io.py | 4 ++-- test/functional/tests/volumes/common.py | 4 ++-- .../tests/volumes/test_multilevel_cache_3.py | 2 +- .../tests/volumes/test_raid_as_cache.py | 4 ++-- .../tests/volumes/test_volume_partitions.py | 10 ++++++---- 71 files changed, 197 insertions(+), 172 deletions(-) diff --git a/test/functional/api/cas/cas_packaging.py b/test/functional/api/cas/cas_packaging.py index 11d5b6b..ae90c5c 100644 --- a/test/functional/api/cas/cas_packaging.py +++ b/test/functional/api/cas/cas_packaging.py @@ -9,7 +9,7 @@ import os import re from core.test_run import TestRun -from test_tools.fs_utils import check_if_directory_exists, find_all_files +from test_tools.fs_tools import check_if_directory_exists, find_all_files from test_tools.linux_packaging import DebSet, RpmSet diff --git a/test/functional/api/cas/cas_service.py b/test/functional/api/cas/cas_service.py index ea18a5d..32b8609 100644 --- a/test/functional/api/cas/cas_service.py +++ b/test/functional/api/cas/cas_service.py @@ -9,7 +9,7 @@ from datetime import timedelta from string import Template from textwrap import dedent -from test_tools.fs_utils import ( +from test_tools.fs_tools import ( check_if_directory_exists, create_directory, write_file, diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py index 37e50b9..e61c534 100644 --- a/test/functional/api/cas/core.py +++ b/test/functional/api/cas/core.py @@ -8,6 +8,7 @@ from datetime import timedelta from typing import List from enum import Enum +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import SeqCutOffParameters, SeqCutOffPolicy from api.cas.casadm_params import StatsFilter @@ -15,7 +16,7 @@ from api.cas.casadm_parser import get_seq_cut_off_parameters, get_core_info_for_ from api.cas.statistics import CoreStats, CoreIoClassStats from core.test_run_utils import TestRun from storage_devices.device import Device -from test_tools import fs_utils, disk_utils +from test_tools import fs_tools, disk_tools from test_tools.os_tools import sync from test_tools.common.wait import wait from type_def.size import Unit, Size @@ -50,7 +51,7 @@ class Core(Device): return get_core_info_for_cache_by_path(core_disk_path=self.core_device.path, target_cache_id=self.cache_id) - def create_filesystem(self, fs_type: disk_utils.Filesystem, force=True, blocksize=None): + def create_filesystem(self, fs_type: test_tools.fs_utils.Filesystem, force=True, blocksize=None): super().create_filesystem(fs_type, force, blocksize) self.core_device.filesystem = self.filesystem diff --git a/test/functional/api/cas/init_config.py b/test/functional/api/cas/init_config.py index 3418a6f..7f6cf25 100644 --- a/test/functional/api/cas/init_config.py +++ b/test/functional/api/cas/init_config.py @@ -7,7 +7,7 @@ from api.cas import casadm_parser from api.cas.cache_config import CacheMode from storage_devices.device import Device -from test_tools import fs_utils +from test_tools import fs_tools opencas_conf_path = "/etc/opencas/opencas.conf" diff --git a/test/functional/api/cas/ioclass_config.py b/test/functional/api/cas/ioclass_config.py index 0613b93..4c64377 100644 --- a/test/functional/api/cas/ioclass_config.py +++ b/test/functional/api/cas/ioclass_config.py @@ -14,7 +14,7 @@ from datetime import timedelta from packaging import version from core.test_run import TestRun -from test_tools import fs_utils +from test_tools import fs_tools from test_tools.os_tools import get_kernel_version default_config_file_path = "/tmp/opencas_ioclass.conf" diff --git a/test/functional/test-framework b/test/functional/test-framework index 6970a43..e656aa1 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 6970a4310790fc56023661a5c7c1bddca714ceba +Subproject commit e656aa1e5fdb2c5b063baf0307c58b50ab1d24c4 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 0c7e24f..0948042 100644 --- a/test/functional/tests/512b/test_different_io_sizes_support.py +++ b/test/functional/tests/512b/test_different_io_sizes_support.py @@ -12,8 +12,8 @@ from core.test_run import TestRun from api.cas import casadm 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_tools import fs_tools +from test_tools.fs_tools import Filesystem from type_def.size import Size, Unit from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine diff --git a/test/functional/tests/basic/test_basic.py b/test/functional/tests/basic/test_basic.py index 7381879..b7541d6 100644 --- a/test/functional/tests/basic/test_basic.py +++ b/test/functional/tests/basic/test_basic.py @@ -17,9 +17,9 @@ from api.cas.cli_messages import ( ) from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils +from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_utils.filesystem.file import File from connection.utils.output import CmdException from type_def.size import Size, Unit diff --git a/test/functional/tests/cache_ops/test_core_remove.py b/test/functional/tests/cache_ops/test_core_remove.py index a7b3aa7..bcf9efc 100644 --- a/test/functional/tests/cache_ops/test_core_remove.py +++ b/test/functional/tests/cache_ops/test_core_remove.py @@ -8,10 +8,11 @@ import random import pytest +import test_tools.fs_tools from api.cas import casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from connection.utils.output import CmdException from type_def.size import Size, Unit @@ -46,7 +47,7 @@ def test_remove_core_when_other_mounted_auto_numeration(): free_core = cache.add_core(core_device.partitions[0]) mounted_cores = [] for i, part in enumerate(core_device.partitions[1:]): - part.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) mounted_cores.append(cache.add_core(part)) mounted_cores[i].mount( mount_point=f"{mount_point}{cache.cache_id}-{mounted_cores[i].core_id}" @@ -90,7 +91,7 @@ def test_remove_core_when_other_mounted_custom_numeration(): mounted_cores = [] for i, part in enumerate(core_device.partitions[1:]): - part.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) mounted_cores.append( cache.add_core(core_dev=part, core_id=int(f"{random_prefix}{random_interfix}{i}")) ) 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 65face6..e65a348 100644 --- a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py @@ -10,6 +10,7 @@ from time import sleep import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import ( CacheMode, @@ -21,7 +22,7 @@ from api.cas.casadm_params import StatsFilter from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskTypeLowerThan, DiskType from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.udev import Udev @@ -222,7 +223,7 @@ def test_multistream_seq_cutoff_stress_fs(streams_seq_rand, filesystem, cache_mo with TestRun.step("Create filesystem on core device"): cache_disk = TestRun.disks["cache"] core_disk = TestRun.disks["core"] - core_disk.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step("Start cache and add core"): cache = casadm.start_cache(cache_dev=cache_disk, cache_mode=cache_mode, force=True) diff --git a/test/functional/tests/cli/test_cli_standby.py b/test/functional/tests/cli/test_cli_standby.py index e9b9c80..089df28 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/test/functional/tests/cli/test_cli_standby.py @@ -6,6 +6,7 @@ import pytest +import test_tools.fs_tools from api.cas import casadm, casadm_parser, dmesg from api.cas.casadm import standby_init from api.cas.cli import casadm_bin, standby_init_cmd @@ -13,7 +14,7 @@ from core.test_run import TestRun from storage_devices.device import Device from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import sync from connection.utils.output import CmdException @@ -557,7 +558,7 @@ def test_standby_init_with_preexisting_filesystem(filesystem): cache_id = 1 with TestRun.step("Create filesystem on cache device partition"): - cache_device.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step("Try initialize cache without force flag"): output = TestRun.executor.run( diff --git a/test/functional/tests/cli/test_zero_metadata_command.py b/test/functional/tests/cli/test_zero_metadata_command.py index 92d63e6..30ed319 100644 --- a/test/functional/tests/cli/test_zero_metadata_command.py +++ b/test/functional/tests/cli/test_zero_metadata_command.py @@ -8,11 +8,12 @@ from datetime import timedelta import pytest +import test_tools.fs_tools from api.cas import casadm, cli_messages, cli from api.cas.cache_config import CacheMode, CleaningPolicy from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools.disk_utils import get_device_filesystem_type, Filesystem +from test_tools.fs_tools import Filesystem, get_device_filesystem_type from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.disk_finder import get_system_disks @@ -98,7 +99,7 @@ def test_zero_metadata_filesystem(filesystem): cache_dev, core_disk, cache_disk = prepare_devices() with TestRun.step("Create filesystem on core device."): - core_disk.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step("Start cache and add core."): cache = casadm.start_cache(cache_dev, force=True) diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index 648362e..2e42d24 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -25,10 +25,10 @@ from storage_devices.raid import Raid from storage_devices.ramdisk import RamDisk from test_tools.os_tools import kill_all_io from test_tools.udev import Udev -from test_tools.disk_utils import PartitionTable, create_partition_table +from test_tools.disk_tools import PartitionTable, create_partition_table from test_tools.device_mapper import DeviceMapper from test_tools.mdadm import Mdadm -from test_tools.fs_utils import remove +from test_tools.fs_tools import remove from test_tools import initramfs, git from log.logger import create_log, Log from test_utils.common.singleton import Singleton 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 dcfc93c..98b0c93 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_5d.py +++ b/test/functional/tests/data_integrity/test_data_integrity_5d.py @@ -12,8 +12,8 @@ import pytest from api.cas import casadm from api.cas.cache_config import CacheMode from core.test_run import TestRun -from test_tools import fs_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools +from test_tools.fs_tools import Filesystem 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 diff --git a/test/functional/tests/example/example_test.py b/test/functional/tests/example/example_test.py index e27b385..1da80f3 100644 --- a/test/functional/tests/example/example_test.py +++ b/test/functional/tests/example/example_test.py @@ -6,6 +6,7 @@ import pytest from collections import namedtuple +import test_tools.fs_tools from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from storage_devices.raid import Raid, RaidConfiguration, MetadataVariant, Level @@ -13,9 +14,8 @@ from storage_devices.ramdisk import RamDisk from test_utils.drbd import Resource, Node 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 +from test_tools import fs_tools +from test_tools.fs_tools import copy, Filesystem from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File from type_def.size import Size, Unit @@ -52,7 +52,7 @@ def test_create_example_partitions(): test_disk.create_partitions(part_sizes) for i in TestRun.iteration(range(0, 5)): with TestRun.step(f"Create filesystem on partition {i}"): - test_disk.partitions[i].create_filesystem(Filesystem.ext3) + test_tools.fs_utils.create_filesystem(Filesystem.ext3) @pytest.mark.require_disk("cache1", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/failover_standby/test_failover_advanced.py b/test/functional/tests/failover_standby/test_failover_advanced.py index 2bfde1a..c67c6b8 100644 --- a/test/functional/tests/failover_standby/test_failover_advanced.py +++ b/test/functional/tests/failover_standby/test_failover_advanced.py @@ -22,11 +22,10 @@ from core.test_run import TestRun 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.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 create_directory +from test_tools.fs_tools import create_directory, Filesystem from test_utils.drbd import Resource, Node from type_def.size import Size, Unit diff --git a/test/functional/tests/failover_standby/test_failover_multihost.py b/test/functional/tests/failover_standby/test_failover_multihost.py index 467f83f..69c2caf 100644 --- a/test/functional/tests/failover_standby/test_failover_multihost.py +++ b/test/functional/tests/failover_standby/test_failover_multihost.py @@ -21,15 +21,14 @@ 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.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_tools.fs_tools import readlink, Filesystem from test_utils.drbd import Resource, Node from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Size, Unit -from test_tools import fs_utils +from test_tools import fs_tools cache_id = 5 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 871a27d..15508da 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_interrupts.py +++ b/test/functional/tests/fault_injection/test_fault_injection_interrupts.py @@ -6,14 +6,15 @@ import pytest +import test_tools.fs_tools from api.cas import casadm, casadm_parser, cli from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait from api.cas.casadm_parser import wait_for_flushing from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils +from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.os_tools import DropCachesMode, sync, drop_caches from test_tools.udev import Udev from type_def.size import Size, Unit @@ -54,7 +55,7 @@ def test_interrupt_core_flush(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it."): - core_part.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) @@ -138,7 +139,7 @@ def test_interrupt_cache_flush(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it."): - core_part.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) @@ -225,7 +226,7 @@ def test_interrupt_core_remove(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it"): - core_part.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) @@ -442,7 +443,7 @@ def test_interrupt_cache_stop(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it."): - core_part.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) 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 c88bc63..cc85625 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,7 +11,7 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait from tests.lazy_writes.recovery.recovery_tests_methods import copy_file, compare_files from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils +from test_tools import fs_tools from type_def.size import Size, Unit mount_point = "/mnt/cas" 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 c20bd14..25c665b 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 @@ -6,11 +6,12 @@ import pytest +import test_tools.fs_tools 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_tools import fs_utils, disk_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools, disk_tools +from test_tools.fs_tools import Filesystem from test_utils.filesystem.file import File from test_utils.filesystem.symlink import Symlink from type_def.size import Size, Unit @@ -41,7 +42,7 @@ def test_load_cache_with_mounted_core(): cache = casadm.start_cache(cache_part, force=True) with TestRun.step("Add core device with xfs filesystem to cache and mount it."): - core_part.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core = cache.add_core(core_part) core.mount(mount_point) @@ -116,7 +117,7 @@ def test_stop_cache_with_mounted_partition(): with TestRun.step("Create xfs filesystems on one exported object partition " "and on the non-partitioned exported object."): - fs_part.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core2.create_filesystem(Filesystem.xfs) with TestRun.step("Mount created filesystems."): @@ -180,7 +181,7 @@ def test_stop_cache_with_mounted_partition_no_mtab(): cache = casadm.start_cache(cache_part, force=True) with TestRun.step("Add core device with xfs filesystem and mount it."): - core_part.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core = cache.add_core(core_part) core.mount(mount_point) 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 927b10b..8288e41 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 @@ -15,7 +15,7 @@ from type_def.size import Size, Unit from api.cas.cache_config import CacheLineSize from api.cas.cache import CacheStatus from test_tools.dd import Dd -from test_tools.fs_utils import check_if_symlink_exists +from test_tools.fs_tools import check_if_symlink_exists from test_tools.os_tools import sync diff --git a/test/functional/tests/incremental_load/test_core_pool.py b/test/functional/tests/incremental_load/test_core_pool.py index 376af5c..c4a808a 100644 --- a/test/functional/tests/incremental_load/test_core_pool.py +++ b/test/functional/tests/incremental_load/test_core_pool.py @@ -5,11 +5,12 @@ import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas.core import CoreStatus from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from connection.utils.output import CmdException from type_def.size import Size, Unit @@ -89,7 +90,7 @@ def test_core_pool_exclusive_open(): core_disk = TestRun.disks["core"] core_disk.create_partitions([Size(1, Unit.GibiByte)]) core_dev = core_disk.partitions[0] - core_dev.create_filesystem(Filesystem.ext4) + test_tools.fs_utils.create_filesystem(Filesystem.ext4) cache_id = 1 core_id = 1 @@ -126,7 +127,7 @@ def test_core_pool_exclusive_open(): with TestRun.step("Check if it is impossible to make filesystem on the core device " "from core pool."): try: - core_dev.create_filesystem(Filesystem.ext4, force=False) + test_tools.fs_utils.create_filesystem(Filesystem.ext4, force=False) TestRun.fail("Successfully created filesystem on core from core pool, " "this is unexpected behaviour.") except Exception: diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index 32f947d..8a83c88 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -25,7 +25,7 @@ from api.cas.statistics import CacheStats from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.filesystem.file import File diff --git a/test/functional/tests/initialize/test_clean_reboot.py b/test/functional/tests/initialize/test_clean_reboot.py index 769c1cd..ad09d06 100644 --- a/test/functional/tests/initialize/test_clean_reboot.py +++ b/test/functional/tests/initialize/test_clean_reboot.py @@ -12,7 +12,7 @@ from api.cas.cache_config import CacheMode from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import drop_caches, DropCachesMode, sync from type_def.size import Size, Unit diff --git a/test/functional/tests/initialize/test_initialize_runlevel.py b/test/functional/tests/initialize/test_initialize_runlevel.py index 81b200f..00f1a4c 100644 --- a/test/functional/tests/initialize/test_initialize_runlevel.py +++ b/test/functional/tests/initialize/test_initialize_runlevel.py @@ -13,7 +13,7 @@ from api.cas.cache_config import CacheMode from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskTypeLowerThan, DiskTypeSet, DiskType -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.os_tools import sync, drop_caches diff --git a/test/functional/tests/initialize/test_recovery.py b/test/functional/tests/initialize/test_recovery.py index 1cd8be2..c77309a 100644 --- a/test/functional/tests/initialize/test_recovery.py +++ b/test/functional/tests/initialize/test_recovery.py @@ -14,8 +14,7 @@ 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 -from test_tools.fs_utils import check_if_file_exists +from test_tools.fs_tools import check_if_file_exists, Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import sync from type_def.size import Size, Unit diff --git a/test/functional/tests/initialize/test_startup_init_config.py b/test/functional/tests/initialize/test_startup_init_config.py index e02824f..be0dcee 100644 --- a/test/functional/tests/initialize/test_startup_init_config.py +++ b/test/functional/tests/initialize/test_startup_init_config.py @@ -14,7 +14,7 @@ from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_utils.filesystem.file import File -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools import fstab from test_tools.dd import Dd from type_def.size import Unit, Size diff --git a/test/functional/tests/io/test_io_engines.py b/test/functional/tests/io/test_io_engines.py index e4c9fc0..29f9b62 100644 --- a/test/functional/tests/io/test_io_engines.py +++ b/test/functional/tests/io/test_io_engines.py @@ -7,11 +7,12 @@ from datetime import timedelta import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, CpusAllowedPolicy, ReadWrite from test_tools.os_tools import get_dut_cpu_physical_cores @@ -47,7 +48,7 @@ def test_io_engines(cache_mode, filesystem, io_engine): cache = casadm.start_cache(cache_dev, cache_mode, force=True) TestRun.LOGGER.info(f"Create filesystem '{filesystem}' on '{core_dev.path}'") - core_dev.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core = cache.add_core(core_dev) core.mount(mount_point) diff --git a/test/functional/tests/io/trim/test_trim.py b/test/functional/tests/io/trim/test_trim.py index cb48057..9783c1b 100644 --- a/test/functional/tests/io/trim/test_trim.py +++ b/test/functional/tests/io/trim/test_trim.py @@ -8,15 +8,17 @@ import time import pytest +import test_tools.fs_tools from test_tools.os_tools import sync, drop_caches from test_tools.udev import Udev from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet -from test_tools import fs_utils +from test_tools import fs_tools from test_tools.blktrace import BlkTrace, BlkTraceMask, RwbsKind -from test_tools.disk_utils import Filesystem, check_if_device_supports_trim +from test_tools.disk_tools import check_if_device_supports_trim +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from type_def.size import Size, Unit @@ -228,7 +230,7 @@ def test_trim_device_discard_support( cache = casadm.start_cache(cache_dev, cache_mode, force=True) cache.set_cleaning_policy(cleaning_policy) - core_dev.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core = cache.add_core(core_dev) with TestRun.step("Mount filesystem with discard option."): diff --git a/test/functional/tests/io/trim/test_trim_stress.py b/test/functional/tests/io/trim/test_trim_stress.py index 9ca60be..bea27d8 100644 --- a/test/functional/tests/io/trim/test_trim_stress.py +++ b/test/functional/tests/io/trim/test_trim_stress.py @@ -10,7 +10,7 @@ from api.cas import casadm 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_tools.fs_tools import Filesystem from type_def.size import Size, Unit 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 73feb62..ba9fb4f 100644 --- a/test/functional/tests/io_class/test_io_class_cli.py +++ b/test/functional/tests/io_class/test_io_class_cli.py @@ -12,7 +12,7 @@ from api.cas.casadm_params import OutputFormat 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_tools import fs_tools from type_def.size import Size, Unit ioclass_config_path = "/tmp/opencas_ioclass.conf" diff --git a/test/functional/tests/io_class/test_io_class_directory.py b/test/functional/tests/io_class/test_io_class_directory.py index b7f264b..b22e0ae 100644 --- a/test/functional/tests/io_class/test_io_class_directory.py +++ b/test/functional/tests/io_class/test_io_class_directory.py @@ -9,12 +9,13 @@ from datetime import datetime import pytest +import test_tools.fs_tools from api.cas import ioclass_config, casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils +from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File from test_tools.os_tools import drop_caches, DropCachesMode, sync @@ -46,7 +47,7 @@ def test_ioclass_directory_depth(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem and mount {core.path} " f"at {mountpoint}." ): - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -178,7 +179,7 @@ def test_ioclass_directory_file_operations(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem " f"and mounting {core.path} at {mountpoint}." ): - core.create_filesystem(fs_type=filesystem) + test_tools.fs_utils.create_filesystem(fs_type=filesystem) core.mount(mount_point=mountpoint) sync() @@ -346,7 +347,7 @@ def test_ioclass_directory_dir_operations(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem " f"and mount {core.path} at {mountpoint}." ): - core.create_filesystem(fs_type=filesystem) + test_tools.fs_utils.create_filesystem(fs_type=filesystem) core.mount(mount_point=mountpoint) sync() diff --git a/test/functional/tests/io_class/test_io_class_eviction_priority.py b/test/functional/tests/io_class/test_io_class_eviction_priority.py index feeec0a..cbd1352 100644 --- a/test/functional/tests/io_class/test_io_class_eviction_priority.py +++ b/test/functional/tests/io_class/test_io_class_eviction_priority.py @@ -8,9 +8,10 @@ from math import isclose import pytest +import test_tools.fs_tools from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools +from test_tools.fs_tools import Filesystem from .io_class_common import * @@ -37,7 +38,7 @@ def test_io_class_eviction_priority(): with TestRun.step(f"Preparing filesystem and mounting {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() 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 ac01f18..cf4b891 100644 --- a/test/functional/tests/io_class/test_io_class_file.py +++ b/test/functional/tests/io_class/test_io_class_file.py @@ -7,11 +7,12 @@ import random import pytest +import test_tools.fs_tools from api.cas import ioclass_config, casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import sync, DropCachesMode, drop_caches from type_def.size import Size, Unit @@ -56,7 +57,7 @@ def test_ioclass_file_extension(): casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}."): - core.create_filesystem(Filesystem.ext3) + test_tools.fs_utils.create_filesystem(Filesystem.ext3) core.mount(mountpoint) with TestRun.step("Flush cache."): @@ -123,7 +124,7 @@ def test_ioclass_file_name_prefix(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): previous_occupancy = cache.get_occupancy() - core.create_filesystem(Filesystem.ext3) + test_tools.fs_utils.create_filesystem(Filesystem.ext3) core.mount(mountpoint) current_occupancy = cache.get_occupancy() @@ -209,7 +210,7 @@ def test_ioclass_file_extension_preexisting_filesystem(): with TestRun.step(f"Prepare files on raw block device."): casadm.remove_core(cache.cache_id, core_id=core.core_id) - core.core_device.create_filesystem(Filesystem.ext3) + test_tools.fs_utils.create_filesystem(Filesystem.ext3) core.core_device.mount(mountpoint) for ext in extensions: @@ -291,7 +292,7 @@ def test_ioclass_file_offset(): casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}."): - core.create_filesystem(Filesystem.ext3) + test_tools.fs_utils.create_filesystem(Filesystem.ext3) core.mount(mountpoint) with TestRun.step("Flush cache."): @@ -383,7 +384,7 @@ def test_ioclass_file_size(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem and mount {core.path} " f"at {mountpoint}." ): - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() 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 ec5cab1..5ec1e87 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 @@ -6,14 +6,15 @@ import pytest +import test_tools.fs_tools from api.cas import casadm, ioclass_config from api.cas.cache_config import CacheMode from api.cas.ioclass_config import IoClass from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.lvm import Lvm, LvmConfiguration -from test_tools import fs_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from type_def.size import Size, Unit @@ -58,7 +59,7 @@ def test_io_class_lvm_on_cas(): lvm = lvms[0] with TestRun.step("Create filesystem for LVM and mount it."): - lvm.create_filesystem(Filesystem.ext4) + test_tools.fs_utils.create_filesystem(Filesystem.ext4) lvm.mount(mount_point) with TestRun.step("Prepare and load IO class config."): 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 0f3a039..3732806 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/test/functional/tests/io_class/test_io_class_occupancy.py @@ -9,13 +9,14 @@ from math import isclose import pytest +import test_tools.fs_tools 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 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_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Unit, Size @@ -56,7 +57,7 @@ def test_io_class_occupancy_directory_write(io_size_multiplication, cache_mode): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -186,7 +187,7 @@ def test_io_class_occupancy_directory_read(io_size_multiplication): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -316,7 +317,7 @@ def test_ioclass_occupancy_sum_cache(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() diff --git a/test/functional/tests/io_class/test_io_class_occupancy_load.py b/test/functional/tests/io_class/test_io_class_occupancy_load.py index 0c4abc0..3c73ade 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy_load.py +++ b/test/functional/tests/io_class/test_io_class_occupancy_load.py @@ -8,13 +8,14 @@ from math import isclose import pytest +import test_tools.fs_tools 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 storage_devices.device import Device from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.os_tools import sync from test_tools.udev import Udev from tests.io_class.io_class_common import ( @@ -53,7 +54,7 @@ def test_ioclass_occupancy_load(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() 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 501a7a1..6cadf9f 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 @@ -8,13 +8,14 @@ from math import isclose import pytest +import test_tools.fs_tools 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 core.test_run_utils import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Unit @@ -55,7 +56,7 @@ def test_ioclass_repart(io_class_size_multiplication): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() 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 3e01deb..09a11aa 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 @@ -6,13 +6,14 @@ import pytest from recordclass import recordclass +import test_tools.fs_tools 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 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_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Unit @@ -47,7 +48,7 @@ def test_ioclass_resize(cache_line_size, new_occupancy): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() 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 ece7ee3..b01b530 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 @@ -7,11 +7,11 @@ import pytest from collections import namedtuple from math import isclose - +import test_tools.fs_tools from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan 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 test_tools import fs_tools +from test_tools.fs_tools import Filesystem from core.test_run import TestRun from type_def.size import Size, Unit from .io_class_common import ( @@ -44,7 +44,7 @@ def test_io_class_pinning_eviction(): cache_line_count = cache.get_statistics().config_stats.cache_size with TestRun.step("Mount filesystem"): - core.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core.mount(mountpoint) with TestRun.step("Prepare test dirs"): @@ -141,7 +141,7 @@ def test_pinned_ioclasses_eviction(): cache_line_count = cache.get_statistics().config_stats.cache_size with TestRun.step("Mount filesystem"): - core.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core.mount(mountpoint) with TestRun.step("Prepare test dirs"): 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 43540f7..ab3bb5a 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 @@ -9,7 +9,7 @@ from api.cas import ioclass_config, cli_messages 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_tools import fs_tools from connection.utils.output import CmdException from type_def.size import Unit, Size 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 6300d46..6e9e50a 100644 --- a/test/functional/tests/io_class/test_io_class_purge.py +++ b/test/functional/tests/io_class/test_io_class_purge.py @@ -8,12 +8,13 @@ from collections import namedtuple import pytest +import test_tools.fs_tools from api.cas import ioclass_config, casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_utils +from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.os_tools import drop_caches, DropCachesMode, sync from test_tools.udev import Udev from type_def.size import Unit, Size @@ -42,7 +43,7 @@ def test_ioclass_usage_sum(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() 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 d62d244..3da3d73 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 @@ -7,6 +7,7 @@ import os import pytest from datetime import timedelta +import test_tools.fs_tools import test_tools.runlevel from api.cas import ioclass_config, casadm_parser from api.cas.cache_config import CacheMode @@ -15,8 +16,8 @@ from api.cas.init_config import InitConfig from api.cas.ioclass_config import IoClass from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools import fs_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import sync, drop_caches @@ -51,7 +52,7 @@ def test_io_class_service_load(runlevel): run_io_dir_read(core.path) with TestRun.step("Create ext4 filesystem on CAS device and mount it."): - core.create_filesystem(Filesystem.ext4) + test_tools.fs_utils.create_filesystem(Filesystem.ext4) core.mount(mountpoint) with TestRun.step( 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 3d377cd..b5beee0 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 @@ -13,8 +13,8 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.ioclass_config import IoClass from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools import fs_utils -from test_tools.disk_utils import Filesystem +from test_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import sync, drop_caches diff --git a/test/functional/tests/io_class/test_io_classification.py b/test/functional/tests/io_class/test_io_classification.py index 31cf460..b3a5b9b 100644 --- a/test/functional/tests/io_class/test_io_classification.py +++ b/test/functional/tests/io_class/test_io_classification.py @@ -9,13 +9,14 @@ from itertools import permutations import pytest +import test_tools.fs_tools from api.cas import ioclass_config, casadm 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_tools import fs_tools from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.filesystem.file import File @@ -232,7 +233,7 @@ def test_ioclass_direct(filesystem): f"Preparing {filesystem.name} filesystem and mounting {core.path} at" f" {mountpoint}" ) - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() else: @@ -328,7 +329,7 @@ def test_ioclass_metadata(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem and mount {core.path} " f"at {mountpoint}." ): - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -474,7 +475,7 @@ def test_ioclass_id_as_condition(): with TestRun.step( f"Prepare {filesystem.name} filesystem " f"and mount {core.path} at {mountpoint}." ): - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) fs_utils.create_directory(base_dir_path) sync() @@ -615,7 +616,7 @@ def test_ioclass_conditions_or(): with TestRun.step( f"Prepare {filesystem.name} filesystem " f"and mount {core.path} at {mountpoint}." ): - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) for i in range(1, 6): fs_utils.create_directory(f"{mountpoint}/dir{i}") @@ -682,7 +683,7 @@ def test_ioclass_conditions_and(): TestRun.LOGGER.info( f"Preparing {filesystem.name} filesystem " f"and mounting {core.path} at {mountpoint}" ) - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -743,7 +744,7 @@ def test_ioclass_effective_ioclass(): with TestRun.LOGGER.step( f"Preparing {filesystem.name} filesystem " f"and mounting {core.path} at {mountpoint}" ): - core.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) core.mount(mountpoint) fs_utils.create_directory(test_dir) sync() 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 8f1a0eb..8b97e09 100644 --- a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py +++ b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py @@ -7,7 +7,7 @@ from datetime import timedelta import test_tools.common.wait from core.test_run import TestRun -from test_tools import fs_utils +from test_tools import fs_tools from test_tools.dd import Dd from test_utils.filesystem.file import File from type_def.size import Size, Unit 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 674f7ae..38c1b3f 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 @@ -7,12 +7,13 @@ import os import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait, CacheLineSize, CleaningPolicy, \ FlushParametersAcp from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.filesystem.file import File @@ -57,7 +58,7 @@ def test_recovery_all_options(cache_mode, cache_line_size, cleaning_policy, file file_md5 = test_file.md5sum() with TestRun.step(f"Make {filesystem} on core device."): - core_device.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step("Mount core device."): core_device.mount(mount_point) 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 28bfb33..7ebcce3 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 @@ -7,12 +7,12 @@ import os import pytest +import test_tools.fs_tools from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools.disk_utils import Filesystem -from test_tools.fs_utils import readlink +from test_tools.fs_tools import readlink, Filesystem from test_tools.os_tools import DropCachesMode, sync, drop_caches from test_tools.udev import Udev from connection.utils.output import CmdException @@ -126,7 +126,7 @@ def test_recovery_flush_reset_fs(cache_mode, fs): core_device = core_disk.partitions[0] with TestRun.step(f"Create {fs} filesystem on core."): - core_device.create_filesystem(fs) + test_tools.fs_utils.create_filesystem(fs) with TestRun.step("Create test files."): source_file, target_file = create_test_files(test_file_size) 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 5e1b65a..e43b02f 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py @@ -8,11 +8,12 @@ import os import pytest +import test_tools.fs_tools from api.cas import casadm, cli_messages from api.cas.cache_config import CacheMode, CacheModeTrait, CacheLineSize from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from connection.utils.output import CmdException from type_def.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \ @@ -53,7 +54,7 @@ def test_recovery_unplug_cache_fs(cache_mode, cls, filesystem, direct): source_file_md5 = source_file.md5sum() with TestRun.step("Create filesystem on core device."): - core_device.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step("Start cache and add core."): cache = casadm.start_cache(cache_device, cache_mode, cls) 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 1409708..8f34a8d 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 @@ -7,16 +7,16 @@ import pytest from datetime import timedelta +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy from api.cas.cli import stop_cmd from core.test_run import TestRun from storage_devices.device import Device from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet -from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from test_tools.fs_utils import remove +from test_tools.fs_tools import remove, Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import sync from test_tools.udev import Udev @@ -56,7 +56,7 @@ def test_flush_over_640_gibibytes_with_fs(cache_mode, fs): cache = casadm.start_cache(cache_part, cache_mode) with TestRun.step(f"Add core with {fs.name} filesystem to cache and mount it."): - core_dev.create_filesystem(fs) + test_tools.fs_utils.create_filesystem(fs) core = cache.add_core(core_dev) core.mount(mnt_point) @@ -66,7 +66,7 @@ def test_flush_over_640_gibibytes_with_fs(cache_mode, fs): with TestRun.step("Create a test file on a separate disk"): src_dir_path = "/mnt/flush_640G_test" - separate_dev.create_filesystem(fs) + test_tools.fs_utils.create_filesystem(fs) separate_dev.mount(src_dir_path) test_file_main = File.create_file(f"{src_dir_path}/test_file_main") 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 e4b8647..c507a4b 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py @@ -5,14 +5,14 @@ import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait, SeqCutOffPolicy from storage_devices.device import Device from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from test_tools.dd import Dd -from test_tools.disk_utils import Filesystem -from test_tools.fs_utils import create_random_test_file, remove +from test_tools.fs_tools import create_random_test_file, remove, Filesystem from test_tools.iostat import IOstatBasic from test_utils.filesystem.file import File from test_tools.os_tools import sync @@ -180,7 +180,7 @@ def test_clean_remove_core_with_fs(cache_mode, fs): cache = casadm.start_cache(cache_part, cache_mode) with TestRun.step(f"Add core with {fs.name} filesystem to cache and mount it."): - core_part.create_filesystem(fs) + test_tools.fs_utils.create_filesystem(fs) core = cache.add_core(core_part) core.mount(mnt_point) 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 0c41f8c..c1c4e47 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_signals.py @@ -6,6 +6,7 @@ import pytest from time import sleep +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import (CacheMode, CacheModeTrait, @@ -14,8 +15,7 @@ from api.cas.cache_config import (CacheMode, Time) from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun -from test_tools.disk_utils import Filesystem -from test_tools.fs_utils import create_random_test_file +from test_tools.fs_tools import create_random_test_file, Filesystem from test_tools.os_tools import sync from test_tools.scsi_debug import Logs, syslog_path from type_def.size import Size, Unit @@ -47,7 +47,7 @@ def test_flush_signal_core(cache_mode): with TestRun.step("Start cache and add SCSI device with xfs filesystem as core."): cache = casadm.start_cache(cache_part, cache_mode) - core_dev.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core = cache.add_core(core_dev) with TestRun.step("Mount exported object."): @@ -145,7 +145,7 @@ def test_flush_signal_cache(cache_mode): with TestRun.step("Start SCSI device as cache and add core with xfs filesystem."): cache = casadm.start_cache(cache_dev, cache_mode) - core_part.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core = cache.add_core(core_part) with TestRun.step("Mount exported object."): diff --git a/test/functional/tests/misc/test_device_capabilities.py b/test/functional/tests/misc/test_device_capabilities.py index cb8b2bc..8b7d416 100644 --- a/test/functional/tests/misc/test_device_capabilities.py +++ b/test/functional/tests/misc/test_device_capabilities.py @@ -13,7 +13,7 @@ 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 test_tools import disk_utils +from test_tools import disk_tools from connection.utils.output import CmdException from type_def.size import Size, Unit diff --git a/test/functional/tests/misc/test_files_permissions.py b/test/functional/tests/misc/test_files_permissions.py index 34c9a0e..a624124 100644 --- a/test/functional/tests/misc/test_files_permissions.py +++ b/test/functional/tests/misc/test_files_permissions.py @@ -15,7 +15,7 @@ from api.cas.installer import ( rsync_opencas_sources, ) from core.test_run import TestRun -from test_tools.fs_utils import FilesPermissions, find_all_items +from test_tools.fs_tools import FilesPermissions, find_all_items repo_files_perms_exceptions = { diff --git a/test/functional/tests/misc/test_flush_propagation.py b/test/functional/tests/misc/test_flush_propagation.py index 261af0f..a7e8b61 100644 --- a/test/functional/tests/misc/test_flush_propagation.py +++ b/test/functional/tests/misc/test_flush_propagation.py @@ -6,6 +6,7 @@ import pytest from time import sleep +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import ( CacheMode, @@ -14,10 +15,9 @@ from api.cas.cache_config import ( ) from storage_devices.disk import DiskType, DiskTypeSet from core.test_run import TestRun -from test_tools.disk_utils import Filesystem from test_tools.os_tools import sync from test_tools.scsi_debug import Logs, syslog_path -from test_tools.fs_utils import create_random_test_file +from test_tools.fs_tools import create_random_test_file, Filesystem from type_def.size import Size, Unit mount_point = "/mnt/cas" @@ -45,7 +45,7 @@ def test_flush_signal_propagation_cache(): with TestRun.step("Start cache on SCSI device and add core with xfs filesystem"): cache = casadm.start_cache(cache_dev, CacheMode.WT) - core_dev.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core = cache.add_core(core_dev) with TestRun.step("Turn off cleaning policy and sequential cutoff"): @@ -91,7 +91,7 @@ def test_flush_signal_propagation_core(): with TestRun.step("Start cache and add SCSI device with xfs filesystem as core."): cache = casadm.start_cache(cache_dev, CacheMode.WT) - core_dev.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) core = cache.add_core(core_dev) with TestRun.step("Turn off cleaning policy and sequential cutoff"): diff --git a/test/functional/tests/misc/test_weak_modules.py b/test/functional/tests/misc/test_weak_modules.py index 124faed..d1dfe21 100644 --- a/test/functional/tests/misc/test_weak_modules.py +++ b/test/functional/tests/misc/test_weak_modules.py @@ -11,7 +11,7 @@ import pytest from api.cas.installer import clean_opencas_repo, rsync_opencas_sources from core.test_run import TestRun -from test_tools.fs_utils import ( +from test_tools.fs_tools import ( check_if_regular_file_exists, check_if_symlink_exists, readlink, 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 e2496e9..597ff45 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 @@ -9,8 +9,7 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar 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_tools.fs_tools import create_random_test_file, Filesystem from type_def.size import Size, Unit 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 8e1de28..5846a03 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 @@ -9,8 +9,7 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar 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_tools.fs_tools import create_random_test_file, Filesystem from type_def.size import Size, Unit 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 3666f27..fc7c714 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 @@ -9,8 +9,7 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar 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_tools.fs_tools import create_random_test_file, Filesystem from type_def.size import Size, Unit diff --git a/test/functional/tests/security/fuzzy/kernel/common/common.py b/test/functional/tests/security/fuzzy/kernel/common/common.py index fcdc92b..7c95060 100644 --- a/test/functional/tests/security/fuzzy/kernel/common/common.py +++ b/test/functional/tests/security/fuzzy/kernel/common/common.py @@ -11,10 +11,11 @@ from typing import List import yaml +import test_tools.fs_tools 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_tools.fs_tools import Filesystem from type_def.size import Size, Unit @@ -66,7 +67,7 @@ def prepare_cas_instance( cache.set_cleaning_policy(cleaning_policy) if mount_point: - core_device.create_filesystem(Filesystem.ext4) + test_tools.fs_utils.create_filesystem(Filesystem.ext4) core = cache.add_core(core_device) core.mount(mount_point) else: diff --git a/test/functional/tests/security/test_compilation_flags.py b/test/functional/tests/security/test_compilation_flags.py index e519134..2ae1142 100644 --- a/test/functional/tests/security/test_compilation_flags.py +++ b/test/functional/tests/security/test_compilation_flags.py @@ -9,7 +9,7 @@ import re import pytest from core.test_run import TestRun -from test_tools.fs_utils import Permissions, PermissionsUsers, PermissionSign +from test_tools.fs_tools import Permissions, PermissionsUsers, PermissionSign from test_utils.filesystem.fs_item import FsItem diff --git a/test/functional/tests/security/test_security_user.py b/test/functional/tests/security/test_security_user.py index ef20c1d..601d122 100644 --- a/test/functional/tests/security/test_security_user.py +++ b/test/functional/tests/security/test_security_user.py @@ -6,14 +6,15 @@ import pytest +import test_tools.fs_tools from api.cas import casadm, cli from api.cas.cache_config import CacheMode from api.cas.casadm_params import OutputFormat from api.cas.init_config import InitConfig 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_tools import fs_tools +from test_tools.fs_tools import Filesystem from test_tools.os_tools import create_user, check_if_user_exists from connection.utils.output import CmdException from type_def.size import Size, Unit @@ -51,7 +52,7 @@ def test_user_cli(): cache = casadm.start_cache(cache_dev, force=True) with TestRun.step("Add core to cache and mount it."): - core_part1.create_filesystem(Filesystem.ext3) + test_tools.fs_utils.create_filesystem(Filesystem.ext3) core = cache.add_core(core_part1) core.mount(mount_point) @@ -403,7 +404,7 @@ def test_user_service(): cache = casadm.start_cache(cache_dev, force=True) with TestRun.step("Add core to cache and mount it."): - core_dev.create_filesystem(Filesystem.ext3) + test_tools.fs_utils.create_filesystem(Filesystem.ext3) core = cache.add_core(core_dev) core.mount(mount_point) diff --git a/test/functional/tests/stats/test_consistency_between_outputs.py b/test/functional/tests/stats/test_consistency_between_outputs.py index bbc30cf..6089892 100644 --- a/test/functional/tests/stats/test_consistency_between_outputs.py +++ b/test/functional/tests/stats/test_consistency_between_outputs.py @@ -7,12 +7,13 @@ import random import re import pytest +import test_tools.fs_tools from api.cas.cache_config import CacheMode, CacheLineSize, CacheModeTrait from api.cas.casadm import OutputFormat, print_statistics, start_cache 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_tools.fs_tools import Filesystem from type_def.size import Size, Unit iterations = 64 @@ -45,7 +46,7 @@ def test_output_consistency(cache_line_size, cache_mode, test_object): with TestRun.step("Start cache and add core with a filesystem."): cache = start_cache(cache_part, cache_mode, cache_line_size, force=True) - core_part.create_filesystem(Filesystem.xfs) + test_tools.fs_utils.create_filesystem(Filesystem.xfs) exp_obj = cache.add_core(core_part) with TestRun.step("Select object to test."): diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index 5fdf6a1..581b76b 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -6,6 +6,7 @@ import random import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas import ioclass_config from api.cas.cache_config import CleaningPolicy, CacheMode, CacheLineSize @@ -24,7 +25,7 @@ from api.cas.statistics import ( ) from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_utils.filesystem.file import File from test_tools.os_tools import sync from test_tools.udev import Udev @@ -310,7 +311,7 @@ def prepare(random_cls, cache_count=1, cores_per_cache=1): cache_devices = cache_device.partitions core_devices = core_device.partitions for core_device in core_devices: - core_device.create_filesystem(Filesystem.ext4) + test_tools.fs_utils.create_filesystem(Filesystem.ext4) Udev.disable() caches, cores = [], [] 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 224858c..f59ec7b 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 @@ -15,7 +15,7 @@ from api.cas.cache_config import CacheMode from api.cas.ioclass_config import IoClass from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine from connection.utils.asynchronous import start_async_func 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 a194dd8..220787b 100644 --- a/test/functional/tests/stress/test_stress_cleaning_policy_change.py +++ b/test/functional/tests/stress/test_stress_cleaning_policy_change.py @@ -7,6 +7,7 @@ import posixpath import random import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import ( CacheMode, @@ -14,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_tools.fs_tools import Filesystem from type_def.size import Size, Unit from test_tools.udev import Udev from test_tools.fio.fio import Fio @@ -104,7 +105,7 @@ def test_change_cleaning_policy_during_io_fs(filesystem): cache = casadm.start_cache(cache_dev.partitions[0], CacheMode.WB, force=True) with TestRun.step(f"Create filesystem on core device"): - core_dev.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step(f"Add core to the cache"): core = cache.add_core(core_dev) diff --git a/test/functional/tests/stress/test_stress_without_io.py b/test/functional/tests/stress/test_stress_without_io.py index 4710dc6..c78f8b0 100644 --- a/test/functional/tests/stress/test_stress_without_io.py +++ b/test/functional/tests/stress/test_stress_without_io.py @@ -11,8 +11,8 @@ from api.cas.cache_config import CacheMode from api.cas.init_config import InitConfig 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_tools import fs_tools +from test_tools.fs_tools import Filesystem from type_def.size import Size, Unit iterations_per_config = 50 diff --git a/test/functional/tests/volumes/common.py b/test/functional/tests/volumes/common.py index 45c8914..b9bbb9e 100644 --- a/test/functional/tests/volumes/common.py +++ b/test/functional/tests/volumes/common.py @@ -5,9 +5,9 @@ # from api.cas.init_config import InitConfig, opencas_conf_path -from test_tools import fs_utils +from test_tools import fs_tools from core.test_run import TestRun -from test_tools.disk_utils import get_block_device_names_list +from test_tools.disk_tools import get_block_device_names_list from type_def.size import Size, Unit test_file_size = Size(500, Unit.KiloByte) diff --git a/test/functional/tests/volumes/test_multilevel_cache_3.py b/test/functional/tests/volumes/test_multilevel_cache_3.py index bee7936..711fafe 100644 --- a/test/functional/tests/volumes/test_multilevel_cache_3.py +++ b/test/functional/tests/volumes/test_multilevel_cache_3.py @@ -9,7 +9,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from api.cas.cache import CacheMode, casadm from type_def.size import Size, Unit -from test_tools.disk_utils import Filesystem +from test_tools.fs_tools import Filesystem from .common import create_files_with_md5sums, compare_md5sums mount_point = "/mnt/test" diff --git a/test/functional/tests/volumes/test_raid_as_cache.py b/test/functional/tests/volumes/test_raid_as_cache.py index e772465..c9f9347 100644 --- a/test/functional/tests/volumes/test_raid_as_cache.py +++ b/test/functional/tests/volumes/test_raid_as_cache.py @@ -11,8 +11,8 @@ from .common import compare_md5sums, create_files_with_md5sums from core.test_run import TestRun 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_tools import fs_tools +from test_tools.fs_tools import Filesystem from type_def.size import Size, Unit mount_point = "/mnt/test" diff --git a/test/functional/tests/volumes/test_volume_partitions.py b/test/functional/tests/volumes/test_volume_partitions.py index 30ef489..a42fd38 100644 --- a/test/functional/tests/volumes/test_volume_partitions.py +++ b/test/functional/tests/volumes/test_volume_partitions.py @@ -5,13 +5,15 @@ import pytest +import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan 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_tools import fs_tools, disk_tools +from test_tools.disk_tools import PartitionTable +from test_tools.fs_tools import Filesystem from type_def.size import Size, Unit mount_point = "/mnt/cas" @@ -43,7 +45,7 @@ def test_cas_preserves_partitions(partition_table, filesystem, cache_mode): with TestRun.step("Create filesystem on core devices."): for i in range(cores_number): - core_dev.partitions[i].create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step("Mount core devices and create test files."): files = [] @@ -124,7 +126,7 @@ def test_partition_create_cas(partition_table, filesystem, cache_mode): with TestRun.step("Create filesystem on core devices."): for part in core.partitions: - part.create_filesystem(filesystem) + test_tools.fs_utils.create_filesystem(filesystem) with TestRun.step("Mount core devices and create test files."): files = [] From e740ce377f05f9a70dacb16375b89bc15413d7f0 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Fri, 13 Dec 2024 15:19:03 +0100 Subject: [PATCH 23/24] Fix imports Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache.py | 2 +- test/functional/api/cas/cas_module.py | 8 ++--- test/functional/api/cas/core.py | 7 ++-- test/functional/api/cas/init_config.py | 9 +++-- test/functional/api/cas/installer.py | 2 +- test/functional/api/cas/ioclass_config.py | 4 +-- test/functional/test-framework | 2 +- .../512b/test_different_io_sizes_support.py | 7 ++-- test/functional/tests/basic/test_basic.py | 5 ++- .../tests/cache_ops/test_core_remove.py | 6 ++-- .../cache_ops/test_multistream_seq_cutoff.py | 3 +- .../functional/tests/ci/test_ci_read_write.py | 1 + test/functional/tests/cli/test_cli_script.py | 1 + test/functional/tests/cli/test_cli_standby.py | 3 +- .../tests/cli/test_cli_start_stop.py | 1 + .../tests/cli/test_manual_casadm_flush.py | 1 + .../tests/cli/test_seq_cutoff_settings.py | 1 + .../tests/cli/test_set_get_params.py | 1 + .../tests/cli/test_zero_metadata_command.py | 3 +- .../tests/common/lvm_common_utils.py | 35 ------------------- .../data_integrity/test_data_integrity_12h.py | 1 + .../data_integrity/test_data_integrity_5d.py | 17 +++++---- test/functional/tests/example/example_test.py | 18 +++++----- .../test_cache_activation_perf.py | 1 + .../test_failover_advanced.py | 8 +---- .../test_failover_multihost.py | 9 +++-- .../test_another_device_with_same_id.py | 1 + .../test_cache_insert_error.py | 1 + .../test_fault_injection_interrupts.py | 14 ++++---- .../test_fault_injection_many_to_one.py | 2 +- .../test_fault_injection_opencas_load.py | 9 ++--- .../test_fault_injection_with_mounted_core.py | 21 ++++++----- .../test_fault_power_reboot.py | 2 +- .../test_max_io_greater_in_core.py | 1 + .../test_primary_device_error.py | 1 + .../tests/incremental_load/test_core_pool.py | 6 ++-- .../tests/initialize/test_initialize_load.py | 4 ++- .../initialize/test_initialize_runlevel.py | 8 ++--- .../tests/initialize/test_negative_load.py | 3 +- .../initialize/test_startup_init_config.py | 12 +++---- test/functional/tests/io/test_io_engines.py | 8 ++--- .../tests/io/test_remove_device_during_io.py | 2 +- test/functional/tests/io/test_write_fetch.py | 4 ++- test/functional/tests/io/trim/test_trim.py | 10 +++--- .../tests/io/trim/test_trim_stress.py | 5 ++- .../tests/io_class/io_class_common.py | 1 + .../tests/io_class/test_io_class_cli.py | 8 ++--- .../tests/io_class/test_io_class_core_id.py | 1 + .../tests/io_class/test_io_class_directory.py | 23 ++++++------ ...st_io_class_eviction_pinned_after_unpin.py | 4 ++- .../test_io_class_eviction_priority.py | 13 ++++--- .../tests/io_class/test_io_class_file.py | 13 ++++--- .../io_class/test_io_class_lvm_on_cas.py | 10 +++--- .../tests/io_class/test_io_class_occupancy.py | 20 +++++------ .../io_class/test_io_class_occupancy_load.py | 13 ++++--- .../test_io_class_occupancy_repart.py | 15 ++++---- .../test_io_class_occupancy_resize.py | 10 +++--- .../test_io_class_pinning_eviction.py | 14 ++++---- .../io_class/test_io_class_preserve_config.py | 1 + ...st_io_class_prevent_wrong_configuration.py | 13 +++---- .../tests/io_class/test_io_class_process.py | 2 +- .../tests/io_class/test_io_class_purge.py | 12 +++---- .../io_class/test_io_class_service_support.py | 32 ++++++++--------- .../test_io_class_stats_file_size_core.py | 9 +++-- .../tests/io_class/test_io_class_wlth.py | 1 + .../tests/io_class/test_io_classification.py | 34 +++++++++--------- .../lazy_writes/cleaning_policy/test_acp.py | 4 +-- .../lazy_writes/cleaning_policy/test_alru.py | 5 +-- .../cleaning_policy/test_cleaning_params.py | 2 +- .../test_switch_cleaning_policy.py | 4 ++- .../recovery/recovery_tests_methods.py | 15 ++++---- .../recovery/test_recovery_all_options.py | 5 ++- .../recovery/test_recovery_flush_reset.py | 9 +++-- .../recovery/test_recovery_unplug.py | 4 +-- .../tests/lazy_writes/test_clean_load.py | 2 ++ .../tests/lazy_writes/test_dirty_load.py | 2 ++ .../lazy_writes/test_flush_huge_dirty_data.py | 6 ++-- .../lazy_writes/test_lazy_writes_clean.py | 4 +-- .../lazy_writes/test_lazy_writes_signals.py | 7 ++-- .../test_parallel_core_flushing.py | 3 +- .../tests/lazy_writes/test_wb_throttling.py | 6 ++-- .../memory/test_check_number_of_processes.py | 1 + .../tests/misc/test_device_capabilities.py | 11 +++--- .../tests/misc/test_files_permissions.py | 1 - .../tests/misc/test_flush_propagation.py | 7 ++-- .../tests/misc/test_weak_modules.py | 5 ++- .../test_progress_bar_big_files.py | 2 ++ .../test_progress_bar_during_io.py | 4 ++- .../test_progress_bar_output_redirection.py | 2 ++ .../test_progress_bar_supported_commands.py | 2 ++ .../test_progress_bar_wt_cache_mode.py | 2 ++ .../security/fuzzy/kernel/common/common.py | 8 ++--- .../tests/security/test_compilation_flags.py | 2 +- .../tests/security/test_security_user.py | 14 ++++---- .../tests/stats/test_block_stats.py | 1 - .../stats/test_consistency_between_outputs.py | 4 +-- .../tests/stats/test_display_statistics.py | 5 ++- .../tests/stats/test_ioclass_stats.py | 6 ++-- test/functional/tests/stats/test_stat_max.py | 4 +-- .../tests/stats/test_statistics_integrity.py | 4 +-- .../tests/stress/test_stress_attach_detach.py | 1 + .../test_stress_change_io_class_config_io.py | 1 + .../test_stress_cleaning_policy_change.py | 4 +-- .../stress/test_stress_io_small_device.py | 2 ++ .../tests/stress/test_stress_shutdown.py | 3 ++ .../tests/stress/test_stress_without_io.py | 6 ++-- test/functional/tests/volumes/common.py | 8 ++--- .../volumes/test_discard_on_huge_core.py | 1 + .../tests/volumes/test_multilevel_cache_3.py | 3 +- .../tests/volumes/test_raid_as_cache.py | 10 +++--- .../tests/volumes/test_volume_partitions.py | 19 +++++----- 111 files changed, 361 insertions(+), 379 deletions(-) delete mode 100644 test/functional/tests/common/lvm_common_utils.py diff --git a/test/functional/api/cas/cache.py b/test/functional/api/cas/cache.py index fde0c23..b114da7 100644 --- a/test/functional/api/cas/cache.py +++ b/test/functional/api/cas/cache.py @@ -8,8 +8,8 @@ from api.cas.casadm_parser import * from api.cas.core import Core from api.cas.dmesg import get_metadata_size_on_device from api.cas.statistics import CacheStats, CacheIoClassStats -from test_tools.os_tools import * from connection.utils.output import Output +from test_tools.os_tools import sync class Cache: diff --git a/test/functional/api/cas/cas_module.py b/test/functional/api/cas/cas_module.py index f6f89d7..5aab47d 100644 --- a/test/functional/api/cas/cas_module.py +++ b/test/functional/api/cas/cas_module.py @@ -6,7 +6,7 @@ from enum import Enum from core.test_run import TestRun -from test_tools import os_tools +from test_tools.os_tools import unload_kernel_module, load_kernel_module class CasModule(Enum): @@ -14,12 +14,12 @@ class CasModule(Enum): def reload_all_cas_modules(): - os_tools.unload_kernel_module(CasModule.cache.value) - os_tools.load_kernel_module(CasModule.cache.value) + unload_kernel_module(CasModule.cache.value) + load_kernel_module(CasModule.cache.value) def unload_all_cas_modules(): - os_tools.unload_kernel_module(CasModule.cache.value) + unload_kernel_module(CasModule.cache.value) def is_cas_management_dev_present(): diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py index e61c534..15ae71b 100644 --- a/test/functional/api/cas/core.py +++ b/test/functional/api/cas/core.py @@ -8,7 +8,6 @@ from datetime import timedelta from typing import List from enum import Enum -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import SeqCutOffParameters, SeqCutOffPolicy from api.cas.casadm_params import StatsFilter @@ -16,7 +15,7 @@ from api.cas.casadm_parser import get_seq_cut_off_parameters, get_core_info_for_ from api.cas.statistics import CoreStats, CoreIoClassStats from core.test_run_utils import TestRun from storage_devices.device import Device -from test_tools import fs_tools, disk_tools +from test_tools.fs_tools import Filesystem, ls_item from test_tools.os_tools import sync from test_tools.common.wait import wait from type_def.size import Unit, Size @@ -51,7 +50,7 @@ class Core(Device): return get_core_info_for_cache_by_path(core_disk_path=self.core_device.path, target_cache_id=self.cache_id) - def create_filesystem(self, fs_type: test_tools.fs_utils.Filesystem, force=True, blocksize=None): + def create_filesystem(self, fs_type: Filesystem, force=True, blocksize=None): super().create_filesystem(fs_type, force, blocksize) self.core_device.filesystem = self.filesystem @@ -140,7 +139,7 @@ class Core(Device): def check_if_is_present_in_os(self, should_be_visible=True): device_in_system_message = "CAS device exists in OS." device_not_in_system_message = "CAS device does not exist in OS." - item = fs_utils.ls_item(f"{self.path}") + item = ls_item(self.path) if item is not None: if should_be_visible: TestRun.LOGGER.info(device_in_system_message) diff --git a/test/functional/api/cas/init_config.py b/test/functional/api/cas/init_config.py index 7f6cf25..6f86e2c 100644 --- a/test/functional/api/cas/init_config.py +++ b/test/functional/api/cas/init_config.py @@ -7,8 +7,7 @@ from api.cas import casadm_parser from api.cas.cache_config import CacheMode from storage_devices.device import Device -from test_tools import fs_tools - +from test_tools.fs_tools import remove, write_file opencas_conf_path = "/etc/opencas/opencas.conf" @@ -34,7 +33,7 @@ class InitConfig: @staticmethod def remove_config_file(): - fs_utils.remove(opencas_conf_path, force=False) + remove(opencas_conf_path, force=False) def save_config_file(self): config_lines = [] @@ -47,7 +46,7 @@ class InitConfig: config_lines.append(CoreConfigLine.header) for c in self.core_config_lines: config_lines.append(str(c)) - fs_utils.write_file(opencas_conf_path, "\n".join(config_lines), False) + write_file(opencas_conf_path, "\n".join(config_lines), False) @classmethod def create_init_config_from_running_configuration( @@ -69,7 +68,7 @@ class InitConfig: @classmethod def create_default_init_config(cls): cas_version = casadm_parser.get_casadm_version() - fs_utils.write_file(opencas_conf_path, f"version={cas_version.base}") + write_file(opencas_conf_path, f"version={cas_version.base}") class CacheConfigLine: diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py index 6743e7c..1d56d9a 100644 --- a/test/functional/api/cas/installer.py +++ b/test/functional/api/cas/installer.py @@ -9,7 +9,7 @@ import os from core.test_run import TestRun from api.cas import cas_module from api.cas.version import get_installed_cas_version -from test_tools import git, os_tools +from test_tools import git from connection.utils.output import CmdException from test_tools.os_tools import is_kernel_module_loaded diff --git a/test/functional/api/cas/ioclass_config.py b/test/functional/api/cas/ioclass_config.py index 4c64377..93a231e 100644 --- a/test/functional/api/cas/ioclass_config.py +++ b/test/functional/api/cas/ioclass_config.py @@ -14,7 +14,7 @@ from datetime import timedelta from packaging import version from core.test_run import TestRun -from test_tools import fs_tools +from test_tools.fs_tools import write_file from test_tools.os_tools import get_kernel_version default_config_file_path = "/tmp/opencas_ioclass.conf" @@ -108,7 +108,7 @@ class IoClass: ioclass_config_path: str = default_config_file_path, ): TestRun.LOGGER.info(f"Creating config file {ioclass_config_path}") - fs_utils.write_file( + write_file( ioclass_config_path, IoClass.list_to_csv(ioclass_list, add_default_rule) ) diff --git a/test/functional/test-framework b/test/functional/test-framework index e656aa1..f7f2914 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit e656aa1e5fdb2c5b063baf0307c58b50ab1d24c4 +Subproject commit f7f2914e41ce73d13dafe6cd749aa6e2d33b4315 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 0948042..159554f 100644 --- a/test/functional/tests/512b/test_different_io_sizes_support.py +++ b/test/functional/tests/512b/test_different_io_sizes_support.py @@ -12,8 +12,7 @@ from core.test_run import TestRun from api.cas import casadm from storage_devices.disk import DiskType, DiskTypeSet from api.cas.cache_config import CacheMode -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, remove, create_directory from type_def.size import Size, Unit from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine @@ -52,8 +51,8 @@ def test_support_different_io_size(cache_mode): cache.load_io_class(opencas_ioclass_conf_path) with TestRun.step("Create a filesystem on the core device and mount it"): - fs_utils.remove(path=mountpoint, force=True, recursive=True, ignore_errors=True) - fs_utils.create_directory(path=mountpoint) + remove(path=mountpoint, force=True, recursive=True, ignore_errors=True) + create_directory(path=mountpoint) core.create_filesystem(Filesystem.xfs) core.mount(mountpoint) diff --git a/test/functional/tests/basic/test_basic.py b/test/functional/tests/basic/test_basic.py index b7541d6..133b094 100644 --- a/test/functional/tests/basic/test_basic.py +++ b/test/functional/tests/basic/test_basic.py @@ -17,9 +17,8 @@ from api.cas.cli_messages import ( ) from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, read_file from test_utils.filesystem.file import File from connection.utils.output import CmdException from type_def.size import Size, Unit @@ -45,7 +44,7 @@ def test_cas_version(): cmd_cas_versions = [version.split(",")[1] for version in cmd_version.split("\n")[1:]] with TestRun.step(f"Read cas version from {version_file_path} location"): - file_read = fs_utils.read_file(version_file_path).split("\n") + file_read = read_file(version_file_path).split("\n") file_cas_version = next( (line.split("=")[1] for line in file_read if "CAS_VERSION=" in line) ) diff --git a/test/functional/tests/cache_ops/test_core_remove.py b/test/functional/tests/cache_ops/test_core_remove.py index bcf9efc..831c749 100644 --- a/test/functional/tests/cache_ops/test_core_remove.py +++ b/test/functional/tests/cache_ops/test_core_remove.py @@ -5,10 +5,8 @@ # import random - import pytest -import test_tools.fs_tools from api.cas import casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet @@ -47,7 +45,7 @@ def test_remove_core_when_other_mounted_auto_numeration(): free_core = cache.add_core(core_device.partitions[0]) mounted_cores = [] for i, part in enumerate(core_device.partitions[1:]): - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + part.create_filesystem(Filesystem.xfs) mounted_cores.append(cache.add_core(part)) mounted_cores[i].mount( mount_point=f"{mount_point}{cache.cache_id}-{mounted_cores[i].core_id}" @@ -91,7 +89,7 @@ def test_remove_core_when_other_mounted_custom_numeration(): mounted_cores = [] for i, part in enumerate(core_device.partitions[1:]): - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + part.create_filesystem(Filesystem.xfs) mounted_cores.append( cache.add_core(core_dev=part, core_id=int(f"{random_prefix}{random_interfix}{i}")) ) 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 e65a348..6e0ab47 100644 --- a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py @@ -10,7 +10,6 @@ from time import sleep import pytest -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import ( CacheMode, @@ -223,7 +222,7 @@ def test_multistream_seq_cutoff_stress_fs(streams_seq_rand, filesystem, cache_mo with TestRun.step("Create filesystem on core device"): cache_disk = TestRun.disks["cache"] core_disk = TestRun.disks["core"] - test_tools.fs_utils.create_filesystem(filesystem) + core_disk.create_filesystem(filesystem) with TestRun.step("Start cache and add core"): cache = casadm.start_cache(cache_dev=cache_disk, cache_mode=cache_mode, force=True) diff --git a/test/functional/tests/ci/test_ci_read_write.py b/test/functional/tests/ci/test_ci_read_write.py index 91b54bf..c690af5 100644 --- a/test/functional/tests/ci/test_ci_read_write.py +++ b/test/functional/tests/ci/test_ci_read_write.py @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/cli/test_cli_script.py b/test/functional/tests/cli/test_cli_script.py index 6f24c81..f7141a1 100644 --- a/test/functional/tests/cli/test_cli_script.py +++ b/test/functional/tests/cli/test_cli_script.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/cli/test_cli_standby.py b/test/functional/tests/cli/test_cli_standby.py index 089df28..5bd69b2 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/test/functional/tests/cli/test_cli_standby.py @@ -6,7 +6,6 @@ import pytest -import test_tools.fs_tools from api.cas import casadm, casadm_parser, dmesg from api.cas.casadm import standby_init from api.cas.cli import casadm_bin, standby_init_cmd @@ -558,7 +557,7 @@ def test_standby_init_with_preexisting_filesystem(filesystem): cache_id = 1 with TestRun.step("Create filesystem on cache device partition"): - test_tools.fs_utils.create_filesystem(filesystem) + cache_device.create_filesystem(filesystem) with TestRun.step("Try initialize cache without force flag"): output = TestRun.executor.run( diff --git a/test/functional/tests/cli/test_cli_start_stop.py b/test/functional/tests/cli/test_cli_start_stop.py index 47efd99..8933e9e 100644 --- a/test/functional/tests/cli/test_cli_start_stop.py +++ b/test/functional/tests/cli/test_cli_start_stop.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/cli/test_manual_casadm_flush.py b/test/functional/tests/cli/test_manual_casadm_flush.py index 585d80b..b65b3ad 100644 --- a/test/functional/tests/cli/test_manual_casadm_flush.py +++ b/test/functional/tests/cli/test_manual_casadm_flush.py @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/cli/test_seq_cutoff_settings.py b/test/functional/tests/cli/test_seq_cutoff_settings.py index fb3fcf1..a7d578c 100644 --- a/test/functional/tests/cli/test_seq_cutoff_settings.py +++ b/test/functional/tests/cli/test_seq_cutoff_settings.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/cli/test_set_get_params.py b/test/functional/tests/cli/test_set_get_params.py index aaea922..adc6998 100644 --- a/test/functional/tests/cli/test_set_get_params.py +++ b/test/functional/tests/cli/test_set_get_params.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/cli/test_zero_metadata_command.py b/test/functional/tests/cli/test_zero_metadata_command.py index 30ed319..312f223 100644 --- a/test/functional/tests/cli/test_zero_metadata_command.py +++ b/test/functional/tests/cli/test_zero_metadata_command.py @@ -8,7 +8,6 @@ from datetime import timedelta import pytest -import test_tools.fs_tools from api.cas import casadm, cli_messages, cli from api.cas.cache_config import CacheMode, CleaningPolicy from core.test_run import TestRun @@ -99,7 +98,7 @@ def test_zero_metadata_filesystem(filesystem): cache_dev, core_disk, cache_disk = prepare_devices() with TestRun.step("Create filesystem on core device."): - test_tools.fs_utils.create_filesystem(filesystem) + core_disk.create_filesystem(filesystem) with TestRun.step("Start cache and add core."): cache = casadm.start_cache(cache_dev, force=True) diff --git a/test/functional/tests/common/lvm_common_utils.py b/test/functional/tests/common/lvm_common_utils.py deleted file mode 100644 index 9923af5..0000000 --- a/test/functional/tests/common/lvm_common_utils.py +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright(c) 2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause -# - -import datetime - -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 type_def.size import Size, Unit - - -def run_fio_on_lvm(volumes: []): - fio_run = (Fio().create_command() - .read_write(ReadWrite.randrw) - .io_engine(IoEngine.sync) - .io_depth(1) - .time_based() - .run_time(datetime.timedelta(seconds=180)) - .do_verify() - .verify(VerifyMethod.md5) - .block_size(Size(1, Unit.Blocks4096))) - for lvm in volumes: - fio_run.add_job().target(lvm).size(lvm.size) - fio_run.run() - - -def get_test_configuration(): - config = InitConfig.create_init_config_from_running_configuration() - devices = get_block_devices_list() - - return config, devices 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 f868ee4..179c0f4 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_12h.py +++ b/test/functional/tests/data_integrity/test_data_integrity_12h.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 98b0c93..9f75ef6 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_5d.py +++ b/test/functional/tests/data_integrity/test_data_integrity_5d.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -12,12 +13,10 @@ import pytest from api.cas import casadm from api.cas.cache_config import CacheMode from core.test_run import TestRun -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory, check_if_directory_exists, md5sum 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.filesystem.file import File from test_tools.os_tools import sync from type_def.size import Unit, Size @@ -72,8 +71,8 @@ def test_data_integrity_5d_dss(filesystems): with TestRun.step("Create filesystems and mount cores"): for i, core in enumerate(cores): mount_point = core.path.replace('/dev/', '/mnt/') - if not fs_utils.check_if_directory_exists(mount_point): - fs_utils.create_directory(mount_point) + if not check_if_directory_exists(mount_point): + create_directory(mount_point) TestRun.LOGGER.info(f"Create filesystem {filesystems[i].name} on {core.path}") core.create_filesystem(filesystems[i]) TestRun.LOGGER.info(f"Mount filesystem {filesystems[i].name} on {core.path} to " @@ -106,14 +105,14 @@ def test_data_integrity_5d_dss(filesystems): core.unmount() with TestRun.step("Calculate md5 for each core"): - core_md5s = [File(core.full_path).md5sum() for core in cores] + core_md5s = [md5sum(core.path) for core in cores] with TestRun.step("Stop caches"): for cache in caches: cache.stop() with TestRun.step("Calculate md5 for each core"): - dev_md5s = [File(dev.full_path).md5sum() for dev in core_devices] + dev_md5s = [md5sum(dev.full_path) for dev in core_devices] with TestRun.step("Compare md5 sums for cores and core devices"): for core_md5, dev_md5, mode, fs in zip(core_md5s, dev_md5s, cache_modes, filesystems): @@ -171,14 +170,14 @@ def test_data_integrity_5d(): fio_run.run() with TestRun.step("Calculate md5 for each core"): - core_md5s = [File(core.full_path).md5sum() for core in cores] + core_md5s = [md5sum(core.path) for core in cores] with TestRun.step("Stop caches"): for cache in caches: cache.stop() with TestRun.step("Calculate md5 for each core"): - dev_md5s = [File(dev.full_path).md5sum() for dev in core_devices] + dev_md5s = [md5sum(dev.full_path) for dev in core_devices] with TestRun.step("Compare md5 sums for cores and core devices"): for core_md5, dev_md5, mode in zip(core_md5s, dev_md5s, cache_modes): diff --git a/test/functional/tests/example/example_test.py b/test/functional/tests/example/example_test.py index 1da80f3..fac56cc 100644 --- a/test/functional/tests/example/example_test.py +++ b/test/functional/tests/example/example_test.py @@ -1,12 +1,12 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest from collections import namedtuple -import test_tools.fs_tools from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet from storage_devices.raid import Raid, RaidConfiguration, MetadataVariant, Level @@ -14,8 +14,8 @@ from storage_devices.ramdisk import RamDisk from test_utils.drbd import Resource, Node from storage_devices.drbd import Drbd from test_tools.drbdadm import Drbdadm -from test_tools import fs_tools -from test_tools.fs_tools import copy, Filesystem +from test_tools.fs_tools import copy, Filesystem, replace_in_lines, remove, Permissions, \ + PermissionsUsers from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File from type_def.size import Size, Unit @@ -52,7 +52,7 @@ def test_create_example_partitions(): test_disk.create_partitions(part_sizes) for i in TestRun.iteration(range(0, 5)): with TestRun.step(f"Create filesystem on partition {i}"): - test_tools.fs_utils.create_filesystem(Filesystem.ext3) + test_disk.partitions[i].create_filesystem(Filesystem.ext3) @pytest.mark.require_disk("cache1", DiskTypeSet([DiskType.optane, DiskType.nand])) @@ -102,7 +102,7 @@ def test_create_example_files(): content_before_change = file1.read() TestRun.LOGGER.info(f"File content: {content_before_change}") with TestRun.step("Replace single line in file"): - fs_utils.replace_in_lines(file1, 'content line', 'replaced line') + replace_in_lines(file1, 'content line', 'replaced line') with TestRun.step("Read file content and check if it changed"): content_after_change = file1.read() if content_before_change == content_after_change: @@ -115,19 +115,19 @@ def test_create_example_files(): with TestRun.step("Change permissions of second file"): file2.chmod_numerical(123) with TestRun.step("Remove second file"): - fs_utils.remove(file2.full_path, True) + remove(file2.full_path, True) with TestRun.step("List contents of home directory"): dir1 = Directory("~") dir_content = dir1.ls() with TestRun.step("Change permissions of file"): - file1.chmod(fs_utils.Permissions['r'] | fs_utils.Permissions['w'], - fs_utils.PermissionsUsers(7)) + file1.chmod(Permissions['r'] | Permissions['w'], + PermissionsUsers(7)) with TestRun.step("Log home directory content"): for item in dir_content: TestRun.LOGGER.info(f"Item {str(item)} - {type(item).__name__}") with TestRun.step("Remove file"): - fs_utils.remove(file1.full_path, True) + remove(file1.full_path, True) @pytest.mark.require_disk("cache1", DiskTypeSet([DiskType.optane, DiskType.nand])) 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 7e32fb3..59ad230 100644 --- a/test/functional/tests/failover_standby/test_cache_activation_perf.py +++ b/test/functional/tests/failover_standby/test_cache_activation_perf.py @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # from datetime import timedelta, datetime diff --git a/test/functional/tests/failover_standby/test_failover_advanced.py b/test/functional/tests/failover_standby/test_failover_advanced.py index c67c6b8..486dc9b 100644 --- a/test/functional/tests/failover_standby/test_failover_advanced.py +++ b/test/functional/tests/failover_standby/test_failover_advanced.py @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -1094,13 +1095,6 @@ def test_failover_io_long(cls, cleaning_policy, num_iterations): TestRun.executor.wait_for_connection() -def check_drbd_installed(duts): - for dut in duts: - with TestRun.use_dut(dut): - if not Drbd.is_installed(): - TestRun.fail(f"DRBD is not installed on DUT {dut.ip}") - - def prepare_devices(duts): for dut in duts: with TestRun.use_dut(dut): diff --git a/test/functional/tests/failover_standby/test_failover_multihost.py b/test/functional/tests/failover_standby/test_failover_multihost.py index 69c2caf..383c0fe 100644 --- a/test/functional/tests/failover_standby/test_failover_multihost.py +++ b/test/functional/tests/failover_standby/test_failover_multihost.py @@ -23,12 +23,11 @@ from storage_devices.raid import Raid, RaidConfiguration, MetadataVariant, Level from test_tools.dd import Dd from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite -from test_tools.fs_tools import readlink, Filesystem +from test_tools.fs_tools import readlink, Filesystem, create_directory from test_utils.drbd import Resource, Node from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Size, Unit -from test_tools import fs_tools cache_id = 5 @@ -145,7 +144,7 @@ def test_functional_activate_twice_round_trip(filesystem): primary_node.cache.set_seq_cutoff_policy(SeqCutOffPolicy.never) if filesystem: TestRun.executor.run(f"rm -rf {mountpoint}") - fs_utils.create_directory(path=mountpoint) + create_directory(path=mountpoint) core.create_filesystem(filesystem) core.mount(mountpoint) @@ -316,7 +315,7 @@ def test_functional_activate_twice_new_host(filesystem): primary_node.cache.set_seq_cutoff_policy(SeqCutOffPolicy.never) if filesystem: TestRun.executor.run(f"rm -rf {mountpoint}") - fs_utils.create_directory(path=mountpoint) + create_directory(path=mountpoint) core.create_filesystem(filesystem) core.mount(mountpoint) @@ -492,7 +491,7 @@ def failover_sequence(standby_node, drbd_resource, filesystem, core): if filesystem: with TestRun.use_dut(standby_node), TestRun.step(f"Mount core"): TestRun.executor.run(f"rm -rf {mountpoint}") - fs_utils.create_directory(path=mountpoint) + create_directory(path=mountpoint) core.mount(mountpoint) 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 4cd322a..38b89e7 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 @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 bed641a..3188a77 100644 --- a/test/functional/tests/fault_injection/test_cache_insert_error.py +++ b/test/functional/tests/fault_injection/test_cache_insert_error.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 15508da..9a7d6cb 100644 --- a/test/functional/tests/fault_injection/test_fault_injection_interrupts.py +++ b/test/functional/tests/fault_injection/test_fault_injection_interrupts.py @@ -6,15 +6,13 @@ import pytest -import test_tools.fs_tools from api.cas import casadm, casadm_parser, cli from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait from api.cas.casadm_parser import wait_for_flushing from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_random_test_file from test_tools.os_tools import DropCachesMode, sync, drop_caches from test_tools.udev import Udev from type_def.size import Size, Unit @@ -55,7 +53,7 @@ def test_interrupt_core_flush(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it."): - test_tools.fs_utils.create_filesystem(filesystem) + core_part.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) @@ -139,7 +137,7 @@ def test_interrupt_cache_flush(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it."): - test_tools.fs_utils.create_filesystem(filesystem) + core_part.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) @@ -226,7 +224,7 @@ def test_interrupt_core_remove(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it"): - test_tools.fs_utils.create_filesystem(filesystem) + core_part.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) @@ -343,7 +341,7 @@ def test_interrupt_cache_mode_switch_parametrized(cache_mode, stop_percentage): core = cache.add_core(core_part) with TestRun.step(f"Create test file in mount point of exported object"): - test_file = fs_utils.create_random_test_file(test_file_path, test_file_size) + test_file = create_random_test_file(test_file_path, test_file_size) with TestRun.step("Calculate md5sum of test file"): test_file_md5_before = test_file.md5sum() @@ -443,7 +441,7 @@ def test_interrupt_cache_stop(cache_mode, filesystem): cache.set_cleaning_policy(CleaningPolicy.nop) with TestRun.step(f"Add core device with {filesystem} filesystem and mount it."): - test_tools.fs_utils.create_filesystem(filesystem) + core_part.create_filesystem(filesystem) core = cache.add_core(core_part) core.mount(mount_point) 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 14b5211..21684ef 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 @@ -289,7 +289,7 @@ def test_one_core_fail_dirty(): with TestRun.step("Check if core device is really out of cache."): output = str(casadm.list_caches().stdout.splitlines()) if core_part1.path in output: - TestRun.exception("The first core device should be unplugged!") + TestRun.LOGGER.exception("The first core device should be unplugged!") with TestRun.step("Verify that I/O to the remaining cores does not insert to cache"): dd_builder(cache_mode, core2, Size(100, Unit.MebiByte)).run() 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 cc85625..8aaf035 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 @@ -1,17 +1,18 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies # SPDX-License-Identifier: BSD-3-Clause # import pytest -import test_tools.udev from api.cas import casadm, casadm_parser, cli, cli_messages from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait +from test_tools.fs_tools import create_random_test_file +from test_tools.udev import Udev from tests.lazy_writes.recovery.recovery_tests_methods import copy_file, compare_files from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools from type_def.size import Size, Unit mount_point = "/mnt/cas" @@ -46,7 +47,7 @@ def test_stop_no_flush_load_cache(cache_mode): with TestRun.step(f"Create test file in mount point of exported object and check its md5 sum."): test_file_size = Size(48, Unit.MebiByte) - test_file = fs_utils.create_random_test_file(test_file_path, test_file_size) + test_file = create_random_test_file(test_file_path, test_file_size) test_file_md5_before = test_file.md5sum() copy_file(source=test_file.full_path, target=core.path, size=test_file_size, direct="oflag") @@ -99,5 +100,5 @@ def prepare(): core_dev = TestRun.disks['core'] core_dev.create_partitions([Size(2, Unit.GibiByte)]) core_part = core_dev.partitions[0] - test_tools.udev.Udev.disable() + Udev.disable() return cache_part, core_part 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 25c665b..8e61455 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 @@ -6,12 +6,11 @@ import pytest -import test_tools.fs_tools 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_tools import fs_tools, disk_tools -from test_tools.fs_tools import Filesystem +from test_tools.disk_tools import get_block_size, create_partitions +from test_tools.fs_tools import Filesystem, create_random_test_file, check_if_file_exists from test_utils.filesystem.file import File from test_utils.filesystem.symlink import Symlink from type_def.size import Size, Unit @@ -42,12 +41,12 @@ def test_load_cache_with_mounted_core(): cache = casadm.start_cache(cache_part, force=True) with TestRun.step("Add core device with xfs filesystem to cache and mount it."): - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core_part.create_filesystem(Filesystem.xfs) core = cache.add_core(core_part) core.mount(mount_point) with TestRun.step(f"Create test file in mount point of exported object and check its md5 sum."): - test_file = fs_utils.create_random_test_file(test_file_path) + test_file = create_random_test_file(test_file_path) test_file_md5_before = test_file.md5sum() with TestRun.step("Unmount core device."): @@ -111,13 +110,13 @@ def test_stop_cache_with_mounted_partition(): core2 = cache.add_core(core_dev2) with TestRun.step("Create partitions on one exported object."): - core.block_size = Size(disk_utils.get_block_size(core.get_device_id())) - disk_utils.create_partitions(core, 2 * [Size(4, Unit.GibiByte)]) + core.block_size = Size(get_block_size(core.get_device_id())) + create_partitions(core, 2 * [Size(4, Unit.GibiByte)]) fs_part = core.partitions[0] with TestRun.step("Create xfs filesystems on one exported object partition " "and on the non-partitioned exported object."): - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + fs_part.create_filesystem(Filesystem.xfs) core2.create_filesystem(Filesystem.xfs) with TestRun.step("Mount created filesystems."): @@ -125,7 +124,7 @@ def test_stop_cache_with_mounted_partition(): core2.mount(mount_point2) with TestRun.step("Ensure /etc/mtab exists."): - if not fs_utils.check_if_file_exists("/etc/mtab"): + if not check_if_file_exists("/etc/mtab"): Symlink.create_symlink("/proc/self/mounts", "/etc/mtab") with TestRun.step("Try to remove the core with partitions from cache."): @@ -181,12 +180,12 @@ def test_stop_cache_with_mounted_partition_no_mtab(): cache = casadm.start_cache(cache_part, force=True) with TestRun.step("Add core device with xfs filesystem and mount it."): - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core_part.create_filesystem(Filesystem.xfs) core = cache.add_core(core_part) core.mount(mount_point) with TestRun.step("Move /etc/mtab"): - if fs_utils.check_if_file_exists("/etc/mtab"): + if check_if_file_exists("/etc/mtab"): mtab = File("/etc/mtab") else: mtab = Symlink.create_symlink("/proc/self/mounts", "/etc/mtab") 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 2d25ba1..0fcd887 100644 --- a/test/functional/tests/fault_injection/test_fault_power_reboot.py +++ b/test/functional/tests/fault_injection/test_fault_power_reboot.py @@ -1,10 +1,10 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies # SPDX-License-Identifier: BSD-3-Clause # import time - import pytest from api.cas import casadm, cli, cli_messages 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 001b1f6..b0df135 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 @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest 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 6624b1c..d7d2be4 100644 --- a/test/functional/tests/fault_injection/test_primary_device_error.py +++ b/test/functional/tests/fault_injection/test_primary_device_error.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/incremental_load/test_core_pool.py b/test/functional/tests/incremental_load/test_core_pool.py index c4a808a..d94d895 100644 --- a/test/functional/tests/incremental_load/test_core_pool.py +++ b/test/functional/tests/incremental_load/test_core_pool.py @@ -1,11 +1,11 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest -import test_tools.fs_tools from api.cas import casadm from api.cas.core import CoreStatus from core.test_run import TestRun @@ -90,7 +90,7 @@ def test_core_pool_exclusive_open(): core_disk = TestRun.disks["core"] core_disk.create_partitions([Size(1, Unit.GibiByte)]) core_dev = core_disk.partitions[0] - test_tools.fs_utils.create_filesystem(Filesystem.ext4) + core_dev.create_filesystem(Filesystem.ext4) cache_id = 1 core_id = 1 @@ -127,7 +127,7 @@ def test_core_pool_exclusive_open(): with TestRun.step("Check if it is impossible to make filesystem on the core device " "from core pool."): try: - test_tools.fs_utils.create_filesystem(Filesystem.ext4, force=False) + core_dev.create_filesystem(Filesystem.ext4, force=False) TestRun.fail("Successfully created filesystem on core from core pool, " "this is unexpected behaviour.") except Exception: diff --git a/test/functional/tests/initialize/test_initialize_load.py b/test/functional/tests/initialize/test_initialize_load.py index 6801ee4..a01de01 100644 --- a/test/functional/tests/initialize/test_initialize_load.py +++ b/test/functional/tests/initialize/test_initialize_load.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -12,9 +13,10 @@ from api.cas.cache_config import (CleaningPolicy, FlushParametersAlru, Time, FlushParametersAcp) +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 * +from test_tools.fio.fio_param import IoEngine, ReadWrite, CpusAllowedPolicy from type_def.size import Size, Unit diff --git a/test/functional/tests/initialize/test_initialize_runlevel.py b/test/functional/tests/initialize/test_initialize_runlevel.py index 00f1a4c..1fc9eb9 100644 --- a/test/functional/tests/initialize/test_initialize_runlevel.py +++ b/test/functional/tests/initialize/test_initialize_runlevel.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -7,7 +8,6 @@ import os import pytest import time -import test_tools.runlevel from api.cas import casadm, casadm_parser from api.cas.cache_config import CacheMode from api.cas.init_config import InitConfig @@ -17,7 +17,7 @@ from test_tools.fs_tools import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_tools.os_tools import sync, drop_caches -from test_tools.runlevel import Runlevel +from test_tools.runlevel import Runlevel, change_runlevel from type_def.size import Size, Unit @@ -38,7 +38,7 @@ def test_init_reboot_runlevels(runlevel, cache_mode): - Cache should be loaded successfully after reboot. """ with TestRun.step(f"Set runlevel to {runlevel.value}."): - test_tools.runlevel.change_runlevel(runlevel) + change_runlevel(runlevel) with TestRun.step("Prepare CAS device."): cache_disk = TestRun.disks['cache'] @@ -88,5 +88,5 @@ def test_init_reboot_runlevels(runlevel, cache_mode): with TestRun.step("Stop cache and set default runlevel."): if len(caches) != 0: casadm.stop_all_caches() - test_tools.runlevel.change_runlevel(Runlevel.runlevel3) + change_runlevel(Runlevel.runlevel3) TestRun.executor.reboot() diff --git a/test/functional/tests/initialize/test_negative_load.py b/test/functional/tests/initialize/test_negative_load.py index 08608d8..1d07eb5 100644 --- a/test/functional/tests/initialize/test_negative_load.py +++ b/test/functional/tests/initialize/test_negative_load.py @@ -1,10 +1,11 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # - 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 diff --git a/test/functional/tests/initialize/test_startup_init_config.py b/test/functional/tests/initialize/test_startup_init_config.py index be0dcee..285213f 100644 --- a/test/functional/tests/initialize/test_startup_init_config.py +++ b/test/functional/tests/initialize/test_startup_init_config.py @@ -222,7 +222,7 @@ def test_cas_startup_lazy(): core_pool_paths = {c["device_path"] for c in core_pool_list} if core_pool_paths != expected_core_pool_paths: - TestRun.error( + TestRun.LOGGER.error( f"Expected the following devices in core pool " f"{expected_core_pool_paths}. Got {core_pool_paths}" ) @@ -231,7 +231,7 @@ def test_cas_startup_lazy(): caches_paths = {c["device_path"] for c in caches_list} if caches_paths != expected_caches_paths: - TestRun.error( + TestRun.LOGGER.error( f"Expected the following devices as caches " f"{expected_caches_paths}. Got {caches_paths}" ) @@ -240,7 +240,7 @@ def test_cas_startup_lazy(): cores_paths = {c["device_path"] for c in cores_list} if cores_paths != expected_cores_paths: - TestRun.error( + TestRun.LOGGER.error( f"Expected the following devices as cores " f"{expected_caches_paths}. Got {cores_paths}" ) @@ -447,14 +447,14 @@ def test_failover_config_startup(): cores_list = get_cas_devices_dict()["cores"].values() if len(core_pool_list) != 0: - TestRun.error(f"No cores expected in core pool. Got {core_pool_list}") + TestRun.LOGGER.error(f"No cores expected in core pool. Got {core_pool_list}") else: TestRun.LOGGER.info("Core pool is ok") expected_caches_paths = set([active_cache_path, standby_cache_path]) caches_paths = {c["device"] for c in caches_list} if caches_paths != expected_caches_paths: - TestRun.error( + TestRun.LOGGER.error( f"Expected the following devices as caches " f"{expected_caches_paths}. Got {caches_paths}" ) @@ -464,7 +464,7 @@ def test_failover_config_startup(): expected_core_paths = set([active_core_path]) cores_paths = {c["device"] for c in cores_list} if cores_paths != expected_core_paths: - TestRun.error( + TestRun.LOGGER.error( f"Expected the following devices as cores " f"{expected_core_paths}. Got {cores_paths}" ) diff --git a/test/functional/tests/io/test_io_engines.py b/test/functional/tests/io/test_io_engines.py index 29f9b62..4315994 100644 --- a/test/functional/tests/io/test_io_engines.py +++ b/test/functional/tests/io/test_io_engines.py @@ -1,13 +1,13 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # -from datetime import timedelta - import pytest -import test_tools.fs_tools +from datetime import timedelta + from api.cas import casadm from api.cas.cache_config import CacheMode from core.test_run import TestRun @@ -48,7 +48,7 @@ def test_io_engines(cache_mode, filesystem, io_engine): cache = casadm.start_cache(cache_dev, cache_mode, force=True) TestRun.LOGGER.info(f"Create filesystem '{filesystem}' on '{core_dev.path}'") - test_tools.fs_utils.create_filesystem(filesystem) + core_dev.create_filesystem(filesystem) core = cache.add_core(core_dev) core.mount(mount_point) 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 40b2e6d..1211cbd 100644 --- a/test/functional/tests/io/test_remove_device_during_io.py +++ b/test/functional/tests/io/test_remove_device_during_io.py @@ -1,10 +1,10 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import time - import pytest from datetime import timedelta diff --git a/test/functional/tests/io/test_write_fetch.py b/test/functional/tests/io/test_write_fetch.py index 6840199..8eb0815 100644 --- a/test/functional/tests/io/test_write_fetch.py +++ b/test/functional/tests/io/test_write_fetch.py @@ -1,11 +1,13 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # -import os +import os import pytest import uuid + from api.cas import casadm from api.cas.cache_config import CacheMode, CacheLineSize, CacheModeTrait from core.test_run import TestRun diff --git a/test/functional/tests/io/trim/test_trim.py b/test/functional/tests/io/trim/test_trim.py index 9783c1b..7ee8b98 100644 --- a/test/functional/tests/io/trim/test_trim.py +++ b/test/functional/tests/io/trim/test_trim.py @@ -3,22 +3,20 @@ # Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # + import posixpath import time - import pytest -import test_tools.fs_tools from test_tools.os_tools import sync, drop_caches from test_tools.udev import Udev from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet -from test_tools import fs_tools from test_tools.blktrace import BlkTrace, BlkTraceMask, RwbsKind from test_tools.disk_tools import check_if_device_supports_trim -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_random_test_file from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from type_def.size import Size, Unit @@ -230,14 +228,14 @@ def test_trim_device_discard_support( cache = casadm.start_cache(cache_dev, cache_mode, force=True) cache.set_cleaning_policy(cleaning_policy) - test_tools.fs_utils.create_filesystem(filesystem) + core_dev.create_filesystem(filesystem) core = cache.add_core(core_dev) with TestRun.step("Mount filesystem with discard option."): core.mount(mount_point, ["discard"]) with TestRun.step("Create random file."): - test_file = fs_utils.create_random_test_file( + test_file = create_random_test_file( posixpath.join(mount_point, "test_file"), core_dev.size * 0.2 ) occupancy_before = core.get_occupancy() diff --git a/test/functional/tests/io/trim/test_trim_stress.py b/test/functional/tests/io/trim/test_trim_stress.py index bea27d8..0ad03b6 100644 --- a/test/functional/tests/io/trim/test_trim_stress.py +++ b/test/functional/tests/io/trim/test_trim_stress.py @@ -1,11 +1,14 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import os -from datetime import timedelta import pytest + +from datetime import timedelta + from api.cas import casadm from api.cas.cache_config import CacheMode, CacheLineSize from core.test_run import TestRun diff --git a/test/functional/tests/io_class/io_class_common.py b/test/functional/tests/io_class/io_class_common.py index 7c6c3ef..dc14da5 100644 --- a/test/functional/tests/io_class/io_class_common.py +++ b/test/functional/tests/io_class/io_class_common.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 ba9fb4f..05e3a04 100644 --- a/test/functional/tests/io_class/test_io_class_cli.py +++ b/test/functional/tests/io_class/test_io_class_cli.py @@ -1,9 +1,9 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # - import pytest from api.cas import casadm, ioclass_config @@ -12,7 +12,7 @@ from api.cas.casadm_params import OutputFormat 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_tools +from test_tools.fs_tools import read_file, remove from type_def.size import Size, Unit ioclass_config_path = "/tmp/opencas_ioclass.conf" @@ -61,7 +61,7 @@ def test_io_class_export_configuration(): f"{casadm.list_io_classes_cmd(str(cache.cache_id), OutputFormat.csv.name)}" f" > {saved_config_path}" ) - csv = fs_utils.read_file(saved_config_path) + csv = read_file(saved_config_path) if not IoClass.compare_ioclass_lists(IoClass.csv_to_list(csv), random_list): TestRun.LOGGER.error( "Exported configuration does not match expected\n" @@ -98,7 +98,7 @@ def test_io_class_export_configuration(): ) with TestRun.LOGGER.step(f"Test cleanup"): - fs_utils.remove(saved_config_path) + remove(saved_config_path) def prepare(cache_mode: CacheMode = None): 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 8332ec6..c4e59c5 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 @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 b22e0ae..4d346f1 100644 --- a/test/functional/tests/io_class/test_io_class_directory.py +++ b/test/functional/tests/io_class/test_io_class_directory.py @@ -1,21 +1,20 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import random import time -from datetime import datetime - import pytest -import test_tools.fs_tools +from datetime import datetime + from api.cas import ioclass_config, casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory, remove from test_utils.filesystem.directory import Directory from test_utils.filesystem.file import File from test_tools.os_tools import drop_caches, DropCachesMode, sync @@ -47,19 +46,19 @@ def test_ioclass_directory_depth(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem and mount {core.path} " f"at {mountpoint}." ): - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() with TestRun.step(f"Create the base directory: {base_dir_path}."): - fs_utils.create_directory(base_dir_path) + create_directory(base_dir_path) with TestRun.step(f"Create a nested directory."): nested_dir_path = base_dir_path random_depth = random.randint(40, 80) for i in range(random_depth): nested_dir_path += f"/dir_{i}" - fs_utils.create_directory(path=nested_dir_path, parents=True) + create_directory(path=nested_dir_path, parents=True) # Test classification in nested dir by reading a previously unclassified file with TestRun.step("Create the first file in the nested directory."): @@ -177,9 +176,9 @@ def test_ioclass_directory_file_operations(filesystem): casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) with TestRun.step( - f"Prepare {filesystem.name} filesystem " f"and mounting {core.path} at {mountpoint}." + f"Prepare {filesystem.name} filesystem and mounting {core.path} at {mountpoint}." ): - test_tools.fs_utils.create_filesystem(fs_type=filesystem) + core.create_filesystem(fs_type=filesystem) core.mount(mount_point=mountpoint) sync() @@ -347,7 +346,7 @@ def test_ioclass_directory_dir_operations(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem " f"and mount {core.path} at {mountpoint}." ): - test_tools.fs_utils.create_filesystem(fs_type=filesystem) + core.create_filesystem(fs_type=filesystem) core.mount(mount_point=mountpoint) sync() @@ -399,7 +398,7 @@ def test_ioclass_directory_dir_operations(filesystem): ) with TestRun.step(f"Remove {classified_dir_path_2}."): - fs_utils.remove(path=classified_dir_path_2, force=True, recursive=True) + remove(path=classified_dir_path_2, force=True, recursive=True) sync() drop_caches(DropCachesMode.ALL) 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 1a0aa2a..5726bdc 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 @@ -1,11 +1,13 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # -from collections import namedtuple import pytest +from collections import namedtuple + from api.cas.ioclass_config import default_config_file_path from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun diff --git a/test/functional/tests/io_class/test_io_class_eviction_priority.py b/test/functional/tests/io_class/test_io_class_eviction_priority.py index cbd1352..8ea1bc4 100644 --- a/test/functional/tests/io_class/test_io_class_eviction_priority.py +++ b/test/functional/tests/io_class/test_io_class_eviction_priority.py @@ -1,17 +1,16 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # +import pytest + from collections import namedtuple from math import isclose -import pytest - -import test_tools.fs_tools from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory from .io_class_common import * @@ -38,7 +37,7 @@ def test_io_class_eviction_priority(): with TestRun.step(f"Preparing filesystem and mounting {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -51,7 +50,7 @@ def test_io_class_eviction_priority(): IoclassConfig(4, 1, 1.00, f"{mountpoint}/D"), ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Adding io classes for all dirs"): for io_class in io_classes: 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 cf4b891..b8424f1 100644 --- a/test/functional/tests/io_class/test_io_class_file.py +++ b/test/functional/tests/io_class/test_io_class_file.py @@ -1,13 +1,12 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import random - import pytest -import test_tools.fs_tools from api.cas import ioclass_config, casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan @@ -57,7 +56,7 @@ def test_ioclass_file_extension(): casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}."): - test_tools.fs_utils.create_filesystem(Filesystem.ext3) + core.create_filesystem(Filesystem.ext3) core.mount(mountpoint) with TestRun.step("Flush cache."): @@ -124,7 +123,7 @@ def test_ioclass_file_name_prefix(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): previous_occupancy = cache.get_occupancy() - test_tools.fs_utils.create_filesystem(Filesystem.ext3) + core.create_filesystem(Filesystem.ext3) core.mount(mountpoint) current_occupancy = cache.get_occupancy() @@ -210,7 +209,7 @@ def test_ioclass_file_extension_preexisting_filesystem(): with TestRun.step(f"Prepare files on raw block device."): casadm.remove_core(cache.cache_id, core_id=core.core_id) - test_tools.fs_utils.create_filesystem(Filesystem.ext3) + core.core_device.create_filesystem(Filesystem.ext3) core.core_device.mount(mountpoint) for ext in extensions: @@ -292,7 +291,7 @@ def test_ioclass_file_offset(): casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}."): - test_tools.fs_utils.create_filesystem(Filesystem.ext3) + core.create_filesystem(Filesystem.ext3) core.mount(mountpoint) with TestRun.step("Flush cache."): @@ -384,7 +383,7 @@ def test_ioclass_file_size(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem and mount {core.path} " f"at {mountpoint}." ): - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() 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 5ec1e87..6ac8e2b 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 @@ -6,15 +6,13 @@ import pytest -import test_tools.fs_tools from api.cas import casadm, ioclass_config from api.cas.cache_config import CacheMode from api.cas.ioclass_config import IoClass from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.lvm import Lvm, LvmConfiguration -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, read_file, remove from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from type_def.size import Size, Unit @@ -59,11 +57,11 @@ def test_io_class_lvm_on_cas(): lvm = lvms[0] with TestRun.step("Create filesystem for LVM and mount it."): - test_tools.fs_utils.create_filesystem(Filesystem.ext4) + lvm.create_filesystem(Filesystem.ext4) lvm.mount(mount_point) with TestRun.step("Prepare and load IO class config."): - io_classes = IoClass.csv_to_list(fs_utils.read_file("/etc/opencas/ioclass-config.csv")) + io_classes = IoClass.csv_to_list(read_file("/etc/opencas/ioclass-config.csv")) # remove two firs elements/lines: unclassified and metadata io_classes.pop(1) io_classes.pop(0) @@ -124,7 +122,7 @@ def test_io_class_lvm_on_cas(): else: file_size = Size(1100, Unit.MebiByte) - fs_utils.remove(io_target) + remove(io_target) with TestRun.step("Remove LVMs."): TestRun.executor.run(f"umount {mount_point}") 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 3732806..7dbaf17 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy.py +++ b/test/functional/tests/io_class/test_io_class_occupancy.py @@ -4,19 +4,17 @@ # SPDX-License-Identifier: BSD-3-Clause # +import pytest + from collections import namedtuple from math import isclose -import pytest - -import test_tools.fs_tools 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 core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Unit, Size @@ -57,7 +55,7 @@ def test_io_class_occupancy_directory_write(io_size_multiplication, cache_mode): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -70,7 +68,7 @@ def test_io_class_occupancy_directory_write(io_size_multiplication, cache_mode): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Remove old ioclass config"): ioclass_config.remove_ioclass_config() @@ -187,7 +185,7 @@ def test_io_class_occupancy_directory_read(io_size_multiplication): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -200,7 +198,7 @@ def test_io_class_occupancy_directory_read(io_size_multiplication): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step( f"In each directory create file with size of {io_size_multiplication} " @@ -317,7 +315,7 @@ def test_ioclass_occupancy_sum_cache(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -331,7 +329,7 @@ def test_ioclass_occupancy_sum_cache(): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Remove old ioclass config"): ioclass_config.remove_ioclass_config() diff --git a/test/functional/tests/io_class/test_io_class_occupancy_load.py b/test/functional/tests/io_class/test_io_class_occupancy_load.py index 3c73ade..d47ad99 100644 --- a/test/functional/tests/io_class/test_io_class_occupancy_load.py +++ b/test/functional/tests/io_class/test_io_class_occupancy_load.py @@ -1,21 +1,20 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # +import pytest + from collections import namedtuple from math import isclose -import pytest - -import test_tools.fs_tools 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 storage_devices.device import Device from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory from test_tools.os_tools import sync from test_tools.udev import Udev from tests.io_class.io_class_common import ( @@ -54,7 +53,7 @@ def test_ioclass_occupancy_load(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -67,7 +66,7 @@ def test_ioclass_occupancy_load(): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Remove old ioclass config"): ioclass_config.remove_ioclass_config() 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 6cadf9f..50833a6 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 @@ -1,21 +1,20 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # +import pytest + from collections import namedtuple from math import isclose -import pytest - -import test_tools.fs_tools 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 core.test_run_utils import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory, move from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Unit @@ -56,7 +55,7 @@ def test_ioclass_repart(io_class_size_multiplication): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -69,7 +68,7 @@ def test_ioclass_repart(io_class_size_multiplication): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Remove old io class config"): ioclass_config.remove_ioclass_config() @@ -125,7 +124,7 @@ def test_ioclass_repart(io_class_size_multiplication): with TestRun.step("Force repart - move files to created directories and read theirs contents"): for i, io_class in enumerate(io_classes): - fs_utils.move(source=f"{mountpoint}/{i}", destination=io_class.dir_path) + move(source=f"{mountpoint}/{i}", destination=io_class.dir_path) run_io_dir_read(f"{io_class.dir_path}/{i}") with TestRun.step("Check if each ioclass reached it's occupancy limit"): 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 09a11aa..47259a7 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 @@ -1,19 +1,19 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from recordclass import recordclass -import test_tools.fs_tools 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 core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory from test_tools.os_tools import sync from test_tools.udev import Udev from type_def.size import Unit @@ -48,7 +48,7 @@ def test_ioclass_resize(cache_line_size, new_occupancy): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -56,7 +56,7 @@ def test_ioclass_resize(cache_line_size, new_occupancy): IoclassConfig = recordclass("IoclassConfig", "id eviction_prio max_occupancy dir_path") io_class = IoclassConfig(2, 3, 0.10, f"{mountpoint}/A") - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Remove old ioclass config"): ioclass_config.remove_ioclass_config() 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 b01b530..05424f6 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 @@ -1,17 +1,17 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from collections import namedtuple from math import isclose -import test_tools.fs_tools from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from api.cas.ioclass_config import IoClass, default_config_file_path -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory from core.test_run import TestRun from type_def.size import Size, Unit from .io_class_common import ( @@ -44,7 +44,7 @@ def test_io_class_pinning_eviction(): cache_line_count = cache.get_statistics().config_stats.cache_size with TestRun.step("Mount filesystem"): - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core.create_filesystem(Filesystem.xfs) core.mount(mountpoint) with TestRun.step("Prepare test dirs"): @@ -58,7 +58,7 @@ def test_io_class_pinning_eviction(): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Remove old config"): ioclass_config.remove_ioclass_config() @@ -141,7 +141,7 @@ def test_pinned_ioclasses_eviction(): cache_line_count = cache.get_statistics().config_stats.cache_size with TestRun.step("Mount filesystem"): - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core.create_filesystem(Filesystem.xfs) core.mount(mountpoint) with TestRun.step("Prepare test dirs"): @@ -152,7 +152,7 @@ def test_pinned_ioclasses_eviction(): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Remove old config"): ioclass_config.remove_ioclass_config() 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 be9abec..cdc4ea1 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 @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 ab3bb5a..01d9268 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 @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -9,8 +10,8 @@ from api.cas import ioclass_config, cli_messages 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_tools from connection.utils.output import CmdException +from test_tools.fs_tools import read_file, write_file from type_def.size import Unit, Size from tests.io_class.io_class_common import prepare, ioclass_config_path @@ -86,7 +87,7 @@ def test_io_class_prevent_wrong_configuration(): f"{IoClass.default_header()}\n{loaded_io_classes_str}" ) - config_io_classes = IoClass.csv_to_list(fs_utils.read_file(ioclass_config_path)) + config_io_classes = IoClass.csv_to_list(read_file(ioclass_config_path)) if not IoClass.compare_ioclass_lists(config_io_classes, loaded_io_classes): TestRun.fail("Default IO class configuration not loaded correctly.") @@ -98,7 +99,7 @@ def test_io_class_prevent_wrong_configuration(): f"Preparing headerless configuration file with following content:\n" f"{headerless_configuration}" ) - fs_utils.write_file(ioclass_config_path, headerless_configuration) + write_file(ioclass_config_path, headerless_configuration) try_load_malformed_config( cache, config_io_classes, @@ -114,7 +115,7 @@ def test_io_class_prevent_wrong_configuration(): TestRun.LOGGER.info( f"Testing following header with default IO class:\n" f"{config_content}" ) - fs_utils.write_file(ioclass_config_path, config_content) + write_file(ioclass_config_path, config_content) try_load_malformed_config(cache, config_io_classes, expected_err_msg=err_message) with TestRun.step( @@ -123,7 +124,7 @@ def test_io_class_prevent_wrong_configuration(): ): config_content = f"{IoClass.default_header()}\n{double_io_class_configuration}" TestRun.LOGGER.info(f"Testing following configuration file:\n{config_content}") - fs_utils.write_file(ioclass_config_path, config_content) + write_file(ioclass_config_path, config_content) try_load_malformed_config( cache, config_io_classes, @@ -139,7 +140,7 @@ def test_io_class_prevent_wrong_configuration(): TestRun.LOGGER.info( f"Testing following header with default IO class:\n{config_content}" ) - fs_utils.write_file(ioclass_config_path, config_content) + write_file(ioclass_config_path, config_content) try_load_malformed_config(cache, config_io_classes, expected_err_msg=err_message) 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 f30299e..e8ab5f8 100644 --- a/test/functional/tests/io_class/test_io_class_process.py +++ b/test/functional/tests/io_class/test_io_class_process.py @@ -1,10 +1,10 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import time - import pytest from api.cas import ioclass_config, casadm 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 6e9e50a..33a7ea8 100644 --- a/test/functional/tests/io_class/test_io_class_purge.py +++ b/test/functional/tests/io_class/test_io_class_purge.py @@ -4,17 +4,15 @@ # SPDX-License-Identifier: BSD-3-Clause # -from collections import namedtuple - import pytest -import test_tools.fs_tools +from collections import namedtuple + from api.cas import ioclass_config, casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools from test_tools.dd import Dd -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory from test_tools.os_tools import drop_caches, DropCachesMode, sync from test_tools.udev import Udev from type_def.size import Unit, Size @@ -43,7 +41,7 @@ def test_ioclass_usage_sum(): with TestRun.step(f"Prepare filesystem and mount {core.path} at {mountpoint}"): filesystem = Filesystem.xfs - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -57,7 +55,7 @@ def test_ioclass_usage_sum(): ] for io_class in io_classes: - fs_utils.create_directory(io_class.dir_path, parents=True) + create_directory(io_class.dir_path, parents=True) with TestRun.step("Add io classes for all dirs"): ioclass_config.remove_ioclass_config() 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 3da3d73..321afe0 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 @@ -1,27 +1,27 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import os import pytest + from datetime import timedelta -import test_tools.fs_tools -import test_tools.runlevel -from api.cas import ioclass_config, casadm_parser from api.cas.cache_config import CacheMode from api.cas.casadm_params import StatsFilter +from api.cas.casadm_parser import get_caches, get_cores from api.cas.init_config import InitConfig -from api.cas.ioclass_config import IoClass +from api.cas.ioclass_config import IoClass, remove_ioclass_config, create_ioclass_config, \ + add_ioclass from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, copy, read_file from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import sync, drop_caches -from test_tools.runlevel import Runlevel +from test_tools.runlevel import Runlevel, change_runlevel from type_def.size import Size, Unit from tests.io_class.io_class_common import ( prepare, @@ -52,7 +52,7 @@ def test_io_class_service_load(runlevel): run_io_dir_read(core.path) with TestRun.step("Create ext4 filesystem on CAS device and mount it."): - test_tools.fs_utils.create_filesystem(Filesystem.ext4) + core.create_filesystem(Filesystem.ext4) core.mount(mountpoint) with TestRun.step( @@ -79,18 +79,18 @@ def test_io_class_service_load(runlevel): sync() with TestRun.step(f"Reboot system to runlevel {runlevel}."): - test_tools.runlevel.change_runlevel(runlevel) + change_runlevel(runlevel) TestRun.executor.reboot() with TestRun.step( "Check if CAS device loads properly - " "IO class configuration and statistics shall not change" ): - caches = casadm_parser.get_caches() + caches = get_caches() if len(caches) != 1: TestRun.fail("Cache did not start at boot time.") cache = caches[0] - cores = casadm_parser.get_cores(cache.cache_id) + cores = get_cores(cache.cache_id) if len(cores) != 1: TestRun.fail(f"Actual number of cores: {len(cores)}\nExpected number of cores: 1") core = cores[0] @@ -160,17 +160,17 @@ def run_io(): def prepare_and_load_io_class_config(cache, metadata_not_cached=False): - ioclass_config.remove_ioclass_config() + remove_ioclass_config() if metadata_not_cached: - ioclass_config.create_ioclass_config( + create_ioclass_config( add_default_rule=True, ioclass_config_path=ioclass_config_path ) - ioclass_config.add_ioclass(1, "metadata&done", 1, "0.00", ioclass_config_path) + add_ioclass(1, "metadata&done", 1, "0.00", ioclass_config_path) else: - fs_utils.copy(template_config_path, ioclass_config_path) + copy(template_config_path, ioclass_config_path) - config_io_classes = IoClass.csv_to_list(fs_utils.read_file(ioclass_config_path)) + config_io_classes = IoClass.csv_to_list(read_file(ioclass_config_path)) cache.load_io_class(ioclass_config_path) output_io_classes = cache.list_io_classes() if not IoClass.compare_ioclass_lists(config_io_classes, output_io_classes): 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 b5beee0..4748ca8 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 @@ -13,8 +13,7 @@ from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.ioclass_config import IoClass from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, remove, read_file from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_tools.os_tools import sync, drop_caches @@ -83,7 +82,7 @@ def test_io_class_stats_file_size_core_fs(cache_mode: CacheMode, filesystem: Fil issued_reqs_no = \ result[0].write_requests_number() + result[0].read_requests_number() check_statistics(cache, core, io_classes, io_class, issued_reqs_no) - fs_utils.remove(f"{core.mount_point}/*", force=True, recursive=True) + remove(f"{core.mount_point}/*", force=True, recursive=True) size_min = size + Size(512, Unit.Byte) @@ -140,7 +139,7 @@ def test_io_class_stats_file_size_core_direct(cache_mode: CacheMode): issued_reqs_no = \ result[0].write_requests_number() + result[0].read_requests_number() check_statistics(cache, core, io_classes, io_class_direct, issued_reqs_no) - fs_utils.remove(f"{core.path}/*", force=True, recursive=True) + remove(f"{core.path}/*", force=True, recursive=True) size_min = size + Size(512, Unit.Byte) @@ -191,7 +190,7 @@ def check_statistics(cache, core, io_classes, tested_io_class, issued_reqs_no): def prepare_io_classes(cache): - template_io_classes = IoClass.csv_to_list(fs_utils.read_file(template_config_path)) + template_io_classes = IoClass.csv_to_list(read_file(template_config_path)) test_io_classes = [] for io_class in template_io_classes: 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 14b8c90..fbd32e8 100644 --- a/test/functional/tests/io_class/test_io_class_wlth.py +++ b/test/functional/tests/io_class/test_io_class_wlth.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/io_class/test_io_classification.py b/test/functional/tests/io_class/test_io_classification.py index b3a5b9b..aca002c 100644 --- a/test/functional/tests/io_class/test_io_classification.py +++ b/test/functional/tests/io_class/test_io_classification.py @@ -1,22 +1,22 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import random import time -from itertools import permutations - import pytest -import test_tools.fs_tools +from itertools import permutations + from api.cas import ioclass_config, casadm 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_tools from test_tools.dd import Dd -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_directory, remove, \ + replace_first_pattern_occurrence from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.filesystem.file import File @@ -233,7 +233,7 @@ def test_ioclass_direct(filesystem): f"Preparing {filesystem.name} filesystem and mounting {core.path} at" f" {mountpoint}" ) - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() else: @@ -329,7 +329,7 @@ def test_ioclass_metadata(filesystem): with TestRun.step( f"Prepare {filesystem.name} filesystem and mount {core.path} " f"at {mountpoint}." ): - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -373,7 +373,7 @@ def test_ioclass_metadata(filesystem): with TestRun.step(f"Create directory {test_dir_path}."): requests_to_metadata_before = requests_to_metadata_after - fs_utils.create_directory(path=test_dir_path) + create_directory(path=test_dir_path) TestRun.LOGGER.info(f"Moving test files into {test_dir_path}") for file in files: @@ -388,7 +388,7 @@ def test_ioclass_metadata(filesystem): TestRun.fail("No requests to metadata while moving files!") with TestRun.step(f"Remove {test_dir_path}."): - fs_utils.remove(path=test_dir_path, force=True, recursive=True) + remove(path=test_dir_path, force=True, recursive=True) with TestRun.step("Check requests to metadata."): requests_to_metadata_after = cache.get_io_class_statistics( @@ -475,9 +475,9 @@ def test_ioclass_id_as_condition(): with TestRun.step( f"Prepare {filesystem.name} filesystem " f"and mount {core.path} at {mountpoint}." ): - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) - fs_utils.create_directory(base_dir_path) + create_directory(base_dir_path) sync() # CAS needs some time to resolve directory to inode time.sleep(ioclass_config.MAX_CLASSIFICATION_DELAY.seconds) @@ -616,10 +616,10 @@ def test_ioclass_conditions_or(): with TestRun.step( f"Prepare {filesystem.name} filesystem " f"and mount {core.path} at {mountpoint}." ): - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) for i in range(1, 6): - fs_utils.create_directory(f"{mountpoint}/dir{i}") + create_directory(f"{mountpoint}/dir{i}") sync() with TestRun.step("Perform IO fulfilling each condition and check if occupancy raises."): @@ -683,7 +683,7 @@ def test_ioclass_conditions_and(): TestRun.LOGGER.info( f"Preparing {filesystem.name} filesystem " f"and mounting {core.path} at {mountpoint}" ) - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) sync() @@ -744,9 +744,9 @@ def test_ioclass_effective_ioclass(): with TestRun.LOGGER.step( f"Preparing {filesystem.name} filesystem " f"and mounting {core.path} at {mountpoint}" ): - test_tools.fs_utils.create_filesystem(filesystem) + core.create_filesystem(filesystem) core.mount(mountpoint) - fs_utils.create_directory(test_dir) + create_directory(test_dir) sync() for i, permutation in TestRun.iteration(enumerate(permutations(range(1, 5)), start=1)): @@ -832,7 +832,7 @@ def add_done_to_second_non_exclusive_condition(rules, permutation, cache): if non_exclusive_conditions == 2: break second_class_id += 1 - fs_utils.replace_first_pattern_occurrence(ioclass_config_path, rules[idx], f"{rules[idx]}&done") + replace_first_pattern_occurrence(ioclass_config_path, rules[idx], f"{rules[idx]}&done") sync() casadm.load_io_classes(cache_id=cache.cache_id, file=ioclass_config_path) return second_class_id 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 22c2c13..bd40b94 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py @@ -6,11 +6,11 @@ import random import time +import pytest + from collections import namedtuple from datetime import timedelta -import pytest - from api.cas import casadm from api.cas.cache_config import ( CacheMode, 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 3cbb03e..9f659dd 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py @@ -1,13 +1,14 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import time -from datetime import timedelta - import pytest +from datetime import timedelta + from api.cas import casadm from api.cas.cache_config import CacheMode, CleaningPolicy, FlushParametersAlru, SeqCutOffPolicy from core.test_run import TestRun 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 219e233..5c9e163 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 @@ -1,10 +1,10 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import time - import pytest from api.cas import casadm 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 df9ea76..a9ca52c 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 @@ -1,12 +1,14 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # +import pytest + from datetime import timedelta from time import sleep -import pytest from api.cas import casadm from api.cas.cache_config import CacheMode, CleaningPolicy from core.test_run_utils import TestRun 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 8b97e09..deed0bd 100644 --- a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py +++ b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py @@ -1,20 +1,21 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # from datetime import timedelta -import test_tools.common.wait +from test_tools.common.wait import wait from core.test_run import TestRun -from test_tools import fs_tools from test_tools.dd import Dd +from test_tools.fs_tools import create_random_test_file from test_utils.filesystem.file import File from type_def.size import Size, Unit def create_test_files(test_file_size): - source_file = fs_utils.create_random_test_file("/tmp/source_test_file", test_file_size) + source_file = create_random_test_file("/tmp/source_test_file", test_file_size) target_file = File.create_file("/tmp/target_test_file") return source_file, target_file @@ -47,8 +48,10 @@ def power_cycle_dut(wait_for_flush_begin=False, core_device=None): raise Exception("Core device is None.") TestRun.LOGGER.info("Waiting for flushing to begin...") core_writes_before = core_device.get_io_stats().sectors_written - test_tools.common.wait.wait(lambda: core_writes_before < core_device.get_io_stats().sectors_written, - timedelta(minutes=3), - timedelta(milliseconds=100)) + wait( + lambda: core_writes_before < core_device.get_io_stats().sectors_written, + timedelta(minutes=3), + timedelta(milliseconds=100) + ) power_control = TestRun.plugin_manager.get_plugin('power_control') power_control.power_cycle() 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 38c1b3f..8f19b18 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 @@ -1,13 +1,12 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import os - import pytest -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait, CacheLineSize, CleaningPolicy, \ FlushParametersAcp @@ -58,7 +57,7 @@ def test_recovery_all_options(cache_mode, cache_line_size, cleaning_policy, file file_md5 = test_file.md5sum() with TestRun.step(f"Make {filesystem} on core device."): - test_tools.fs_utils.create_filesystem(filesystem) + core_device.create_filesystem(filesystem) with TestRun.step("Mount core device."): core_device.mount(mount_point) 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 7ebcce3..489a0b9 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 @@ -1,13 +1,12 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import os - import pytest -import test_tools.fs_tools from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy from core.test_run import TestRun @@ -125,8 +124,8 @@ def test_recovery_flush_reset_fs(cache_mode, fs): cache_device = cache_disk.partitions[0] core_device = core_disk.partitions[0] - with TestRun.step(f"Create {fs} filesystem on core."): - test_tools.fs_utils.create_filesystem(fs) + with TestRun.step(f"Create {fs} filesystem on core device."): + core_device.create_filesystem(fs) with TestRun.step("Create test files."): source_file, target_file = create_test_files(test_file_size) @@ -151,7 +150,7 @@ def test_recovery_flush_reset_fs(cache_mode, fs): core.unmount() with TestRun.step("Trigger flush."): - os_utils.drop_caches(DropCachesMode.ALL) + drop_caches(DropCachesMode.ALL) TestRun.executor.run_in_background(cli.flush_cache_cmd(f"{cache.cache_id}")) with TestRun.step("Hard reset DUT during data flushing."): 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 e43b02f..3b665d1 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py @@ -5,10 +5,8 @@ # import os - import pytest -import test_tools.fs_tools from api.cas import casadm, cli_messages from api.cas.cache_config import CacheMode, CacheModeTrait, CacheLineSize from core.test_run import TestRun @@ -54,7 +52,7 @@ def test_recovery_unplug_cache_fs(cache_mode, cls, filesystem, direct): source_file_md5 = source_file.md5sum() with TestRun.step("Create filesystem on core device."): - test_tools.fs_utils.create_filesystem(filesystem) + core_device.create_filesystem(filesystem) with TestRun.step("Start cache and add core."): cache = casadm.start_cache(cache_device, cache_mode, cls) diff --git a/test/functional/tests/lazy_writes/test_clean_load.py b/test/functional/tests/lazy_writes/test_clean_load.py index c408503..11c244e 100644 --- a/test/functional/tests/lazy_writes/test_clean_load.py +++ b/test/functional/tests/lazy_writes/test_clean_load.py @@ -1,9 +1,11 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from api.cas import casadm, casadm_parser from api.cas.cache_config import CacheMode, CleaningPolicy from core.test_run_utils import TestRun diff --git a/test/functional/tests/lazy_writes/test_dirty_load.py b/test/functional/tests/lazy_writes/test_dirty_load.py index afbd16f..f9e7d80 100644 --- a/test/functional/tests/lazy_writes/test_dirty_load.py +++ b/test/functional/tests/lazy_writes/test_dirty_load.py @@ -1,9 +1,11 @@ # # Copyright(c) 2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from api.cas import casadm, casadm_parser from api.cas.cache_config import CacheMode, CleaningPolicy from core.test_run_utils import TestRun 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 8f34a8d..0aa6b35 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 @@ -5,9 +5,9 @@ # import pytest + from datetime import timedelta -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait, CleaningPolicy, SeqCutOffPolicy from api.cas.cli import stop_cmd @@ -56,7 +56,7 @@ def test_flush_over_640_gibibytes_with_fs(cache_mode, fs): cache = casadm.start_cache(cache_part, cache_mode) with TestRun.step(f"Add core with {fs.name} filesystem to cache and mount it."): - test_tools.fs_utils.create_filesystem(fs) + core_dev.create_filesystem(fs) core = cache.add_core(core_dev) core.mount(mnt_point) @@ -66,7 +66,7 @@ def test_flush_over_640_gibibytes_with_fs(cache_mode, fs): with TestRun.step("Create a test file on a separate disk"): src_dir_path = "/mnt/flush_640G_test" - test_tools.fs_utils.create_filesystem(fs) + separate_dev.create_filesystem(fs) separate_dev.mount(src_dir_path) test_file_main = File.create_file(f"{src_dir_path}/test_file_main") 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 c507a4b..8b5ce6c 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_clean.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_clean.py @@ -1,11 +1,11 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies # SPDX-License-Identifier: BSD-3-Clause # import pytest -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode, CleaningPolicy, CacheModeTrait, SeqCutOffPolicy from storage_devices.device import Device @@ -180,7 +180,7 @@ def test_clean_remove_core_with_fs(cache_mode, fs): cache = casadm.start_cache(cache_part, cache_mode) with TestRun.step(f"Add core with {fs.name} filesystem to cache and mount it."): - test_tools.fs_utils.create_filesystem(fs) + core_part.create_filesystem(fs) core = cache.add_core(core_part) core.mount(mnt_point) 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 c1c4e47..cc4eaa9 100644 --- a/test/functional/tests/lazy_writes/test_lazy_writes_signals.py +++ b/test/functional/tests/lazy_writes/test_lazy_writes_signals.py @@ -1,12 +1,13 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies # SPDX-License-Identifier: BSD-3-Clause # import pytest + from time import sleep -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import (CacheMode, CacheModeTrait, @@ -47,7 +48,7 @@ def test_flush_signal_core(cache_mode): with TestRun.step("Start cache and add SCSI device with xfs filesystem as core."): cache = casadm.start_cache(cache_part, cache_mode) - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core_dev.create_filesystem(Filesystem.xfs) core = cache.add_core(core_dev) with TestRun.step("Mount exported object."): @@ -145,7 +146,7 @@ def test_flush_signal_cache(cache_mode): with TestRun.step("Start SCSI device as cache and add core with xfs filesystem."): cache = casadm.start_cache(cache_dev, cache_mode) - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core_part.create_filesystem(Filesystem.xfs) core = cache.add_core(core_part) with TestRun.step("Mount exported object."): 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 f6a00ef..5d02f93 100644 --- a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py +++ b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py @@ -4,9 +4,10 @@ # SPDX-License-Identifier: BSD-3-Clause # +import pytest + from datetime import timedelta -import pytest from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.casadm_parser import get_flushing_progress, wait_for_flushing diff --git a/test/functional/tests/lazy_writes/test_wb_throttling.py b/test/functional/tests/lazy_writes/test_wb_throttling.py index 39e9b50..98fd7ac 100644 --- a/test/functional/tests/lazy_writes/test_wb_throttling.py +++ b/test/functional/tests/lazy_writes/test_wb_throttling.py @@ -1,9 +1,11 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies # SPDX-License-Identifier: BSD-3-Clause # import pytest + from datetime import timedelta from type_def.size import Size, Unit @@ -40,8 +42,8 @@ def test_wb_throttling(): description: | Fill cache with data, run intensive IO (rwmix=74) with occasional trims. pass_criteria: - - Hang task did not occurred - - System did not crashed + - Hang task did not occur + - System did not crash """ with TestRun.step("Prepare devices."): cache_device = TestRun.disks["cache"] 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 8a4b18e..f65af8f 100644 --- a/test/functional/tests/memory/test_check_number_of_processes.py +++ b/test/functional/tests/memory/test_check_number_of_processes.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/misc/test_device_capabilities.py b/test/functional/tests/misc/test_device_capabilities.py index 8b7d416..665978d 100644 --- a/test/functional/tests/misc/test_device_capabilities.py +++ b/test/functional/tests/misc/test_device_capabilities.py @@ -5,7 +5,6 @@ # import math -import posixpath import pytest from api.cas import casadm, cli_messages @@ -13,8 +12,8 @@ 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 test_tools import disk_tools from connection.utils.output import CmdException +from test_tools.disk_tools import get_block_size, get_size from type_def.size import Size, Unit @@ -103,8 +102,8 @@ def create_scsi_debug_device(sector_size: int, physblk_exp: int, dev_size_mb=102 def prepare_cas_device(cache_device, core_device): cache = casadm.start_cache(cache_device, cache_line_size=CacheLineSize.LINE_64KiB, force=True) try: - cache_dev_bs = disk_utils.get_block_size(cache_device.device_id) - core_dev_bs = disk_utils.get_block_size(core_device.device_id) + cache_dev_bs = get_block_size(cache_device.device_id) + core_dev_bs = get_block_size(core_device.device_id) core = cache.add_core(core_device) if cache_dev_bs > core_dev_bs: TestRun.LOGGER.error( @@ -154,9 +153,9 @@ def compare_capabilities(cache_device, core_device, cache, core, msg): cli_messages.try_add_core_sector_size_mismatch) else: core_dev_sectors_num = \ - disk_utils.get_size(core_device.device_id) / disk_utils.get_block_size( + get_size(core_device.device_id) / get_block_size( core_device.device_id) - core_sectors_num = disk_utils.get_size(core.device_id) / disk_utils.get_block_size( + core_sectors_num = get_size(core.device_id) / get_block_size( core.device_id) if core_dev_sectors_num != core_sectors_num: TestRun.LOGGER.error( diff --git a/test/functional/tests/misc/test_files_permissions.py b/test/functional/tests/misc/test_files_permissions.py index a624124..bfe9ee2 100644 --- a/test/functional/tests/misc/test_files_permissions.py +++ b/test/functional/tests/misc/test_files_permissions.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: BSD-3-Clause # - import os from test_tools.git import get_repo_files diff --git a/test/functional/tests/misc/test_flush_propagation.py b/test/functional/tests/misc/test_flush_propagation.py index a7e8b61..14a041f 100644 --- a/test/functional/tests/misc/test_flush_propagation.py +++ b/test/functional/tests/misc/test_flush_propagation.py @@ -1,12 +1,13 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from time import sleep -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import ( CacheMode, @@ -45,7 +46,7 @@ def test_flush_signal_propagation_cache(): with TestRun.step("Start cache on SCSI device and add core with xfs filesystem"): cache = casadm.start_cache(cache_dev, CacheMode.WT) - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core_dev.create_filesystem(Filesystem.xfs) core = cache.add_core(core_dev) with TestRun.step("Turn off cleaning policy and sequential cutoff"): @@ -91,7 +92,7 @@ def test_flush_signal_propagation_core(): with TestRun.step("Start cache and add SCSI device with xfs filesystem as core."): cache = casadm.start_cache(cache_dev, CacheMode.WT) - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core_dev.create_filesystem(Filesystem.xfs) core = cache.add_core(core_dev) with TestRun.step("Turn off cleaning policy and sequential cutoff"): diff --git a/test/functional/tests/misc/test_weak_modules.py b/test/functional/tests/misc/test_weak_modules.py index d1dfe21..23be5ab 100644 --- a/test/functional/tests/misc/test_weak_modules.py +++ b/test/functional/tests/misc/test_weak_modules.py @@ -1,14 +1,14 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # - import os import re - import pytest +from api.cas.cas_packaging import Packages from api.cas.installer import clean_opencas_repo, rsync_opencas_sources from core.test_run import TestRun from test_tools.fs_tools import ( @@ -17,7 +17,6 @@ from test_tools.fs_tools import ( readlink, remove, ) -from api.cas.packaging import Packages modules_links_dir = "/lib/modules/$(uname -r)/weak-updates/block/opencas" 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 597ff45..49cd5f1 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 @@ -1,9 +1,11 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar 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 b89c2f2..4b59e43 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 @@ -1,12 +1,14 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # +import pytest + from datetime import timedelta from time import sleep -import pytest from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar 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 5846a03..d2fa6cc 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 @@ -1,9 +1,11 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar 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 1101c6a..0e39848 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 @@ -1,9 +1,11 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar 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 fc7c714..fe8f7b3 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 @@ -1,9 +1,11 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from api.cas import casadm, cli from api.cas.cache_config import CacheMode, CleaningPolicy, SeqCutOffPolicy from api.cas.progress_bar import check_progress_bar diff --git a/test/functional/tests/security/fuzzy/kernel/common/common.py b/test/functional/tests/security/fuzzy/kernel/common/common.py index 7c95060..a64982d 100644 --- a/test/functional/tests/security/fuzzy/kernel/common/common.py +++ b/test/functional/tests/security/fuzzy/kernel/common/common.py @@ -3,15 +3,15 @@ # Copyright(c) 2024 Huawei Technologies # SPDX-License-Identifier: BSD-3-Clause # + import base64 import os import posixpath +import yaml + from collections import namedtuple from typing import List -import yaml - -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode, CacheLineSize, KernelParameters, CleaningPolicy from core.test_run import TestRun @@ -67,7 +67,7 @@ def prepare_cas_instance( cache.set_cleaning_policy(cleaning_policy) if mount_point: - test_tools.fs_utils.create_filesystem(Filesystem.ext4) + core_device.create_filesystem(Filesystem.ext4) core = cache.add_core(core_device) core.mount(mount_point) else: diff --git a/test/functional/tests/security/test_compilation_flags.py b/test/functional/tests/security/test_compilation_flags.py index 2ae1142..b9a7357 100644 --- a/test/functional/tests/security/test_compilation_flags.py +++ b/test/functional/tests/security/test_compilation_flags.py @@ -1,11 +1,11 @@ # # Copyright(c) 2019-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import os import re - import pytest from core.test_run import TestRun diff --git a/test/functional/tests/security/test_security_user.py b/test/functional/tests/security/test_security_user.py index 601d122..0f8a618 100644 --- a/test/functional/tests/security/test_security_user.py +++ b/test/functional/tests/security/test_security_user.py @@ -6,15 +6,13 @@ import pytest -import test_tools.fs_tools from api.cas import casadm, cli from api.cas.cache_config import CacheMode from api.cas.casadm_params import OutputFormat from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, ls_item, parse_ls_output from test_tools.os_tools import create_user, check_if_user_exists from connection.utils.output import CmdException from type_def.size import Size, Unit @@ -52,18 +50,18 @@ def test_user_cli(): cache = casadm.start_cache(cache_dev, force=True) with TestRun.step("Add core to cache and mount it."): - test_tools.fs_utils.create_filesystem(Filesystem.ext3) + core_part1.create_filesystem(Filesystem.ext3) core = cache.add_core(core_part1) core.mount(mount_point) with TestRun.step(f"Copy casadm bin from {system_casadm_bin_path} " f"to {user_casadm_bin_dest_path}."): - casadm_bin = fs_utils.parse_ls_output(fs_utils.ls_item(f"{system_casadm_bin_path}"))[0] + casadm_bin = parse_ls_output(ls_item(f"{system_casadm_bin_path}"))[0] casadm_bin_copy = casadm_bin.copy(user_casadm_bin_dest_path, True) casadm_bin_copy.chmod_numerical(777) with TestRun.step("Copy IO class config."): - io_conf = fs_utils.parse_ls_output(fs_utils.ls_item(f"{ioclass_config_path}"))[0] + io_conf = parse_ls_output(ls_item(f"{ioclass_config_path}"))[0] io_conf_copy = io_conf.copy(ioclass_config_copy_path, force=True) with TestRun.step("Unmount core."): @@ -404,7 +402,7 @@ def test_user_service(): cache = casadm.start_cache(cache_dev, force=True) with TestRun.step("Add core to cache and mount it."): - test_tools.fs_utils.create_filesystem(Filesystem.ext3) + core_dev.create_filesystem(Filesystem.ext3) core = cache.add_core(core_dev) core.mount(mount_point) @@ -413,7 +411,7 @@ def test_user_service(): with TestRun.step(f"Copy casadm bin from {system_casadm_bin_path} " f"to {user_casadm_bin_dest_path}."): - casadm_bin = fs_utils.parse_ls_output(fs_utils.ls_item(f"{system_casadm_bin_path}"))[0] + casadm_bin = parse_ls_output(ls_item(f"{system_casadm_bin_path}"))[0] casadm_bin_copy = casadm_bin.copy(user_casadm_bin_dest_path, True) casadm_bin_copy.chmod_numerical(777) diff --git a/test/functional/tests/stats/test_block_stats.py b/test/functional/tests/stats/test_block_stats.py index b45121c..67c0fbf 100644 --- a/test/functional/tests/stats/test_block_stats.py +++ b/test/functional/tests/stats/test_block_stats.py @@ -5,7 +5,6 @@ # import json - import pytest from api.cas import casadm diff --git a/test/functional/tests/stats/test_consistency_between_outputs.py b/test/functional/tests/stats/test_consistency_between_outputs.py index 6089892..f697463 100644 --- a/test/functional/tests/stats/test_consistency_between_outputs.py +++ b/test/functional/tests/stats/test_consistency_between_outputs.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -7,7 +8,6 @@ import random import re import pytest -import test_tools.fs_tools from api.cas.cache_config import CacheMode, CacheLineSize, CacheModeTrait from api.cas.casadm import OutputFormat, print_statistics, start_cache from core.test_run import TestRun @@ -46,7 +46,7 @@ def test_output_consistency(cache_line_size, cache_mode, test_object): with TestRun.step("Start cache and add core with a filesystem."): cache = start_cache(cache_part, cache_mode, cache_line_size, force=True) - test_tools.fs_utils.create_filesystem(Filesystem.xfs) + core_part.create_filesystem(Filesystem.xfs) exp_obj = cache.add_core(core_part) with TestRun.step("Select object to test."): diff --git a/test/functional/tests/stats/test_display_statistics.py b/test/functional/tests/stats/test_display_statistics.py index 468ff37..bcd99cb 100644 --- a/test/functional/tests/stats/test_display_statistics.py +++ b/test/functional/tests/stats/test_display_statistics.py @@ -1,14 +1,13 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # - +import pytest import time from datetime import timedelta -import pytest - from api.cas import casadm from api.cas.cache_config import ( CacheLineSize, diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index 581b76b..9d29728 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -1,12 +1,12 @@ # # Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # -import random +import random import pytest -import test_tools.fs_tools from api.cas import casadm from api.cas import ioclass_config from api.cas.cache_config import CleaningPolicy, CacheMode, CacheLineSize @@ -311,7 +311,7 @@ def prepare(random_cls, cache_count=1, cores_per_cache=1): cache_devices = cache_device.partitions core_devices = core_device.partitions for core_device in core_devices: - test_tools.fs_utils.create_filesystem(Filesystem.ext4) + core_device.create_filesystem(Filesystem.ext4) Udev.disable() caches, cores = [], [] diff --git a/test/functional/tests/stats/test_stat_max.py b/test/functional/tests/stats/test_stat_max.py index 815cd45..9aee7c7 100644 --- a/test/functional/tests/stats/test_stat_max.py +++ b/test/functional/tests/stats/test_stat_max.py @@ -4,10 +4,10 @@ # SPDX-License-Identifier: BSD-3-Clause # -from time import sleep - import pytest +from time import sleep + from api.cas import casadm from api.cas.cache_config import CacheMode, CleaningPolicy from api.cas.casadm import StatsFilter diff --git a/test/functional/tests/stats/test_statistics_integrity.py b/test/functional/tests/stats/test_statistics_integrity.py index 8a67679..f4238e5 100644 --- a/test/functional/tests/stats/test_statistics_integrity.py +++ b/test/functional/tests/stats/test_statistics_integrity.py @@ -4,10 +4,10 @@ # SPDX-License-Identifier: BSD-3-Clause # -from time import sleep - import pytest +from time import sleep + from api.cas import casadm from api.cas.cache_config import CacheMode, CacheModeTrait from api.cas.casadm import StatsFilter diff --git a/test/functional/tests/stress/test_stress_attach_detach.py b/test/functional/tests/stress/test_stress_attach_detach.py index f10a29f..8b5492b 100644 --- a/test/functional/tests/stress/test_stress_attach_detach.py +++ b/test/functional/tests/stress/test_stress_attach_detach.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 f59ec7b..0687b6a 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 @@ -1,5 +1,6 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # 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 220787b..12e18b4 100644 --- a/test/functional/tests/stress/test_stress_cleaning_policy_change.py +++ b/test/functional/tests/stress/test_stress_cleaning_policy_change.py @@ -1,5 +1,6 @@ # # Copyright(c) 2024 Huawei Technologies Co., Ltd. +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -7,7 +8,6 @@ import posixpath import random import pytest -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import ( CacheMode, @@ -105,7 +105,7 @@ def test_change_cleaning_policy_during_io_fs(filesystem): cache = casadm.start_cache(cache_dev.partitions[0], CacheMode.WB, force=True) with TestRun.step(f"Create filesystem on core device"): - test_tools.fs_utils.create_filesystem(filesystem) + core_dev.create_filesystem(filesystem) with TestRun.step(f"Add core to the cache"): core = cache.add_core(core_dev) 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 fc362ba..a87ca20 100644 --- a/test/functional/tests/stress/test_stress_io_small_device.py +++ b/test/functional/tests/stress/test_stress_io_small_device.py @@ -1,9 +1,11 @@ # # Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest + from datetime import timedelta from api.cas import casadm, casadm_parser diff --git a/test/functional/tests/stress/test_stress_shutdown.py b/test/functional/tests/stress/test_stress_shutdown.py index 73712da..4df44a1 100644 --- a/test/functional/tests/stress/test_stress_shutdown.py +++ b/test/functional/tests/stress/test_stress_shutdown.py @@ -1,11 +1,14 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import time import pytest + from datetime import timedelta + from api.cas import casadm, casadm_parser from api.cas.cache_config import CacheLineSize, CacheMode, CleaningPolicy, CacheModeTrait from api.cas.init_config import InitConfig diff --git a/test/functional/tests/stress/test_stress_without_io.py b/test/functional/tests/stress/test_stress_without_io.py index c78f8b0..1772f62 100644 --- a/test/functional/tests/stress/test_stress_without_io.py +++ b/test/functional/tests/stress/test_stress_without_io.py @@ -1,5 +1,6 @@ # # Copyright(c) 2019-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -11,8 +12,7 @@ from api.cas.cache_config import CacheMode from api.cas.init_config import InitConfig from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_random_test_file from type_def.size import Size, Unit iterations_per_config = 50 @@ -293,7 +293,7 @@ def prepare_with_file_creation(config): core = cache.add_core(core_dev) core.create_filesystem(Filesystem.ext3) core.mount(mount_point) - file = fs_utils.create_random_test_file(test_file_path) + file = create_random_test_file(test_file_path) file_md5sum = file.md5sum() core.unmount() return cache, core, file, file_md5sum diff --git a/test/functional/tests/volumes/common.py b/test/functional/tests/volumes/common.py index b9bbb9e..6166c82 100644 --- a/test/functional/tests/volumes/common.py +++ b/test/functional/tests/volumes/common.py @@ -5,9 +5,9 @@ # from api.cas.init_config import InitConfig, opencas_conf_path -from test_tools import fs_tools from core.test_run import TestRun from test_tools.disk_tools import get_block_device_names_list +from test_tools.fs_tools import create_random_test_file, parse_ls_output, ls_item from type_def.size import Size, Unit test_file_size = Size(500, Unit.KiloByte) @@ -23,7 +23,7 @@ def create_files_with_md5sums(destination_path, files_count): temp_file = f"/tmp/file{i}" destination_file = f"{destination_path}/file{i}" - test_file = fs_utils.create_random_test_file(temp_file, test_file_size) + test_file = create_random_test_file(temp_file, test_file_size) test_file.copy(destination_file, force=True) md5sums.append(test_file.md5sum()) @@ -37,12 +37,12 @@ def compare_md5sums(md5_sums_source, files_to_check_path, copy_to_tmp=False): for i in range(md5_sums_elements): file_to_check_path = f"{files_to_check_path}/file{i}" - file_to_check = fs_utils.parse_ls_output(fs_utils.ls_item(file_to_check_path))[0] + file_to_check = parse_ls_output(ls_item(file_to_check_path))[0] if copy_to_tmp: file_to_check_path = f"{files_to_check_path}/filetmp" file_to_check.copy(file_to_check_path, force=True) - file_to_check = fs_utils.parse_ls_output(fs_utils.ls_item(file_to_check_path))[0] + file_to_check = parse_ls_output(ls_item(file_to_check_path))[0] if md5_sums_source[i] != file_to_check.md5sum(): TestRun.fail(f"Source and target files {file_to_check_path} checksums are different.") 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 34c9376..14cdbe7 100644 --- a/test/functional/tests/volumes/test_discard_on_huge_core.py +++ b/test/functional/tests/volumes/test_discard_on_huge_core.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2021 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # diff --git a/test/functional/tests/volumes/test_multilevel_cache_3.py b/test/functional/tests/volumes/test_multilevel_cache_3.py index 711fafe..93ee4b2 100644 --- a/test/functional/tests/volumes/test_multilevel_cache_3.py +++ b/test/functional/tests/volumes/test_multilevel_cache_3.py @@ -1,10 +1,11 @@ # # Copyright(c) 2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # - import pytest + from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from api.cas.cache import CacheMode, casadm diff --git a/test/functional/tests/volumes/test_raid_as_cache.py b/test/functional/tests/volumes/test_raid_as_cache.py index c9f9347..b423764 100644 --- a/test/functional/tests/volumes/test_raid_as_cache.py +++ b/test/functional/tests/volumes/test_raid_as_cache.py @@ -1,5 +1,6 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # @@ -11,8 +12,7 @@ from .common import compare_md5sums, create_files_with_md5sums from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from storage_devices.raid import Raid, RaidConfiguration, MetadataVariant, Level -from test_tools import fs_tools -from test_tools.fs_tools import Filesystem +from test_tools.fs_tools import Filesystem, create_random_test_file, remove from type_def.size import Size, Unit mount_point = "/mnt/test" @@ -66,14 +66,14 @@ def test_raid_as_cache(cache_mode): with TestRun.step("Copy files to cache and check md5sum."): for i in range(0, number_of_files): - test_file = fs_utils.create_random_test_file(test_file_tmp_path, test_file_size) + test_file = create_random_test_file(test_file_tmp_path, test_file_size) test_file_copied = test_file.copy(test_file_path, force=True) if test_file.md5sum() != test_file_copied.md5sum(): TestRun.LOGGER.error("Checksums are different.") - fs_utils.remove(test_file.full_path, True) - fs_utils.remove(test_file_copied.full_path, True) + remove(test_file.full_path, True) + remove(test_file_copied.full_path, True) TestRun.LOGGER.info(f"Successful verification.") diff --git a/test/functional/tests/volumes/test_volume_partitions.py b/test/functional/tests/volumes/test_volume_partitions.py index a42fd38..f76816e 100644 --- a/test/functional/tests/volumes/test_volume_partitions.py +++ b/test/functional/tests/volumes/test_volume_partitions.py @@ -1,19 +1,18 @@ # # Copyright(c) 2020-2022 Intel Corporation +# Copyright(c) 2024 Huawei Technologies Co., Ltd. # SPDX-License-Identifier: BSD-3-Clause # import pytest -import test_tools.fs_tools from api.cas import casadm from api.cas.cache_config import CacheMode from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from core.test_run import TestRun from storage_devices.partition import Partition -from test_tools import fs_tools, disk_tools -from test_tools.disk_tools import PartitionTable -from test_tools.fs_tools import Filesystem +from test_tools.disk_tools import PartitionTable, create_partitions +from test_tools.fs_tools import Filesystem, create_random_test_file from type_def.size import Size, Unit mount_point = "/mnt/cas" @@ -44,8 +43,8 @@ def test_cas_preserves_partitions(partition_table, filesystem, cache_mode): core_dev.create_partitions(core_sizes, partition_table) with TestRun.step("Create filesystem on core devices."): - for i in range(cores_number): - test_tools.fs_utils.create_filesystem(filesystem) + for part in core_dev.partitions: + part.create_filesystem(filesystem) with TestRun.step("Mount core devices and create test files."): files = [] @@ -53,7 +52,7 @@ def test_cas_preserves_partitions(partition_table, filesystem, cache_mode): mount_path = f"{mount_point}{i}" core.mount(mount_path) test_file_path = f"{mount_path}/test_file" - files.append(fs_utils.create_random_test_file(test_file_path)) + files.append(create_random_test_file(test_file_path)) with TestRun.step("Check md5 sums of test files."): test_files_md5sums = [] @@ -122,11 +121,11 @@ def test_partition_create_cas(partition_table, filesystem, cache_mode): with TestRun.step("Create partitions on exported device."): core_sizes = [Size(1, Unit.GibiByte)] * cores_number core.block_size = core_dev.block_size - disk_utils.create_partitions(core, core_sizes, partition_table) + create_partitions(core, core_sizes, partition_table) with TestRun.step("Create filesystem on core devices."): for part in core.partitions: - test_tools.fs_utils.create_filesystem(filesystem) + part.create_filesystem(filesystem) with TestRun.step("Mount core devices and create test files."): files = [] @@ -134,7 +133,7 @@ def test_partition_create_cas(partition_table, filesystem, cache_mode): mount_path = f"{mount_point}{i}" part.mount(mount_path) test_file_path = f"{mount_path}/test_file" - files.append(fs_utils.create_random_test_file(test_file_path)) + files.append(create_random_test_file(test_file_path)) with TestRun.step("Check md5 sums of test files."): test_files_md5sums = [] From d4ccac3e75373de2ff5447768f7e28d35be99c0a Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 31 Dec 2024 08:08:23 +0100 Subject: [PATCH 24/24] Refactor trim stress test to use fio instead of vdbench Signed-off-by: Katarzyna Treder --- .../tests/io/trim/test_trim_stress.py | 63 ++++++++----------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/test/functional/tests/io/trim/test_trim_stress.py b/test/functional/tests/io/trim/test_trim_stress.py index 0ad03b6..4bed31a 100644 --- a/test/functional/tests/io/trim/test_trim_stress.py +++ b/test/functional/tests/io/trim/test_trim_stress.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: BSD-3-Clause # -import os import pytest from datetime import timedelta @@ -13,7 +12,8 @@ from api.cas import casadm from api.cas.cache_config import CacheMode, CacheLineSize from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType -from test_tools.fs_tools import Filesystem +from test_tools.fio.fio import Fio +from test_tools.fio.fio_param import ReadWrite, IoEngine from type_def.size import Size, Unit @@ -22,28 +22,23 @@ from type_def.size import Size, Unit @pytest.mark.require_disk("core", DiskTypeSet([DiskType.optane, DiskType.nand, DiskType.sata])) @pytest.mark.parametrizex("cache_mode", CacheMode) @pytest.mark.parametrizex("cache_line_size", CacheLineSize) -@pytest.mark.require_plugin("vdbench") def test_trim_stress(cache_mode, cache_line_size): """ title: Trim support on cache devices in different cache modes stress test. description: | - Stress test validating the ability of CAS to handle trim requests in different modes, - on different filesystem types. + Stress test validating the ability of CAS to handle trim requests in different modes. pass_criteria: - No kernel bug. - Cache should still work correctly. """ - cores_number = 4 - mount_point = "/mnt" - with TestRun.step("Prepare devices."): cache_disk = TestRun.disks['cache'] cache_disk.create_partitions([Size(1, Unit.GibiByte)]) cache_dev = cache_disk.partitions[0] core_disk = TestRun.disks['core'] - core_disk.create_partitions([Size(1, Unit.GibiByte)] * cores_number) + core_disk.create_partitions([Size(1, Unit.GibiByte)] * 3) core_devices = core_disk.partitions with TestRun.step("Start cache and add cores."): @@ -52,41 +47,35 @@ def test_trim_stress(cache_mode, cache_line_size): for d in core_devices: cores.append(cache.add_core(d)) - with TestRun.step("Create filesystem and mount CAS devices."): - directories = [] - for counter, core in enumerate(cores): - core.create_filesystem(Filesystem(counter % len(Filesystem))) - mount_dir = os.path.join(mount_point, str(counter + 1)) - directories.append(mount_dir) - core.mount(mount_dir, ["discard"]) - with TestRun.step("Run I/O workload."): - for _ in TestRun.iteration(range(1, 7)): - run_vdbench(directories) + for _ in TestRun.iteration(range(1, 6)): + run_fio([core.path for core in cores]) with TestRun.step("Stop CAS."): for c in cores: - c.unmount() c.remove_core() cache.stop() -def run_vdbench(directories): - vdbench = TestRun.plugin_manager.get_plugin('vdbench') - config = f"data_errors=1,validate=yes,messagescan=no,create_anchors=yes\n" \ - f"fsd=default,depth=4,width=5,files=10,sizes=" \ - f"(1k,10,2k,10,4k,10,8k,10,16k,10,32k,10,64k,10,128k,10,256k,10,512k,10)\n" +def run_fio(paths): + block_sizes = [f"{2 ** n}k" for n in range(0, 10)] - for i, dir in enumerate(directories): - config += f"fsd=fsd{i},anchor={dir}\n" + fio = ( + Fio().create_command() + .io_engine(IoEngine.libaio) + .io_depth(16) + .bs_split(":".join([f"{bs}/{100 // len(block_sizes)}" for bs in block_sizes])) + .time_based() + .run_time(timedelta(minutes=10)) + .trim_verify_zero() + .verify_fatal() + ) - config += f"\nfwd=fwd1,fsd=fsd*," \ - f"fileio=(random),fileselect=random,threads=32," \ - f"xfersizes=(512,10,1k,10,2k,10,4k,10,8k,10,16k,10,32k,10,64k,10," \ - f"128k,10,256k,10)\nrd=rd1,fwd=fwd*,fwdrate=max,format=yes," \ - f"interval=5,operations=(read,write,open,close,getattr,setattr)" - vdbench.create_config(config, run_time=timedelta(minutes=5)) - if vdbench.run(): - TestRun.LOGGER.info("VDBench finished with status zero.") - else: - TestRun.LOGGER.error("VDBench finished with non-zero status.") + for path, rw in zip(paths, [ReadWrite.trim, ReadWrite.randtrim, ReadWrite.trimwrite]): + ( + fio.add_job(path + rw.name) + .file_name(path) + .read_write(rw) + ) + + fio.run(fio_timeout=timedelta(minutes=20))