x
/
proliantutils
Code Issues Proposed changes

Merge "Decode output of fru print"

This commit is contained in:
Zuul 2020-02-18 10:42:20 +00:00 committed by Gerrit Code Review
parent 0196cd3162 83266ff678
commit 71389178ae
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proliantutils/ilo/ipmi.py
View File

@ -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):

2
proliantutils/tests/ilo/ipmi_sample_outputs.py
View File

@ -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"