Re arragned the arguments on some functions to the original order
Re arranged the places where the iperf_binary is called to be the
last argument to allow for backwards compatibility.
Bug: 146929654
Test: None
Change-Id: I4b3bae3bde8c8796888ff0e000b846e8af1ac7f0
diff --git a/acts/framework/acts/controllers/iperf_client.py b/acts/framework/acts/controllers/iperf_client.py
index 046025f..80a8410 100644
--- a/acts/framework/acts/controllers/iperf_client.py
+++ b/acts/framework/acts/controllers/iperf_client.py
@@ -112,7 +112,7 @@
return os.path.join(full_out_dir, out_file_name)
- def start(self, ip, iperf_args, tag, iperf_binary=None, timeout=3600):
+ def start(self, ip, iperf_args, tag, timeout=3600, iperf_binary=None):
"""Starts iperf client, and waits for completion.
Args:
@@ -120,9 +120,9 @@
iperf_args: A string representing arguments to start iperf
client. Eg: iperf_args = "-t 10 -p 5001 -w 512k/-u -b 200M -J".
tag: A string to further identify iperf results file
+ timeout: the maximum amount of time the iperf client can run.
iperf_binary: Location of iperf3 binary. If none, it is assumed the
the binary is in the path.
- timeout: the maximum amount of time the iperf client can run.
Returns:
full_out_path: iperf result path.
@@ -132,7 +132,7 @@
class IPerfClient(IPerfClientBase):
"""Class that handles iperf3 client operations."""
- def start(self, ip, iperf_args, tag, iperf_binary=None, timeout=3600):
+ def start(self, ip, iperf_args, tag, timeout=3600, iperf_binary=None):
"""Starts iperf client, and waits for completion.
Args:
@@ -140,9 +140,9 @@
iperf_args: A string representing arguments to start iperf
client. Eg: iperf_args = "-t 10 -p 5001 -w 512k/-u -b 200M -J".
tag: tag to further identify iperf results file
+ timeout: unused.
iperf_binary: Location of iperf3 binary. If none, it is assumed the
the binary is in the path.
- timeout: unused.
Returns:
full_out_path: iperf result path.
@@ -178,7 +178,7 @@
self.hostname = self._ssh_settings.hostname
self.test_interface = test_interface
- def start(self, ip, iperf_args, tag, iperf_binary=None, timeout=3600):
+ def start(self, ip, iperf_args, tag, timeout=3600, iperf_binary=None):
"""Starts iperf client, and waits for completion.
Args:
@@ -186,9 +186,9 @@
iperf_args: A string representing arguments to start iperf
client. Eg: iperf_args = "-t 10 -p 5001 -w 512k/-u -b 200M -J".
tag: tag to further identify iperf results file
+ timeout: the maximum amount of time to allow the iperf client to run
iperf_binary: Location of iperf3 binary. If none, it is assumed the
the binary is in the path.
- timeout: the maximum amount of time to allow the iperf client to run
Returns:
full_out_path: iperf result path.
@@ -244,7 +244,7 @@
return _AndroidDeviceBridge.android_devices()[
self._android_device_or_serial]
- def start(self, ip, iperf_args, tag, iperf_binary=None, timeout=3600):
+ def start(self, ip, iperf_args, tag, timeout=3600, iperf_binary=None):
"""Starts iperf client, and waits for completion.
Args:
@@ -252,9 +252,9 @@
iperf_args: A string representing arguments to start iperf
client. Eg: iperf_args = "-t 10 -p 5001 -w 512k/-u -b 200M -J".
tag: tag to further identify iperf results file
+ timeout: the maximum amount of time to allow the iperf client to run
iperf_binary: Location of iperf3 binary. If none, it is assumed the
the binary is in the path.
- timeout: the maximum amount of time to allow the iperf client to run
Returns:
The iperf result file path.
diff --git a/acts/framework/acts/controllers/iperf_server.py b/acts/framework/acts/controllers/iperf_server.py
index 3243e70..f8048b9 100755
--- a/acts/framework/acts/controllers/iperf_server.py
+++ b/acts/framework/acts/controllers/iperf_server.py
@@ -487,16 +487,16 @@
"""
utils.renew_linux_ip_address(self._ssh_session, self.test_interface)
- def start(self, extra_args='', iperf_binary=None, tag=''):
+ def start(self, extra_args='', tag='', iperf_binary=None):
"""Starts iperf server on specified machine and port.
Args:
extra_args: A string representing extra arguments to start iperf
server with.
- iperf_binary: Location of iperf3 binary. If none, it is assumed the
- the binary is in the path.
tag: Appended to log file name to identify logs from different
iperf runs.
+ iperf_binary: Location of iperf3 binary. If none, it is assumed the
+ the binary is in the path.
"""
if self.started:
return
@@ -613,16 +613,16 @@
def _get_device_log_path(self):
return '~/data/iperf_server_port%s.log' % self.port
- def start(self, extra_args='', iperf_binary=None, tag=''):
+ def start(self, extra_args='', tag='', iperf_binary=None):
"""Starts iperf server on an ADB device.
Args:
extra_args: A string representing extra arguments to start iperf
server with.
- iperf_binary: Location of iperf3 binary. If none, it is assumed the
- the binary is in the path.
tag: Appended to log file name to identify logs from different
iperf runs.
+ iperf_binary: Location of iperf3 binary. If none, it is assumed the
+ the binary is in the path.
"""
if self._iperf_process is not None:
return