Skip to content

[pytest/hash] Complete hash key ingress-port test #1509

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
lguohan merged 5 commits into from
Apr 8, 2020
Merged

[pytest/hash] Complete hash key ingress-port test #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9880709
[pytest/hash] Rewrite hash test
William-zx Mar 30, 2020
4d33ed1
complete hash test ingress-port
William-zx Mar 30, 2020
46472ef
Modify default hash_keys, modify src_port to in_port, modify Test_Has…
William-zx Apr 2, 2020
3a77547
Merge branch 'master' into hash_2_ingress_port
William-zx Apr 7, 2020
a167d15
Revise according to the comments of the review:
William-zx Apr 8, 2020
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: 15 additions & 6 deletions ansible/roles/test/files/ptftests/hash_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,21 @@ def check_hash(self, hash_key):
in_port = random.choice([port for port in self.src_ports if port not in exp_port_list])

hit_count_map = {}
for _ in range(0, self.BALANCING_TEST_TIMES):
logging.info("in_port: {}".format(in_port))
(matched_index, _) = self.check_ip_route(hash_key, in_port, dst_ip, exp_port_list)
hit_count_map[matched_index] = hit_count_map.get(matched_index, 0) + 1
logging.info("hit count map: {}".format(hit_count_map))
self.check_balancing(next_hop.get_next_hop(), hit_count_map)
if hash_key == 'ingress-port': # The sample is too little for hash_key ingress-port, check it loose(just verify if the asic actually used the hash field as a load-balancing factor)
for in_port in [port for port in self.src_ports if port not in exp_port_list]:
logging.info("in_port: {}".format(in_port))
(matched_index, _) = self.check_ip_route(hash_key, in_port, dst_ip, exp_port_list)
hit_count_map[matched_index] = hit_count_map.get(matched_index, 0) + 1
logging.info("hit count map: {}".format(hit_count_map))
assert True if len(hit_count_map.keys()) > 1 else False
else:
for _ in range(0, self.BALANCING_TEST_TIMES):
logging.info("in_port: {}".format(in_port))
(matched_index, _) = self.check_ip_route(hash_key, in_port, dst_ip, exp_port_list)
hit_count_map[matched_index] = hit_count_map.get(matched_index, 0) + 1
logging.info("hit count map: {}".format(hit_count_map))

self.check_balancing(next_hop.get_next_hop(), hit_count_map)

def check_ip_route(self, hash_key, in_port, dst_ip, dst_port_list):
if ip_network(unicode(dst_ip)).version == 4:
Expand Down
3 changes: 0 additions & 3 deletions tests/fib/test_fib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ def setup_hash(self, testbed, duthost, ptfhost):
self.hash_keys.remove('src-port')
self.hash_keys.remove('dst-port')

# TODO
self.hash_keys.remove('ingress-port')

g_vars['testbed_type'] = testbed['topo']['name']
g_vars['router_mac'] = duthost.shell('sonic-cfggen -d -v \'DEVICE_METADATA.localhost.mac\'')["stdout_lines"][0].decode("utf-8")

Expand Down