]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: Use safe accessor to get TYPE info 56322/head
authorDillon Amburgey <dillona@dillona.com>
Wed, 22 Nov 2023 03:02:37 +0000 (03:02 +0000)
committerAdam King <adking@redhat.com>
Tue, 19 Mar 2024 20:39:51 +0000 (16:39 -0400)
Fixes: https://tracker.ceph.com/issues/63502
Signed-off-by: Dillon Amburgey <dillona@dillona.com>
(cherry picked from commit e93e70622599614011c307aca7c1c70d8c49a937)

src/ceph-volume/ceph_volume/util/device.py

index 8b501fb9eeeb6b85fa1755f4ebd01cd2b46a7705..151ddcfcce78f4222d0bfbab2b8770518b62033b 100644 (file)
@@ -459,11 +459,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):
@@ -477,9 +477,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