xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-05 04:27:56 +00:00
Code Issues Projects Releases Wiki Activity

Say plainly when a platform has no alert destinations

Browse Source 
Reading the alert destinations of a bmc that has none reported "Unknown
code 0x80 encountered", which is the fallback text for a completion code
the library has no name for.  0x80 on this parameter is not a failure, it
is the platform saying it does not have alert destinations, and the
redfish side of the same resource has said so in words for a while.

The lan parameter fetch already knew how to tell those apart, so build the
alert reads on it rather than on a raw command that raises on any non-zero
code, and raise UnsupportedFunctionality with something to read.  Both the
count and an individual destination are covered, so a platform that offers
one and not the other says the same thing instead of failing differently.

Splitting the completion code handling out of the parameter fetch is what
makes that reuse possible; the interpretation of the payload, and every
answer it gives, is unchanged.

The oem hook for the destination count was passing its byte through ord(),
which raises TypeError on the bytearray it is given.  No handler in tree
implements the hook, so it had never been called; hand it the integer.
This commit is contained in:
Markus Hilger
2026-08-14 01:51:44 +02:00
parent 7b9ad03aaf
commit d77e71967a
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_server/aiohmi/ipmi/command.py
+40 -27
View File
@@ -817,6 +817,25 @@ class Command(object):
await self.oem_init()
return await self._oem.get_sensor_reading(sensorname)
async def _fetch_lancfg_data(self, channel, param, selector=0):
"""Internal helper for fetching a lan cfg parameter's raw data
Answers None if the bmc does not have the parameter. Such a bmc says
so in the completion code and sends no data at all, so the code has to
be read before the payload is, and oldraw_command reports the code
rather than raising on it, which is why this cannot be done by
catching something.
"""
fetchcmd = bytearray((channel, param, selector, 0))
fetched = await self.oldraw_command(0xc, 2, data=fetchcmd)
if fetched['code'] in (0x80, 0xc9):
# parameter not supported, and parameter out of range
return None
if fetched['code']:
raise exc.IpmiException(util.get_ipmi_error(fetched),
fetched['code'])
return bytearray(fetched['data'])
async def _fetch_lancfg_param(self, channel, param, prefixlen=False):
"""Internal helper for fetching lan cfg parameters
@@ -824,20 +843,8 @@ class Command(object):
string with ipv4. If 6 bytes, colon delimited hex (mac address). If
one byte, return the int value
"""
fetchcmd = bytearray((channel, param, 0, 0))
fetched = await self.oldraw_command(0xc, 2, data=fetchcmd)
# A bmc without the parameter says so in the completion code and sends
# no data at all, so the code has to be read before the payload is.
# oldraw_command reports the code rather than raising on it, which is
# why this cannot be done by catching something.
if fetched['code'] in (0x80, 0xc9):
# parameter not supported, and parameter out of range
return None
if fetched['code']:
raise exc.IpmiException(util.get_ipmi_error(fetched),
fetched['code'])
fetchdata = fetched['data']
if not fetchdata or bytearray(fetchdata)[0] != 17:
fetchdata = await self._fetch_lancfg_data(channel, param)
if not fetchdata or fetchdata[0] != 17:
return None
if param == 0x14:
vlaninfo = struct.unpack('<H', fetchdata[1:])[0]
@@ -1179,12 +1186,14 @@ class Command(object):
"""
if channel is None:
channel = await self.get_network_channel()
rqdata = (channel, 0x11, 0, 0)
rsp = await self.raw_command(netfn=0xc, command=2, data=rqdata)
rspdata = await self._fetch_lancfg_data(channel, 0x11)
if rspdata is None:
raise exc.UnsupportedFunctionality(
'This platform does not support alert destinations')
await self.oem_init()
if hasattr(self._oem, 'get_alert_destination_count'):
return await self._oem.get_alert_destination_count(ord(rsp['data'][1]))
return bytearray(rsp['data'])[1]
return await self._oem.get_alert_destination_count(rspdata[1])
return rspdata[1]
async def get_alert_destination(self, destination=0, channel=None):
"""Get alert destination
@@ -1210,23 +1219,27 @@ class Command(object):
destinfo = {}
if channel is None:
channel = await self.get_network_channel()
rqdata = (channel, 18, destination, 0)
rsp = await self.raw_command(netfn=0xc, command=2, data=rqdata)
dtype, acktimeout, retries = struct.unpack('BBB', rsp['data'][2:])
rspdata = await self._fetch_lancfg_data(channel, 18, destination)
if rspdata is None:
raise exc.UnsupportedFunctionality(
'This platform does not support alert destinations')
dtype, acktimeout, retries = struct.unpack('BBB', rspdata[2:])
destinfo['acknowledge_required'] = dtype & 0b10000000 == 0b10000000
# Ignore destination type for now...
if destinfo['acknowledge_required']:
destinfo['acknowledge_timeout'] = acktimeout
destinfo['retries'] = retries
rqdata = (channel, 19, destination, 0)
rsp = await self.raw_command(netfn=0xc, command=2, data=rqdata)
if bytearray(rsp['data'])[2] & 0b11110000 == 0:
rspdata = await self._fetch_lancfg_data(channel, 19, destination)
if rspdata is None:
raise exc.UnsupportedFunctionality(
'This platform does not report alert destination addresses')
if rspdata[2] & 0b11110000 == 0:
destinfo['address_format'] = 'ipv4'
destinfo['address'] = socket.inet_ntoa(rsp['data'][4:8])
elif bytearray(rsp['data'])[2] & 0b11110000 == 0b10000:
destinfo['address'] = socket.inet_ntoa(bytes(rspdata[4:8]))
elif rspdata[2] & 0b11110000 == 0b10000:
destinfo['address_format'] = 'ipv6'
destinfo['address'] = socket.inet_ntop(socket.AF_INET6,
rsp['data'][3:])
bytes(rspdata[3:]))
return destinfo
async def clear_alert_destination(self, destination=0, channel=None):