]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-volume: Use safe accessor to get TYPE info
authorDillon Amburgey <dillona@dillona.com>
Wed, 22 Nov 2023 03:02:37 +0000 (03:02 +0000)
committerDillon Amburgey <dillona@dillona.com>
Wed, 22 Nov 2023 03:02:37 +0000 (03:02 +0000)
Fixes: https://tracker.ceph.com/issues/63502
Signed-off-by: Dillon Amburgey <dillona@dillona.com>
src/ceph-volume/ceph_volume/util/device.py

index bb806292f2c48aab02cfbf9f770187cc17af97ba..c3de2a97fd99582399838ca5b343ef69a8e1b728 100644 (file)
@@ -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