Commit 7f371926 authored by David Fernandes's avatar David Fernandes Committed by Mathias Ettinger

Rename iperf3 interval argument

parent e2d88097
......@@ -91,7 +91,7 @@ def _command_build_helper(flag, value):
def client(
interval, port, num_flows, server_ip, window_size,
metrics_interval, port, num_flows, server_ip, window_size,
tos, time_duration, transmitted_size, protocol, bandwidth=None,
cong_control=None, mss=None):
# Connect to collect_agent
......@@ -104,7 +104,7 @@ def client(
sys.exit(message)
cmd = ['stdbuf', '-oL', 'iperf3', '-c', server_ip, '-f', 'k']
cmd.extend(_command_build_helper('-i', interval))
cmd.extend(_command_build_helper('-i', metrics_interval))
cmd.extend(_command_build_helper('-w', window_size))
cmd.extend(_command_build_helper('-p', port))
if protocol == "udp":
......@@ -201,7 +201,7 @@ def client(
p.wait()
def server(exit, bind, interval, port, num_flows):
def server(exit, bind, metrics_interval, port, num_flows):
# Connect to collect_agent
success = collect_agent.register_collect(
'/opt/openbach/agent/jobs/iperf3/'
......@@ -216,7 +216,7 @@ def server(exit, bind, interval, port, num_flows):
cmd.append('-1')
if bind:
cmd.extend(_command_build_helper('-B', bind))
cmd.extend(_command_build_helper('-i', interval))
cmd.extend(_command_build_helper('-i', metrics_interval))
cmd.extend(_command_build_helper('-p', port))
# Read output, and send stats
......@@ -306,8 +306,8 @@ if __name__ == "__main__":
description=__doc__,
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser.add_argument(
'-i', '--interval', type=float, default=1,
help='Pause *interval* seconds between '
'-i', '--metrics-interval', type=float, default=1,
help='Pause *metrics_interval* seconds between '
'periodic bandwidth reports (if specified, it must be given to '
'server and client)')
parser.add_argument(
......
......@@ -32,7 +32,7 @@ general:
generate UDP/TCP traffic with configured parameters (duration,
bandwidth, parallel flows, ToS, MSS, etc.). It measures
throughput, sent/lost packets, jitter, etc.
job_version: '2.5'
job_version: '2.6'
keywords:
- iperf
- iperf3
......@@ -54,11 +54,11 @@ platform_configuration:
arguments:
required:
optional:
- name: interval
- name: metrics_interval
type: float
count: 1
flag: '-i'
description: Pause interval seconds between periodic bandwidth reports (default 1 sec). If specified, it must be given to server and client)
description: Pause metrics_interval seconds between periodic bandwidth reports (default 1 sec). If specified, it must be given to server and client)
- name: port
type: int
count: 1
......@@ -148,28 +148,28 @@ arguments:
statistics:
- name: "sent_data_*flow_number*"
description: The cumulative amount of data sent from the job launch, in Bytes (client and server sides)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
- name: "throughput_*flow_number*"
description: The throughput in this period, in bits/sec (client and server sides)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
- name: "jitter_*flow_number*"
description: The jitter between packets in this period, in seconds (server side)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
- name: "sent_pkts_*flow_number*"
description: The number of sent packets (server side)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
- name: "lost_pkts_*flow_number*"
description: The number of lost packets (server side)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
- name: "plr_*flow_number*"
description: The packet loss rate for this period, in % (server side)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
- name: "download_time_*flow_number*"
description: The total download time, in seconds (client and server sides)
frequency: 'once'
- name: "cwnd_*flow_number*"
description: The value of the congestion window, in Bytes, when TCP is chosen (client side)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
- name: "retransmissions_*flow_number*"
description: The number of TCP retransmissions, when TCP is chosen (client side)
frequency: 'every *interval* seconds'
frequency: 'every *metrics_interval* seconds'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment