Merge pull request #28 from katlapinka/kasiat/lvm-os-disk-filter

Add OS disk filters to LVM config file
This commit is contained in:
Katarzyna Treder 2024-11-26 12:39:20 +01:00 committed by GitHub
commit 8739a782e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -11,7 +11,7 @@ from core.test_run import TestRun
from storage_devices.device import Device from storage_devices.device import Device
from storage_devices.disk import Disk from storage_devices.disk import Disk
from test_tools.fs_utils import readlink from test_tools.fs_utils import readlink
from test_utils.disk_finder import resolve_to_by_id_link from test_utils.disk_finder import resolve_to_by_id_link, get_system_disks
from test_utils.filesystem.symlink import Symlink from test_utils.filesystem.symlink import Symlink
from test_utils.size import Size from test_utils.size import Size
@ -146,6 +146,14 @@ class LvmConfiguration:
TestRun.LOGGER.info(f"Preparing configuration for LVMs - filters.") TestRun.LOGGER.info(f"Preparing configuration for LVMs - filters.")
LvmConfiguration.add_filters_to_lvm_config(lvm_filters) LvmConfiguration.add_filters_to_lvm_config(lvm_filters)
os_disk_filters = [
f"a|/dev/{disk}|" for disk in get_system_disks()
] if Lvm.get_os_vg() else None
if os_disk_filters:
TestRun.LOGGER.info(f"Add OS disks to LVM filters.")
LvmConfiguration.add_filters_to_lvm_config(os_disk_filters)
@staticmethod @staticmethod
def remove_global_filter_from_config(): def remove_global_filter_from_config():
cmd = f"sed -i '/{global_filter_prototype_regex}/d' {lvm_config_path}" cmd = f"sed -i '/{global_filter_prototype_regex}/d' {lvm_config_path}"