xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-15 04:07:48 +00:00
Code Issues Projects Releases Wiki Activity

Add device ID fields to FRU 0

Browse Source 
Change-Id: I4287d7a7732ffff00e708c05485d5b0afb37fd2d
This commit is contained in:
Allan Vidal 2015-10-30 11:29:44 -02:00
parent f6386e42fa
commit ac5bdc9c71
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pyghmi/ipmi/command.py
View File

@ -145,6 +145,19 @@ class Command(object):
"""
return session.Session.wait_for_rsp(timeout=timeout)
def _get_device_id(self):
response = self.raw_command(netfn=0x06, command=0x01)
if 'error' in response:
raise exc.IpmiException(response['error'], code=response['code'])
return {
'device_id': response['data'][0],
'device_revision': response['data'][1] & 0b1111,
'manufacturer_id': struct.unpack(
'<I', struct.pack('3B', *response['data'][6:9]) + '\x00')[0],
'product_id': struct.unpack(
'<H', struct.pack('2B', *response['data'][9:11]))[0],
}
def oem_init(self):
"""Initialize the command object for OEM capabilities
@ -155,17 +168,7 @@ class Command(object):
"""
if self._oem:
return
response = self.raw_command(netfn=6, command=1)
if 'error' in response:
raise exc.IpmiException(response['error'], code=response['code'])
self._oem = get_oem_handler({
'device_id': response['data'][0],
'device_revision': response['data'][1] & 0b1111,
'manufacturer_id': struct.unpack(
'<I', struct.pack('3B', *response['data'][6:9]) + '\x00')[0],
'product_id': struct.unpack(
'<H', struct.pack('2B', *response['data'][9:11]))[0],
}, self)
self._oem = get_oem_handler(self._get_device_id(), self)
def get_bootdev(self):
"""Get current boot device override information.
@ -521,8 +524,15 @@ class Command(object):
if 'error' not in guiddata:
zerofru['UUID'] = pygutil.decode_wireformat_uuid(
guiddata['data'])
if not zerofru:
zerofru = None
# Add some fields returned by get device ID command to FRU 0
# Also rename them to something more in line with FRU 0 field naming
# standards
device_id = self._get_device_id()
device_id['Device ID'] = device_id.pop('device_id')
device_id['Device Revision'] = device_id.pop('device_revision')
device_id['Manufacturer ID'] = device_id.pop('manufacturer_id')
device_id['Product ID'] = device_id.pop('product_id')
zerofru.update(device_id)
return self._oem.process_fru(zerofru)
def get_inventory(self):