From: Dillon Amburgey <dillona@dillona.com>
Date: Wed, 22 Nov 2023 03:02:37 +0000 (+0000)
Subject: ceph-volume: Use safe accessor to get TYPE info
X-Git-Tag: v17.2.8~263^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff5b8bd169794386bf99ff6a5ecb0ea82f54f47a;p=ceph.git

ceph-volume: Use safe accessor to get TYPE info

Fixes: https://tracker.ceph.com/issues/63502
Signed-off-by: Dillon Amburgey <dillona@dillona.com>
(cherry picked from commit e93e70622599614011c307aca7c1c70d8c49a937)
---

diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py
index 8b501fb9eeeb..151ddcfcce78 100644
--- a/src/ceph-volume/ceph_volume/util/device.py
+++ b/src/ceph-volume/ceph_volume/util/device.py
@@ -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