mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

nlmanager: changing messages logged and raised when RXed NLMSG_ERROR

Browse Source 
Ticket: None
Reviewed By: Roopa, Nikhil G, Daniel
Testing Done: ifupdown2 smokes

The message logged and the exception raised by nlmanager, when receiving
an NLMSG_ERROR packet from the kernel, wasn't super explicit plus if the
error wasn't a netlink related failure we didn't provide any information
Now we use strerror with the provided error code to generate a nice msg.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-08-11 02:41:29 +02:00
parent f78024a401
commit 5b26c29724
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nlmanager/nlmanager.py
View File

@@ -204,16 +204,25 @@ class NetlinkManager(object):
msg = Error(msgtype, nlpacket.debug)
msg.decode_packet(length, flags, seq, pid, data)
debug_str += ", error code %s" % msg.error_to_string.get(error_code)
# 0 is NLE_SUCCESS...everything else is a true error
if error_code:
if error_code == Error.NLE_NOADDR:
raise NetlinkNoAddressError(debug_str)
error_code_str = msg.error_to_string.get(error_code)
if error_code_str != 'None':
error_str = 'Operation failed with \'%s\' (%s)' % (error_code_str, debug_str)
else:
raise NetlinkError(debug_str)
error_str = 'Operation failed with code %s (%s)' % (error_code, debug_str)
if error_code == Error.NLE_NOADDR:
raise NetlinkNoAddressError(error_str)
else:
if error_code_str == 'None':
try:
# os.strerror might raise ValueError
raise NetlinkError('Operation failed with \'%s\' (%s)' % (os.strerror(error_code), debug_str))
except ValueError:
pass
raise NetlinkError(error_str)
else:
log.debug(debug_str + '...this is an ACK')
log.debug('%s code NLE_SUCCESS...this is an ACK' % debug_str)
return msgs
# No ACK...create a nlpacket object and append it to msgs