cellular-infrastructure
/
osmo-gsm-tester
mirror of https://gerrit.osmocom.org/osmo-gsm-tester
9
0
Fork 0
Code Issues Releases Wiki Activity

iperf3: Support setting run time 

Change-Id: I93e857bd682c733c3ba36234b9bf1e1cc85eddef
This commit is contained in:
Pau Espin 2020-03-02 18:14:02 +01:00
parent 143365dc54
commit 085a17e8e0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osmo_gsm_tester/iperf3.py
View File

@ -154,17 +154,17 @@ class IPerf3Client(log.Origin):
locally = not self._run_node or self._run_node.is_local()
return locally
def prepare_test_proc(self, downlink=False, netns=None):
def prepare_test_proc(self, downlink=False, netns=None, time_sec=10):
self.log('Starting iperf3-client connecting to %s:%d' % (self.server.addr(), self.server.port()))
self.log_copied = False
self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE)
if self.runs_locally():
return self.prepare_test_proc_locally(downlink, netns)
return self.prepare_test_proc_locally(downlink, netns, time_sec)
else:
return self.prepare_test_proc_remotely(downlink, netns)
return self.prepare_test_proc_remotely(downlink, netns, time_sec)
def prepare_test_proc_remotely(self, downlink, netns):
def prepare_test_proc_remotely(self, downlink, netns, time_sec):
self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr())
remote_prefix_dir = util.Dir(IPerf3Client.REMOTE_DIR)
@ -175,7 +175,8 @@ class IPerf3Client(log.Origin):
popen_args = ('iperf3', '-c', self.server.addr(),
'-p', str(self.server.port()), '-J',
'--logfile', self.remote_log_file)
'--logfile', self.remote_log_file,
'-t', str(time_sec))
if downlink:
popen_args += ('-R',)
@ -185,13 +186,14 @@ class IPerf3Client(log.Origin):
self.process = self.rem_host.RemoteProcess(self.name(), popen_args, env={})
return self.process
def prepare_test_proc_locally(self, downlink, netns):
def prepare_test_proc_locally(self, downlink, netns, time_sec):
pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None,
'host %s and port not 22' % self.server.addr(), netns)
popen_args = ('iperf3', '-c', self.server.addr(),
'-p', str(self.server.port()), '-J',
'--logfile', os.path.abspath(self.log_file))
'--logfile', os.path.abspath(self.log_file),
'-t', str(time_sec))
if downlink:
popen_args += ('-R',)