Skip to content

Fix compatibility issue between python2 and python3 in null_route test #6701

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
xwjiang-ms merged 1 commit into from
Nov 2, 2022
Merged

Fix compatibility issue between python2 and python3 in null_route test #6701

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
4 changes: 2 additions & 2 deletions tests/acl/null_route/test_null_route_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def generate_packet(src_ip, dst_ip, dst_mac):
"""
Build ipv4 and ipv6 packets/expected_packets for testing.
"""
if ipaddress.ip_network(str(src_ip), False).version == 4:
if ipaddress.ip_network(src_ip.encode().decode(), False).version == 4:
pkt = testutils.simple_ip_packet(eth_dst=dst_mac, ip_src=src_ip, ip_dst=dst_ip)
exp_pkt = Mask(pkt)
exp_pkt.set_do_not_care_scapy(scapy.Ether, "dst")
Expand Down Expand Up @@ -244,7 +244,7 @@ def test_null_route_helper(rand_selected_dut, tbinfo, ptfadapter, apply_pre_defi
src_ip = test_item[0]
action = test_item[1]
expected_result = test_item[2]
ip_ver = ipaddress.ip_network(str(src_ip), False).version
ip_ver = ipaddress.ip_network(src_ip.encode().decode(), False).version
logger.info("Testing with src_ip = {} action = {} expected_result = {}"
.format(src_ip, action, expected_result))
pkt, exp_pkt = generate_packet(src_ip, DST_IP[ip_ver], router_mac)
Expand Down