Skip to content

Commit

Permalink
[ISSUE-1203]: fix for testing env
Browse files Browse the repository at this point in the history
Co-authored-by: korzepadawid <dawid.korzepa@dell.com>
Co-authored-by: mdutka-dell <malgorzata.dutka@dell.com>
Signed-off-by: Dawid Korzepa <dawid.korzepa@dell.com>
  • Loading branch information
korzepadawid and mdutka-dell committed Jul 11, 2024
1 parent e12281f commit b1ac8d2
Showing 1 changed file with 34 additions and 22 deletions.
56 changes: 34 additions & 22 deletions tests/e2e-test-framework/framework/drive.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,28 +87,40 @@ def _get_drives_to_wipe(self, lsblk_out: dict) -> dict[str, DriveChild]:
"""
to_wipe = {}
for drive in lsblk_out["blockdevices"]:
children = drive.get("children")
if children:
for child in children:
mountpoints = child.get("mountpoints", [])
mountpoints = [
mountpoint for mountpoint in mountpoints if mountpoint
]
if len(mountpoints) == 0:
logging.info(
f"found drive \"/dev/{drive['name']}\" with child \"{child['name']}\" with no mountpoints."
)
drive_type = to_wipe.get(
drive["name"], {"children": []}
)
drive_type["type"] = child["type"]
drive_type["children"].append(child["name"])
to_wipe[drive["name"]] = drive_type
else:
logging.warning(
f"found drive with OS: \"/dev/{drive['name']}\", skipping..."
)
break
if drive['type'] == 'disk':
children = drive.get("children")
drive_mountpoints = drive.get("mountpoints", [])
drive_mountpoints = [
mountpoint for mountpoint in drive_mountpoints if mountpoint
]
if len(drive_mountpoints) != 0:
logging.warning(f"found drive with drive mountpoints: \"/dev/{drive['name']}\", skipping...")
continue
if children:
for child in children:
child_mountpoints = child.get("mountpoints", [])
child_mountpoints = [
mountpoint for mountpoint in child_mountpoints if mountpoint
]
if len(child_mountpoints) == 0 and child['type'] in ["part", "lvm"]:
logging.info(
f"found drive \"/dev/{drive['name']}\" with child \"{child['name']}\" with no mountpoints."
)
drive_type = to_wipe.get(
drive["name"], {"children": []}
)
drive_type["type"] = child["type"]
drive_type["children"].append(child["name"])
to_wipe[drive["name"]] = drive_type
else:
logging.warning(
f"found drive with child mountpoints: \"/dev/{drive['name']}\", skipping..."
)
break
else:
logging.warning(
f"found device with type: {drive['type']}, skipping..."
)
return to_wipe

def _remove_csi_device_mapper(self, child_name: str) -> None:
Expand Down

0 comments on commit b1ac8d2

Please sign in to comment.