From 1c4e75a0af76e6f911c78e55e961b9861e20bda6 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 26 Aug 2024 13:54:24 -0400 Subject: [PATCH] Normalize UUID format Some implementations include hyphen, others don't. Case selection is also variable. Change-Id: Ic3d8c411722732172f782a0a81f8f5bbbdd54525 --- pyghmi/redfish/oem/generic.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pyghmi/redfish/oem/generic.py b/pyghmi/redfish/oem/generic.py index 13704f00..ad11f1e2 100644 --- a/pyghmi/redfish/oem/generic.py +++ b/pyghmi/redfish/oem/generic.py @@ -533,6 +533,12 @@ class OEMHandler(object): 'Model': self._varsysinfo.get( 'SKU', self._varsysinfo.get('PartNumber', '')), } + if sysinfo['UUID'] and '-' not in sysinfo['UUID']: + sysinfo['UUID'] = '-'.join(( + sysinfo['UUID'][:8], sysinfo['UUID'][8:12], + sysinfo['UUID'][12:16], sysinfo['UUID'][16:20], + sysinfo['UUID'][20:])) + sysinfo['UUID'] = sysinfo['UUID'].lower() return sysinfo else: for invpair in self.get_inventory(): @@ -548,6 +554,12 @@ class OEMHandler(object): 'Model': self._varsysinfo.get( 'SKU', self._varsysinfo.get('PartNumber', '')), } + if sysinfo['UUID'] and '-' not in sysinfo['UUID']: + sysinfo['UUID'] = '-'.join(( + sysinfo['UUID'][:8], sysinfo['UUID'][8:12], + sysinfo['UUID'][12:16], sysinfo['UUID'][16:20], + sysinfo['UUID'][20:])) + sysinfo['UUID'] = sysinfo['UUID'].lower() yield ('System', sysinfo) self._hwnamemap = {} cpumemurls = []