github/opencas-test-framework
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33 from Kamoppl/kamilg/update_tf_dec

Browse Source 
Few tf fixes/improvements
This commit is contained in:
Kamil Gierszewski 2025-01-30 22:28:43 +01:00 committed by GitHub
commit cb50633e34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/test_run_utils.py
View File

@ -1,6 +1,6 @@
# #
# Copyright(c) 2019-2021 Intel Corporation # Copyright(c) 2019-2021 Intel Corporation
# Copyright(c) 2023-2024 Huawei Technologies Co., Ltd. # Copyright(c) 2023-2025 Huawei Technologies Co., Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -132,7 +132,8 @@ def __presetup(cls):
if cls.config['type'] == 'ssh': if cls.config['type'] == 'ssh':
try: try:
IP(cls.config['ip']) IP(cls.config['ip'])
cls.config['host'] = cls.config['ip'] if not cls.config['host']:
cls.config['host'] = cls.config['ip']
except ValueError: except ValueError:
TestRun.block("IP address from config is in invalid format.") TestRun.block("IP address from config is in invalid format.")
except KeyError: except KeyError:

19
internal_plugins/power_control_libvirt/__init__.py
View File

@ -1,6 +1,6 @@
# #
# Copyright(c) 2020-2021 Intel Corporation # Copyright(c) 2020-2021 Intel Corporation
# Copyright(c) 2023-2024 Huawei Technologies Co., Ltd. # Copyright(c) 2023-2025 Huawei Technologies Co., Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -46,18 +46,25 @@ class PowerControlPlugin:
def teardown(self): def teardown(self):
pass pass
def power_cycle(self): def power_cycle(self, wait_for_connection: bool = False, delay_until_reboot: int = 0) -> None:
self.executor.run_expect_success(f"sudo virsh reset {TestRun.dut.virsh['vm_name']}") self.executor.run_expect_success(f"sudo virsh destroy {TestRun.dut.virsh['vm_name']}")
TestRun.executor.disconnect() TestRun.executor.disconnect()
TestRun.executor.wait_for_connection(timedelta(seconds=TestRun.dut.virsh["reboot_timeout"])) self.executor.run_expect_success(
f"(sleep {delay_until_reboot} && sudo virsh start {TestRun.dut.virsh['vm_name']}) &"
)
if wait_for_connection:
TestRun.executor.wait_for_connection(
timedelta(seconds=TestRun.dut.virsh["reboot_timeout"])
)
def check_if_vm_exists(self, vm_name) -> bool: def check_if_vm_exists(self, vm_name) -> bool:
return self.executor.run(f"sudo virsh list|grep -w {vm_name}").exit_code == 0 return self.executor.run(f"sudo virsh list|grep -w {vm_name}").exit_code == 0
def parse_virsh_config(self, vm_name, reboot_timeout=DEFAULT_REBOOT_TIMEOUT) -> dict | None: def parse_virsh_config(self, vm_name, reboot_timeout=DEFAULT_REBOOT_TIMEOUT) -> dict | None:
if not self.check_if_vm_exists(vm_name=vm_name): if not self.check_if_vm_exists(vm_name=vm_name):
raise ValueError(f"Virsh power plugin error: couldn't find VM {vm_name} on host " raise ValueError(
f"{self.host}") f"Virsh power plugin error: couldn't find VM {vm_name} on host {self.host}"
)
return { return {
"vm_name": vm_name, "vm_name": vm_name,
"reboot_timeout": reboot_timeout, "reboot_timeout": reboot_timeout,

29
test_tools/disk_tools.py
View File

@ -1,6 +1,6 @@
# #
# Copyright(c) 2019-2022 Intel Corporation # Copyright(c) 2019-2022 Intel Corporation
# Copyright(c) 2023-2024 Huawei Technologies Co., Ltd. # Copyright(c) 2023-2025 Huawei Technologies Co., Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -102,11 +102,11 @@ def create_partition(
TestRun.executor.run_expect_success("udevadm settle") TestRun.executor.run_expect_success("udevadm settle")
if not check_partition_after_create( if not check_partition_after_create(
part_size, size=part_size,
part_number, part_number=part_number,
device.path, parent_dev_path=device.path,
part_type, part_type=part_type,
aligned): aligned=aligned):
raise Exception("Could not create partition!") raise Exception("Could not create partition!")
if part_type != PartitionType.extended: if part_type != PartitionType.extended:
@ -147,7 +147,7 @@ def create_partitions(device, sizes: [], partition_table_type=PartitionTable.gpt
for s in sizes: for s in sizes:
size = Size( size = Size(
s.get_value(device.block_size) - device.block_size.value, device.block_size) s.get_value(device.block_size) - 1, device.block_size)
if partition_table_type == PartitionTable.msdos and \ if partition_table_type == PartitionTable.msdos and \
len(sizes) > 4 and len(device.partitions) == 3: len(sizes) > 4 and len(device.partitions) == 3:
if available_disk_size(device) > msdos_part_max_size: if available_disk_size(device) > msdos_part_max_size:
@ -162,12 +162,12 @@ def create_partitions(device, sizes: [], partition_table_type=PartitionTable.gpt
partition_number_offset = 1 partition_number_offset = 1
partition_number = len(device.partitions) + 1 + partition_number_offset partition_number = len(device.partitions) + 1 + partition_number_offset
create_partition(device, create_partition(device=device,
size, part_size=size,
partition_number, part_number=partition_number,
partition_type, part_type=partition_type,
Unit.MebiByte, unit=device.block_size,
True) aligned=True)
def get_block_size(device): def get_block_size(device):
@ -197,7 +197,8 @@ def get_pci_address(device):
return pci_address return pci_address
def check_partition_after_create(size, part_number, parent_dev_path, part_type, aligned): def check_partition_after_create(size: Size, part_number: int, parent_dev_path: str,
part_type: PartitionType, aligned: bool):
partition_path = get_partition_path(parent_dev_path, part_number) partition_path = get_partition_path(parent_dev_path, part_number)
if "dev/cas" not in partition_path: if "dev/cas" not in partition_path:
cmd = f"find {partition_path} -type l" cmd = f"find {partition_path} -type l"