xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-14 03:37:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix use of ord() in remaining places

Browse Source 
There are some places with leftover
ord() calls on a bufferview.  Normalize
to 2/3 agnostic way.

Change-Id: I8ca51d6477990de072dece6c8bd346d0d6105af6
This commit is contained in:
Jarrod Johnson 2019-11-21 15:35:31 -05:00
parent 4adf5a049e
commit e2c1b68608
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pyghmi/ipmi/command.py
View File

@ -1022,7 +1022,7 @@ class Command(object):
channel = self.get_network_channel()
rqdata = (channel, 0x11, 0, 0)
rsp = self.xraw_command(netfn=0xc, command=2, data=rqdata)
return ord(rsp['data'][1])
return bytearray(rsp['data'])[1]
def get_alert_destination(self, destination=0, channel=None):
"""Get alert destination
@ -1054,10 +1054,10 @@ class Command(object):
destinfo['retries'] = retries
rqdata = (channel, 19, destination, 0)
rsp = self.xraw_command(netfn=0xc, command=2, data=rqdata)
if ord(rsp['data'][2]) & 0b11110000 == 0:
if bytearray(rsp['data'])[2] & 0b11110000 == 0:
destinfo['address_format'] = 'ipv4'
destinfo['address'] = socket.inet_ntoa(rsp['data'][4:8])
elif ord(rsp['data'][2]) & 0b11110000 == 0b10000:
elif bytearray(rsp['data'])[2] & 0b11110000 == 0b10000:
destinfo['address_format'] = 'ipv6'
destinfo['address'] = socket.inet_ntop(socket.AF_INET6,
rsp['data'][3:])
@ -1103,7 +1103,7 @@ class Command(object):
# of entries. We have no guarantee that the meaningful data will
# be contiguous
rsp = self.xraw_command(netfn=4, command=0x13, data=(8, 0, 0))
numpol = ord(rsp['data'][1])
numpol = bytearray(rsp['data'])[1]
desiredchandest = (channel << 4) | destination
availpolnum = None
for polnum in range(1, numpol + 1):