xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2026-01-11 18:52:33 +00:00
Code Issues Projects Releases Wiki Activity

Tolerate variant of TSMA without sys OEM

Browse Source 
If no OEM element in the sysinfo, check the manager.

Change-Id: I038ae3edcb82acebd33805723f18e1181b3d3d52
This commit is contained in:
Jarrod Johnson
2020-06-05 09:21:17 -04:00
parent bb0516af93
commit 5918fd4c3a
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyghmi/redfish/command.py
View File

@@ -518,6 +518,10 @@ class Command(object):
def sysinfo(self):
return self._do_web_request(self.sysurl)
@property
def bmcinfo(self):
return self._do_web_request(self._bmcurl)
def get_power(self):
currinfo = self._do_web_request(self.sysurl, cache=False)
return {'powerstate': str(currinfo['PowerState'].lower())}
@@ -1403,7 +1407,7 @@ class Command(object):
def oem(self):
if not self._oem:
self._oem = oem.get_oem_handler(
self.sysinfo, self.sysurl, self.wc, self._urlcache)
self.sysinfo, self.sysurl, self.wc, self._urlcache, self)
self._oem.set_credentials(self.username, self.password)
return self._oem

6
pyghmi/redfish/oem/lenovo/main.py
View File

@@ -17,8 +17,12 @@ from pyghmi.redfish.oem.lenovo import tsma
from pyghmi.redfish.oem.lenovo import xcc
def get_handler(sysinfo, sysurl, webclient, cache):
def get_handler(sysinfo, sysurl, webclient, cache, cmd):
leninf = sysinfo.get('Oem', {}).get('Lenovo', {})
if not leninf:
bmcinfo = cmd.bmcinfo
if 'Ami' in bmcinfo.get('Oem', {}):
return tsma.TsmHandler(sysinfo, sysurl, webclient, cache)
if 'FrontPanelUSB' in leninf or sysinfo.get('SKU', '').startswith('7X58'):
return xcc.OEMHandler(sysinfo, sysurl, webclient, cache)
else:

13
pyghmi/redfish/oem/lookup.py
View File

@@ -20,11 +20,18 @@ OEMMAP = {
}
def get_oem_handler(sysinfo, sysurl, webclient, cache):
def get_oem_handler(sysinfo, sysurl, webclient, cache, cmd):
for oem in sysinfo.get('Oem', {}):
if oem in OEMMAP:
return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache)
return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache,
cmd)
for oem in sysinfo.get('Links', {}).get('OEM', []):
if oem in OEMMAP:
return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache)
return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache,
cmd)
bmcinfo = cmd.bmcinfo
for oem in bmcinfo.get('Oem', {}):
if oem in OEMMAP:
return OEMMAP[oem].get_handler(sysinfo, sysurl, webclient, cache,
cmd)
return generic.OEMHandler(sysinfo, sysurl, webclient, cache)