Move output to connection utils
Signed-off-by: Katarzyna Treder <katarzyna.treder@h-partners.com>
This commit is contained in:
parent
81e792be99
commit
9460151ee5
@ -9,7 +9,7 @@ from api.cas.core import Core
|
|||||||
from api.cas.dmesg import get_metadata_size_on_device
|
from api.cas.dmesg import get_metadata_size_on_device
|
||||||
from api.cas.statistics import CacheStats, CacheIoClassStats
|
from api.cas.statistics import CacheStats, CacheIoClassStats
|
||||||
from test_utils.os_utils import *
|
from test_utils.os_utils import *
|
||||||
from test_utils.output import Output
|
from connection.utils.output import Output
|
||||||
|
|
||||||
|
|
||||||
class Cache:
|
class Cache:
|
||||||
|
@ -21,7 +21,7 @@ from api.cas.core import Core
|
|||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from storage_devices.device import Device
|
from storage_devices.device import Device
|
||||||
from test_utils.os_utils import reload_kernel_module
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ from api.cas.ioclass_config import IoClass
|
|||||||
from api.cas.version import CasVersion
|
from api.cas.version import CasVersion
|
||||||
from core.test_run_utils import TestRun
|
from core.test_run_utils import TestRun
|
||||||
from storage_devices.device import Device
|
from storage_devices.device import Device
|
||||||
from test_utils.output import CmdException
|
from connection.utils.output import CmdException
|
||||||
|
|
||||||
|
|
||||||
class Stats(dict):
|
class Stats(dict):
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from test_utils.output import Output
|
from connection.utils.output import Output
|
||||||
|
|
||||||
load_inactive_core_missing = [
|
load_inactive_core_missing = [
|
||||||
r"WARNING: Can not resolve path to core \d+ from cache \d+\. By-id path will be shown for that "
|
r"WARNING: Can not resolve path to core \d+ from cache \d+\. By-id path will be shown for that "
|
||||||
|
@ -10,7 +10,7 @@ from core.test_run import TestRun
|
|||||||
from api.cas import cas_module
|
from api.cas import cas_module
|
||||||
from api.cas.version import get_installed_cas_version
|
from api.cas.version import get_installed_cas_version
|
||||||
from test_utils import os_utils, git
|
from test_utils import os_utils, git
|
||||||
from test_utils.output import CmdException
|
from connection.utils.output import CmdException
|
||||||
|
|
||||||
|
|
||||||
def rsync_opencas_sources():
|
def rsync_opencas_sources():
|
||||||
|
@ -8,7 +8,7 @@ import re
|
|||||||
|
|
||||||
from test_utils import git
|
from test_utils import git
|
||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from test_utils.output import CmdException
|
from connection.utils.output import CmdException
|
||||||
|
|
||||||
|
|
||||||
class CasVersion:
|
class CasVersion:
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 513f006d17468ead7a768e13f48014e725b9ddd1
|
Subproject commit 161cc7957afb70256cf07a69673dad63889ccbfc
|
@ -21,7 +21,7 @@ from test_tools import fs_utils
|
|||||||
from test_tools.dd import Dd
|
from test_tools.dd import Dd
|
||||||
from test_tools.disk_utils import Filesystem
|
from test_tools.disk_utils import Filesystem
|
||||||
from test_utils.filesystem.file import File
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
version_file_path = r"/var/lib/opencas/cas_version"
|
version_file_path = r"/var/lib/opencas/cas_version"
|
||||||
|
@ -15,7 +15,7 @@ from core.test_run import TestRun
|
|||||||
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
||||||
from test_tools.fio.fio import Fio
|
from test_tools.fio.fio import Fio
|
||||||
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ from api.cas import casadm
|
|||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet
|
from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet
|
||||||
from test_tools.disk_utils import Filesystem
|
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 types.size import Size, Unit
|
||||||
|
|
||||||
mount_point = "/mnt/cas"
|
mount_point = "/mnt/cas"
|
||||||
|
@ -25,7 +25,7 @@ from test_tools.disk_utils import Filesystem
|
|||||||
from test_tools.fio.fio import Fio
|
from test_tools.fio.fio import Fio
|
||||||
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
||||||
from test_utils.os_utils import Udev
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
random_thresholds = random.sample(range(1028, 1024**2, 4), 3)
|
random_thresholds = random.sample(range(1028, 1024**2, 4), 3)
|
||||||
|
@ -16,7 +16,7 @@ from test_tools.dd import Dd
|
|||||||
from test_tools.disk_utils import Filesystem
|
from test_tools.disk_utils import Filesystem
|
||||||
from test_utils.filesystem.file import File
|
from test_utils.filesystem.file import File
|
||||||
from test_utils.os_utils import sync
|
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 types.size import Size, Unit
|
||||||
from api.cas.cli_messages import (
|
from api.cas.cli_messages import (
|
||||||
check_stderr_msg,
|
check_stderr_msg,
|
||||||
|
@ -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 import Fio
|
||||||
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
||||||
from test_utils.disk_finder import get_system_disks
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ from test_tools.fio.fio import Fio
|
|||||||
from test_tools.fio.fio_param import ReadWrite
|
from test_tools.fio.fio_param import ReadWrite
|
||||||
from test_utils.asynchronous import start_async_func
|
from test_utils.asynchronous import start_async_func
|
||||||
from test_utils.filesystem.directory import Directory
|
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
|
from types.size import Unit, Size
|
||||||
|
|
||||||
ram_disk, tmp_dir, fio_seed = None, None, None
|
ram_disk, tmp_dir, fio_seed = None, None, None
|
||||||
|
@ -10,7 +10,7 @@ import pytest
|
|||||||
from api.cas import casadm, cli, cli_messages
|
from api.cas import casadm, cli, cli_messages
|
||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
log_path = "/var/log/opencas.log"
|
log_path = "/var/log/opencas.log"
|
||||||
|
@ -16,7 +16,7 @@ from core.test_run import TestRun
|
|||||||
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
||||||
from test_tools.fio.fio import Fio
|
from test_tools.fio.fio import Fio
|
||||||
from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ from api.cas.core import CoreStatus
|
|||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
|
from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
|
||||||
from test_tools.disk_utils import Filesystem
|
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 types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ from test_tools.fio.fio import Fio
|
|||||||
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
||||||
from test_utils.filesystem.file import File
|
from test_utils.filesystem.file import File
|
||||||
from test_utils.os_utils import Udev, sync
|
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.size import Size, Unit
|
||||||
from types.time import Time
|
from types.time import Time
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ from api.cas.ioclass_config import IoClass
|
|||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
||||||
from test_tools import fs_utils
|
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 types.size import Unit, Size
|
||||||
from tests.io_class.io_class_common import prepare, ioclass_config_path
|
from tests.io_class.io_class_common import prepare, ioclass_config_path
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ from test_tools.disk_utils import Filesystem
|
|||||||
from test_tools.fs_utils import readlink
|
from test_tools.fs_utils import readlink
|
||||||
from test_utils import os_utils
|
from test_utils import os_utils
|
||||||
from test_utils.os_utils import Udev, DropCachesMode
|
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 types.size import Size, Unit
|
||||||
from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \
|
from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \
|
||||||
compare_files, power_cycle_dut
|
compare_files, power_cycle_dut
|
||||||
|
@ -13,7 +13,7 @@ from api.cas.cache_config import CacheMode, CacheModeTrait, CacheLineSize
|
|||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
|
from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
|
||||||
from test_tools.disk_utils import Filesystem
|
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 types.size import Size, Unit
|
||||||
from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \
|
from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \
|
||||||
compare_files
|
compare_files
|
||||||
|
@ -14,7 +14,7 @@ from core.test_run_utils import TestRun
|
|||||||
from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
|
from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan
|
||||||
from test_tools.dd import Dd
|
from test_tools.dd import Dd
|
||||||
from test_utils.filesystem.file import File
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ from core.test_run import TestRun
|
|||||||
from storage_devices.device import Device
|
from storage_devices.device import Device
|
||||||
from storage_devices.disk import DiskTypeSet, DiskType
|
from storage_devices.disk import DiskTypeSet, DiskType
|
||||||
from test_tools import disk_utils
|
from test_tools import disk_utils
|
||||||
from test_utils.output import CmdException
|
from connection.utils.output import CmdException
|
||||||
from types.size import Size, Unit
|
from types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ from storage_devices.disk import DiskTypeSet, DiskTypeLowerThan, DiskType
|
|||||||
from test_tools.fio.fio import Fio
|
from test_tools.fio.fio import Fio
|
||||||
from test_tools.fio.fio_param import IoEngine, ReadWrite
|
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.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 types.size import Size, Unit
|
||||||
from utils.performance import WorkloadParameter
|
from utils.performance import WorkloadParameter
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ from storage_devices.device import Device
|
|||||||
from core.test_run import TestRun
|
from core.test_run import TestRun
|
||||||
from storage_devices.ramdisk import RamDisk
|
from storage_devices.ramdisk import RamDisk
|
||||||
from test_tools.dd import Dd
|
from test_tools.dd import Dd
|
||||||
from test_utils.output import CmdException
|
from connection.utils.output import CmdException
|
||||||
from types.size import Size, Unit
|
from types.size import Size, Unit
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
|||||||
from test_tools import fs_utils
|
from test_tools import fs_utils
|
||||||
from test_tools.disk_utils import Filesystem
|
from test_tools.disk_utils import Filesystem
|
||||||
from test_utils.os_utils import create_user, check_if_user_exists
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
mount_point = "/mnt/cas"
|
mount_point = "/mnt/cas"
|
||||||
|
@ -28,7 +28,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
|
|||||||
from test_tools.disk_utils import Filesystem
|
from test_tools.disk_utils import Filesystem
|
||||||
from test_utils.filesystem.file import File
|
from test_utils.filesystem.file import File
|
||||||
from test_utils.os_utils import sync, Udev
|
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
|
from types.size import Size, Unit
|
||||||
|
|
||||||
IoClass = ioclass_config.IoClass
|
IoClass = ioclass_config.IoClass
|
||||||
|
Loading…
Reference in New Issue
Block a user