Skip to content

Add better error handling to port stat tests #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 4 commits into from
Oct 23, 2024
Merged

Add better error handling to port stat tests #914

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da19aa1
Add extra handling for port tests
jboddey Oct 23, 2024
85e775e
Add error checking for port tests
jboddey Oct 23, 2024
0328793
Normalize return value behavior
jhughesoti Oct 23, 2024
eeb5c6d
Merge branch 'dev' into bug/ethtool_error
jhughesoti Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions modules/test/conn/python/src/port_stats_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __init__(self,
self.conn_stats = self._read_stats_file(self.ethtool_conn_stats_file)

def is_autonegotiate(self):
auto_negotiation = False
auto_negotiation = None
auto_negotiation_status = self._get_stat_option(stats=self.conn_stats,
option='Auto-negotiation:')
if auto_negotiation_status is not None:
Expand All @@ -66,15 +66,22 @@ def connection_port_link_test(self):
option='rx_errors:')
rx_errors_post = self._get_stat_option(stats=stats_post,
option='rx_errors:')
tx_errors = int(tx_errors_post) - int(tx_errors_pre)
rx_errors = int(rx_errors_post) - int(rx_errors_pre)
if tx_errors > 0 or rx_errors > 0:
result = False
description = 'Port errors detected'
details = f'TX errors: {tx_errors}, RX errors: {rx_errors}'

# Check that the above have been resolved correctly
if (tx_errors_pre is None or tx_errors_post is None or
rx_errors_pre is None or rx_errors_post is None):
result = 'Error'
description = 'Port stats not available'
else:
result = True
description = 'No port errors detected'
tx_errors = int(tx_errors_post) - int(tx_errors_pre)
rx_errors = int(rx_errors_post) - int(rx_errors_pre)
if tx_errors > 0 or rx_errors > 0:
result = False
description = 'Port errors detected'
details = f'TX errors: {tx_errors}, RX errors: {rx_errors}'
else:
result = True
description = 'No port errors detected'
return result, description, details

def connection_port_duplex_test(self):
Expand All @@ -83,7 +90,10 @@ def connection_port_duplex_test(self):
result = None
description = ''
details = ''
if not auto_negotiation:
if auto_negotiation is None:
result = 'Error'
description = 'Port stats not available'
elif not auto_negotiation:
result = False
description = 'Interface not configured for auto-negotiation'
else:
Expand All @@ -104,7 +114,10 @@ def connection_port_speed_test(self):
result = None
description = ''
details = ''
if not auto_negotiation:
if auto_negotiation is None:
result = 'Error'
description = 'Port stats not available'
elif not auto_negotiation:
result = False
description = 'Interface not configured for auto-negotiation'
else:
Expand Down