Skip to content

Provide config override for iperf3 bind_address for NAT deploys #1477

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

Open
jprorama wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Provide config override for iperf3 bind_address for NAT deploys #1477

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
4 changes: 4 additions & 0 deletions pscheduler-tool-iperf3/iperf3/iperf3_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ def get_config():
if config.has_option("iperf3", "server_port"):
obj["server_port"] = int(config.get("iperf3", "server_port"))

# supply local bind address for NAT config
if config.has_option("iperf3", "bind_address"):
obj["bind_address"] = config.get("iperf3", "bind_address")

return obj


Expand Down
23 changes: 20 additions & 3 deletions pscheduler-tool-iperf3/iperf3/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ if not(participants == 2 or (participants == 1 and (single_ended or loopback))):

config = iperf3_utils.get_config()

# look up our local bind_address override for NAT config
if "bind_address" in config:
local_bind_address = config["bind_address"]
else:
local_bind_address = None
# look up our local iperf3 command path
iperf3_cmd = config["iperf3_cmd"]

Expand Down Expand Up @@ -126,6 +131,10 @@ def run_client():
iperf3_args = iperf3_first_args.copy()

iperf3_args.append('-p')
# local bind address overides test specs for NAT
if local_bind_address:
source = local_bind_address

iperf3_args.append(server_port)

#Determine if we need to bind to an address and have enough info to do so intelligently
Expand Down Expand Up @@ -380,12 +389,20 @@ def run_server():
# we prefer IPv6 but fallback to IPv4 if they don't both have IPv6. If one end only
# has IPv4 and the other only has IPv6 we don't bind at all but don't throw error in
# case there is some external factor we don't know about (maybe should change this?)
source_ip, bind_address = pscheduler.ip_normalize_version(source, test_spec['dest'])

# local bind address overides test specs for NAT
if local_bind_address:
destination = local_bind_address
else:
destination = test_spec['dest']

source_ip, bind_address = pscheduler.ip_normalize_version(source, destination)
if bind_address is not None:
iperf3_args.append('-B')
iperf3_args.append(bind_address)
normalized_dest = bind_address
ip_version = pscheduler.ip_addr_version(bind_address)[0]
# return to original setting of normalized_dest in case of bind_address override
_, normalized_dest = pscheduler.ip_normalize_version(source, test_spec['dest'])
ip_version = pscheduler.ip_addr_version(normalized_dest)[0]
else:
logger.debug("Server: Skipping bind. Source %s and destination %s don't have any common IPs of the same version as far as tool can tell." % (source, test_spec['dest']))
else:
Expand Down