From e93e70622599614011c307aca7c1c70d8c49a937 Mon Sep 17 00:00:00 2001 From: Dillon Amburgey Date: Wed, 22 Nov 2023 03:02:37 +0000 Subject: [PATCH] ceph-volume: Use safe accessor to get TYPE info Fixes: https://tracker.ceph.com/issues/63502 Signed-off-by: Dillon Amburgey --- src/ceph-volume/ceph_volume/util/device.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py index bb806292f2c48..c3de2a97fd995 100644 --- a/src/ceph-volume/ceph_volume/util/device.py +++ b/src/ceph-volume/ceph_volume/util/device.py @@ -460,11 +460,11 @@ class Device(object): def device_type(self): self.load_blkid_api() if 'type' in self.sys_api: - return self.sys_api['type'] + return self.sys_api.get('type') elif self.disk_api: - return self.disk_api['TYPE'] + return self.disk_api.get('TYPE') elif self.blkid_api: - return self.blkid_api['TYPE'] + return self.blkid_api.get('TYPE') @property def is_mpath(self): @@ -478,9 +478,9 @@ class Device(object): def is_partition(self): self.load_blkid_api() if self.disk_api: - return self.disk_api['TYPE'] == 'part' + return self.disk_api.get('TYPE') == 'part' elif self.blkid_api: - return self.blkid_api['TYPE'] == 'part' + return self.blkid_api.get('TYPE') == 'part' return False @property -- 2.47.3