diff --git a/storage_devices/device.py b/storage_devices/device.py index 6125b90..5ce9bce 100644 --- a/storage_devices/device.py +++ b/storage_devices/device.py @@ -9,7 +9,7 @@ from core.test_run import TestRun from test_tools import disk_utils, fs_utils from test_tools.disk_utils import get_device_filesystem_type, get_sysfs_path from test_utils.io_stats import IoStats -from test_utils.size import Size, Unit +from types.size import Size, Unit class Device: diff --git a/storage_devices/disk.py b/storage_devices/disk.py index 00bd486..1658abe 100644 --- a/storage_devices/disk.py +++ b/storage_devices/disk.py @@ -16,7 +16,7 @@ from test_tools import disk_utils, fs_utils, nvme_cli from test_utils import disk_finder from test_utils.os_utils import wait from test_utils.output import Output -from test_utils.size import Unit +from types.size import Unit class DiskType(IntEnum): diff --git a/storage_devices/lvm.py b/storage_devices/lvm.py index 3e30528..2eb8e5b 100644 --- a/storage_devices/lvm.py +++ b/storage_devices/lvm.py @@ -13,7 +13,7 @@ from storage_devices.disk import Disk from test_tools.fs_utils import readlink from test_utils.disk_finder import resolve_to_by_id_link, get_system_disks from test_utils.filesystem.symlink import Symlink -from test_utils.size import Size +from types.size import Size lvm_config_path = "/etc/lvm/lvm.conf" filter_prototype_regex = r"^\sfilter\s=\s\[" diff --git a/storage_devices/partition.py b/storage_devices/partition.py index 080ab4c..966e057 100644 --- a/storage_devices/partition.py +++ b/storage_devices/partition.py @@ -5,7 +5,7 @@ from storage_devices.device import Device from test_tools import disk_utils -from test_utils.size import Size +from types.size import Size class Partition(Device): diff --git a/storage_devices/raid.py b/storage_devices/raid.py index 4e3685c..1ac022b 100644 --- a/storage_devices/raid.py +++ b/storage_devices/raid.py @@ -11,7 +11,7 @@ from storage_devices.disk import Disk from test_tools.fs_utils import readlink from test_tools.mdadm import Mdadm from test_utils.disk_finder import resolve_to_by_id_link -from test_utils.size import Size, Unit +from types.size import Size, Unit def get_devices_paths_string(devices: [Device]): diff --git a/storage_devices/ramdisk.py b/storage_devices/ramdisk.py index 011b812..a4513ce 100644 --- a/storage_devices/ramdisk.py +++ b/storage_devices/ramdisk.py @@ -11,7 +11,7 @@ from test_tools import disk_utils from test_tools.fs_utils import ls, parse_ls_output from test_utils.filesystem.symlink import Symlink from test_utils.os_utils import reload_kernel_module, unload_kernel_module, is_kernel_module_loaded -from test_utils.size import Size, Unit +from types.size import Size, Unit class RamDisk(Device): diff --git a/test_tools/blktrace.py b/test_tools/blktrace.py index 494cd0b..f09cd2d 100644 --- a/test_tools/blktrace.py +++ b/test_tools/blktrace.py @@ -15,7 +15,7 @@ from core.test_run import TestRun from storage_devices.device import Device from test_utils.filesystem.directory import Directory from test_utils.os_utils import is_mounted, drop_caches, DropCachesMode -from test_utils.size import Size, Unit +from types.size import Size, Unit DEBUGFS_MOUNT_POINT = "/sys/kernel/debug" PREFIX = "trace_" diff --git a/test_tools/dd.py b/test_tools/dd.py index 1ca51db..e61d255 100644 --- a/test_tools/dd.py +++ b/test_tools/dd.py @@ -4,7 +4,7 @@ # import test_utils.linux_command as linux_comm -import test_utils.size as size +import types.size as size from core.test_run import TestRun diff --git a/test_tools/ddrescue.py b/test_tools/ddrescue.py index dfd3079..799bde5 100644 --- a/test_tools/ddrescue.py +++ b/test_tools/ddrescue.py @@ -4,7 +4,7 @@ # import test_utils.linux_command as linux_comm -import test_utils.size as size +import types.size as size from core.test_run import TestRun diff --git a/test_tools/device_mapper.py b/test_tools/device_mapper.py index ede38df..b44e244 100644 --- a/test_tools/device_mapper.py +++ b/test_tools/device_mapper.py @@ -9,7 +9,7 @@ from core.test_run import TestRun from storage_devices.device import Device from test_utils.disk_finder import resolve_to_by_id_link from test_utils.linux_command import LinuxCommand -from test_utils.size import Size, Unit +from types.size import Size, Unit class DmTarget(Enum): diff --git a/test_tools/disk_utils.py b/test_tools/disk_utils.py index 56edd2a..901a56e 100644 --- a/test_tools/disk_utils.py +++ b/test_tools/disk_utils.py @@ -14,7 +14,7 @@ from test_tools import fs_utils from test_tools.dd import Dd from test_tools.fs_utils import readlink, parse_ls_output, ls from test_utils.output import CmdException -from test_utils.size import Size, Unit +from types.size import Size, Unit SECTOR_SIZE = 512 diff --git a/test_tools/fio/fio_param.py b/test_tools/fio/fio_param.py index 8db911b..ff8409f 100644 --- a/test_tools/fio/fio_param.py +++ b/test_tools/fio/fio_param.py @@ -14,7 +14,7 @@ from core.test_run import TestRun from storage_devices.device import Device from test_tools.fio.fio_result import FioResult from test_utils.linux_command import LinuxCommand -from test_utils.size import Size +from types.size import Size class CpusAllowedPolicy(Enum): diff --git a/test_tools/fio/fio_result.py b/test_tools/fio/fio_result.py index 334e977..1ed4ff4 100644 --- a/test_tools/fio/fio_result.py +++ b/test_tools/fio/fio_result.py @@ -4,7 +4,7 @@ # -from test_utils.size import Size, Unit, UnitPerSecond +from types.size import Size, Unit, UnitPerSecond from test_utils.time import Time diff --git a/test_tools/fs_utils.py b/test_tools/fs_utils.py index 0ed99ff..44c3eb2 100644 --- a/test_tools/fs_utils.py +++ b/test_tools/fs_utils.py @@ -15,7 +15,7 @@ from aenum import IntFlag, Enum from core.test_run import TestRun from test_tools.dd import Dd -from test_utils.size import Size, Unit +from types.size import Size, Unit class Permissions(IntFlag): diff --git a/test_tools/iostat.py b/test_tools/iostat.py index 3e310bf..0abb8cc 100644 --- a/test_tools/iostat.py +++ b/test_tools/iostat.py @@ -5,7 +5,7 @@ from core.test_run import TestRun from storage_devices.device import Device -from test_utils.size import Size, Unit, UnitPerSecond +from types.size import Size, Unit, UnitPerSecond from test_utils.time import Time import csv diff --git a/test_tools/mdadm.py b/test_tools/mdadm.py index db5e60a..5893512 100644 --- a/test_tools/mdadm.py +++ b/test_tools/mdadm.py @@ -7,7 +7,7 @@ import re from core.test_run import TestRun -from test_utils.size import Unit +from types.size import Unit from test_utils.os_utils import Udev diff --git a/test_utils/filesystem/file.py b/test_utils/filesystem/file.py index e8a8130..efa40c1 100644 --- a/test_utils/filesystem/file.py +++ b/test_utils/filesystem/file.py @@ -8,7 +8,7 @@ from datetime import timedelta from test_tools import fs_utils from test_tools.dd import Dd from test_utils.filesystem.fs_item import FsItem -from test_utils.size import Size +from types.size import Size class File(FsItem): diff --git a/test_utils/os_utils.py b/test_utils/os_utils.py index cc7abd5..621a560 100644 --- a/test_utils/os_utils.py +++ b/test_utils/os_utils.py @@ -22,7 +22,7 @@ from test_tools.fs_utils import check_if_directory_exists, create_directory, che from test_utils.filesystem.file import File from test_utils.output import CmdException from test_utils.retry import Retry -from test_utils.size import Size, Unit +from types.size import Size, Unit DEBUGFS_MOUNT_POINT = "/sys/kernel/debug" MEMORY_MOUNT_POINT = "/mnt/memspace" diff --git a/types/__init__.py b/types/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test_utils/size.py b/types/size.py similarity index 100% rename from test_utils/size.py rename to types/size.py