diff options
| author | Guillaume Abrioux <gabrioux@ibm.com> | 2025-01-07 13:53:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-07 13:53:57 +0100 |
| commit | 05ae3db4138610940df4c63e4c2bbd3bd3c1305a (patch) | |
| tree | a5835884dd963c23851494cab1a98a49e37a3390 | |
| parent | Merge pull request #61240 from neesingh-rh/wip-68974 (diff) | |
| parent | ceph-volume: fix Zap.ensure_associated_raw() (diff) | |
| download | ceph-05ae3db4138610940df4c63e4c2bbd3bd3c1305a.tar.xz ceph-05ae3db4138610940df4c63e4c2bbd3bd3c1305a.zip | |
Merge pull request #61241 from guits/ceph-volume-69430
ceph-volume: fix Zap.ensure_associated_raw()
| -rw-r--r-- | src/ceph-volume/ceph_volume/devices/lvm/zap.py | 3 | ||||
| -rw-r--r-- | src/ceph-volume/ceph_volume/tests/devices/lvm/data_zap.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py index c278de43eb0..a6d82c7f0fa 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py @@ -119,13 +119,12 @@ class Zap: osd_uuid = details.get('osd_uuid') break - for osd_uuid, details in raw_report.items(): + for _, details in raw_report.items(): device: str = details.get('device') if details.get('osd_uuid') == osd_uuid: raw_devices.add(device) return list(raw_devices) - def find_associated_devices(self) -> List[api.Volume]: """From an ``osd_id`` and/or an ``osd_fsid``, filter out all the Logical Volumes (LVs) in the diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/data_zap.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/data_zap.py index cca64e83ab0..c971b7776ef 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/data_zap.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/data_zap.py @@ -22,7 +22,7 @@ ceph_bluestore_tool_output = ''' "whoami": "0" }, "/dev/vdx": { - "osd_uuid": "d5a496bc-dcb9-4ad0-a12c-393d3200d2b6", + "osd_uuid": "d5a496bc-dcb9-4ad0-a12c-393d3200d2b7", "size": 214748364800, "btime": "2024-10-16T10:51:05.955279+0000", "description": "main", |