From 83266ff67816c88851090ebd4a1d2d954b52d5be Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Tue, 19 Nov 2019 19:55:44 -0600
Subject: [PATCH] Decode output of fru print

Decodes bytes object of fru print to string, was failing
during an ilo inspection.

Change-Id: Ieed55ffca1e839ff5a5dfe523038ba03ea14d0d7
Closes-Bug: 1853210
---
 proliantutils/ilo/ipmi.py                      | 5 ++++-
 proliantutils/tests/ilo/ipmi_sample_outputs.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/proliantutils/ilo/ipmi.py b/proliantutils/ilo/ipmi.py
index ce2a6450..403ff4ba 100644
--- a/proliantutils/ilo/ipmi.py
+++ b/proliantutils/ilo/ipmi.py
@@ -59,7 +59,10 @@ def _exec_ipmitool(driver_info, command):
                   {'out': out, 'err': err, 'code': process.returncode})
     except Exception:
         pass
-    return out
+    if out:
+        return out.decode()
+    else:
+        return out
 
 
 def get_ilo_version(ilo_fw_str):
diff --git a/proliantutils/tests/ilo/ipmi_sample_outputs.py b/proliantutils/tests/ilo/ipmi_sample_outputs.py
index b939f43a..8bb3ed61 100644
--- a/proliantutils/tests/ilo/ipmi_sample_outputs.py
+++ b/proliantutils/tests/ilo/ipmi_sample_outputs.py
@@ -28,7 +28,7 @@ NIC_FRU_OUT_TUPLE = ((
     "Product Name          : HP Ethernet 1Gb 4-port 331FLR Adapter\n"
     "Product Part Number   : 629135-B21\n"
     "Product Version       : 00\n"
-    "Product Serial        : CN84170RX5"), None)
+    "Product Serial        : CN84170RX5").encode('ascii'), None)
 
 NIC_FRU_OUT = (
     "Board Mfg Date        : Mon Apr 28 23:16:00 2014\n"