Skip to content

Fixing HashTest Bugs #20840 and #21071 #20881

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
wangxin merged 4 commits into from
Jan 8, 2026
+14 −7
Merged

Fixing HashTest Bugs #20840 and #21071 #20881

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30e5d99
Update hash_test.py
gshemesh2 Oct 1, 2025
25725ed
Update hash_test.py
gshemesh2 Oct 1, 2025
6a9113f
Refactor send_and_verify_packets method
gshemesh2 Nov 24, 2025
58464d1
Fix formatting in create_packets_logs function
gshemesh2 Nov 24, 2025
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
21 changes: 14 additions & 7 deletions ansible/roles/test/files/ptftests/py3/hash_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,19 +614,19 @@ def check_balancing(self, dest_port_list, port_hit_cnt, src_port, hash_key):
for member in ecmp_entry:
total_entry_hit_cnt += port_hit_cnt.get(member, 0)
(p, r) = self.check_within_expected_range(
total_entry_hit_cnt, float(total_hit_cnt) / len(asic_member))
total_entry_hit_cnt, float(total_hit_cnt) / len(asic_member), hash_key)
logging.info("%-10s \t %-10s \t %10d \t %10d \t %10s"
% ("ECMP", str(ecmp_entry), total_hit_cnt // len(asic_member),
total_entry_hit_cnt, str(round(p, 4) * 100) + '%'), hash_key)
total_entry_hit_cnt, str(round(p, 4) * 100) + '%'))
result &= r
if len(ecmp_entry) == 1 or total_entry_hit_cnt == 0:
continue
for member in ecmp_entry:
(p, r) = self.check_within_expected_range(port_hit_cnt.get(
member, 0), float(total_entry_hit_cnt) / len(ecmp_entry))
member, 0), float(total_entry_hit_cnt) / len(ecmp_entry), hash_key)
logging.info("%-10s \t %-10s \t %10d \t %10d \t %10s"
% ("LAG", str(member), total_entry_hit_cnt // len(ecmp_entry),
port_hit_cnt.get(member, 0), str(round(p, 4) * 100) + '%'), hash_key)
port_hit_cnt.get(member, 0), str(round(p, 4) * 100) + '%'))
result &= r
assert result

Expand All @@ -648,6 +648,13 @@ class IPinIPHashTest(HashTest):
for IPinIP packet.
'''

def send_and_verify_packets(self, src_port, pkt, masked_exp_pkt, dst_port_lists, is_timeout=False, logs=[]):
"""
@summary: Send an IPinIP encapsulated packet and verify it is received on expected ports.
"""
return super().send_and_verify_packets(src_port, pkt, masked_exp_pkt, dst_port_lists, is_timeout=False,
logs=logs)

def create_packets_logs(
self, src_port, sport, dport, version='IP', pkt=None, ipinip_pkt=None,
vxlan_pkt=None, nvgre_pkt=None, inner_pkt=None, outer_sport=None,
Expand All @@ -665,9 +672,9 @@ def create_packets_logs(
ipinip_pkt['IP'].dst,
ipinip_pkt['IP'].proto,
version,
pkt[version].src,
pkt[version].dst,
pkt[version].proto if version == 'IP' else pkt['IPv6'].nh,
inner_pkt[version].src,
inner_pkt[version].dst,
inner_pkt[version].proto if version == 'IP' else inner_pkt['IPv6'].nh,
sport,
dport,
src_port))
Expand Down
Loading