Skip to content

[Bugfix][test_vxlan_ecmp] fixed a bug caused by python 3 migration. #12844

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
yxieca merged 1 commit into from
May 16, 2024
Merged

[Bugfix][test_vxlan_ecmp] fixed a bug caused by python 3 migration. #12844

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
15 changes: 8 additions & 7 deletions ansible/roles/test/files/ptftests/py3/vxlan_traffic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import os.path
import json
import base64
import six
from datetime import datetime
import logging
import random
Expand Down Expand Up @@ -84,18 +85,18 @@ def get_ip_address(af, hostid=1, netid=100):
netid : The first octet in the Address.
'''
global Address_Count
third_octet = Address_Count % 255
second_octet = (Address_Count / 255) % 255
first_octet = netid + (Address_Count / 65025)
third_octet = int(Address_Count % 255)
second_octet = int((Address_Count / 255) % 255)
first_octet = int(netid + (Address_Count / 65025))
Address_Count = Address_Count + 1
if af == 'v4':
return "{}.{}.{}.{}".format(
first_octet, second_octet, third_octet, hostid).decode()
return six.text_type("{}.{}.{}.{}".format(
first_octet, second_octet, third_octet, hostid))
if af == 'v6':
# :0: gets removed in the IPv6 addresses.
# Adding a to octets, to avoid it.
return "fddd:a{}:a{}::a{}:{}".format(
first_octet, second_octet, third_octet, hostid).decode()
return six.text_type("fddd:a{}:a{}::a{}:{}".format(
first_octet, second_octet, third_octet, hostid))


def get_incremental_value(key):
Expand Down