xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-10-30 19:02:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge "Change strategy to identify IMM"

Browse Source
This commit is contained in:
Jenkins
2016-04-24 12:19:34 +00:00
committed by Gerrit Code Review
parent 52e3eb6874 700dd0c752
commit d0f51df896
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pyghmi/ipmi/oem/lenovo/handler.py
View File

@@ -135,7 +135,6 @@ class OEMHandler(generic.OEMHandler):
self.oem_inventory_info = None
self._mrethidx = None
self._hasimm = None
self._immbuildinfo = None
@property
def _megarac_eth_index(self):
@@ -428,16 +427,15 @@ class OEMHandler(generic.OEMHandler):
if self._hasimm is not None:
return self._hasimm
try:
bdata = self.ipmicmd.xraw_command(netfn=0x3a, command=0x50)
bdata = self.ipmicmd.xraw_command(netfn=0x3a, command=0xc1)
except pygexc.IpmiException:
self._hasimm = False
return False
if len(bdata['data'][:]) != 30:
if len(bdata['data'][:]) != 3:
self._hasimm = False
return False
self._hasimm = True
self._immbuildinfo = bdata['data'][:]
return True
self._hasimm = ord(bdata['data'][1]) & 1 == 1
return self._hasimm
def get_oem_firmware(self, bmcver):
if self.has_tsm:
@@ -446,9 +444,8 @@ class OEMHandler(generic.OEMHandler):
return command["parser"](rsp["data"])
elif self.has_imm:
return imm.get_firmware_inventory(self.ipmicmd, bmcver,
self._immbuildinfo,
self._certverify)
return ()
return super(OEMHandler, self).get_oem_firmware(bmcver)
def get_oem_capping_enabled(self):
if self.has_tsm:

5
pyghmi/ipmi/oem/lenovo/imm.py
View File

@@ -112,11 +112,12 @@ def fetch_adapter_firmware(wc):
yield ('{0} {1}'.format(aname, fname), bdata)
def get_firmware_inventory(ipmicmd, bmcver, immbuildinfo, certverify):
def get_firmware_inventory(ipmicmd, bmcver, certverify):
# First we fetch the system firmware found in imm properties
# then check for agentless, if agentless, get adapter info using
# https, using the caller TLS verification scheme
immverdata = parse_imm_buildinfo(immbuildinfo)
rsp = ipmicmd.xraw_command(netfn=0x3a, command=0x50)
immverdata = parse_imm_buildinfo(rsp['data'])
bdata = {'version': bmcver, 'build': immverdata[0], 'date': immverdata[1]}
yield ('IMM', bdata)
bdata = fetch_grouped_properties(ipmicmd, {