Skip to content

[flow counter] Fix issue: should not compare str with int #2001

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
merged 1 commit into from
Jan 11, 2022
Merged

[flow counter] Fix issue: should not compare str with int #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions scripts/flow_counters_stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,21 +230,21 @@ class FlowCounterStats(object):
# counter OID is changed.
old_values[-1] = values[-1]
for i in diff_column_positions:
old_values[i] = 0
old_values[i] = '0'
values[i] = ns_diff(values[i], old_values[i])
need_update_cache = True
continue

has_negative_diff = False
for i in diff_column_positions:
# If any diff has negative value, set all counter values to 0 and update cache
if values[i] < old_values[i]:
if int(values[i]) < int(old_values[i]):
has_negative_diff = True
break

if has_negative_diff:
for i in diff_column_positions:
old_values[i] = 0
old_values[i] = '0'
values[i] = ns_diff(values[i], old_values[i])
need_update_cache = True
continue
Expand Down
18 changes: 9 additions & 9 deletions tests/flow_counter_stats_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,25 +132,25 @@ def test_diff(self):
stats._collect = mock.MagicMock()
old_data = {
'': {
'bgp': [100, 200, 50.0, 1],
'bgpv6': [100, 200, 50.0, 2],
'lldp': [100, 200, 50.0, 3],
'bgp': ['100', '200', '50.0', '1'],
'bgpv6': ['100', '200', '50.0', '2'],
'lldp': ['100', '200', '50.0', '3'],
}
}
stats._save(old_data)
stats.data = {
'': {
'bgp': [100, 200, 50.0, 4],
'bgpv6': [100, 100, 50.0, 2],
'lldp': [200, 300, 50.0, 3],
'bgp': ['100', '200', '50.0', '4'],
'bgpv6': ['100', '100', '50.0', '2'],
'lldp': ['200', '300', '50.0', '3'],
}
}

stats._collect_and_diff()
cached_data = stats._load()
assert cached_data['']['bgp'] == [0, 0, 50.0, 4]
assert cached_data['']['bgpv6'] == [0, 0, 50.0, 2]
assert cached_data['']['lldp'] == [100, 200, 50.0, 3]
assert cached_data['']['bgp'] == ['0', '0', '50.0', '4']
assert cached_data['']['bgpv6'] == ['0', '0', '50.0', '2']
assert cached_data['']['lldp'] == ['100', '200', '50.0', '3']


class TestTrapStatsMultiAsic:
Expand Down