Move size to types

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

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:

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):

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\["

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):

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]):

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):

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_"

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
 
 

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
 
 

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):

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
 

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):

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
 
 

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):

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
 

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
 
 

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):

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"