<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18447">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">iperf3: Support runing test with bidirectional data<br><br>Change-Id: Ia6f12c65fd3ea26d412997741cb8685a9646af43<br>---<br>M doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py<br>M doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py<br>M src/osmo_gsm_tester/obj/iperf3.py<br>M sysmocom/suites/4g/handover.py<br>M sysmocom/suites/4g/iperf3_dl.py<br>M sysmocom/suites/4g/iperf3_ul.py<br>M sysmocom/suites/gprs/lib/testlib.py<br>7 files changed, 25 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/47/18447/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>index bcc569a..66d75bb 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_dl.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> ue.connect(enb)</span><br><span> </span><br><span> iperf3srv.start()</span><br><span style="color: hsl(0, 100%, 40%);">-proc = iperf3cli.prepare_test_proc(True, ue.netns())</span><br><span style="color: hsl(120, 100%, 40%);">+proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns())</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span> wait(ue.is_connected, None)</span><br><span>diff --git a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>index a92a658..7dca127 100755</span><br><span>--- a/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>+++ b/doc/examples/4g_srsLTE/suites/4g/iperf3_ul.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> ue.connect(enb)</span><br><span> </span><br><span> iperf3srv.start()</span><br><span style="color: hsl(0, 100%, 40%);">-proc = iperf3cli.prepare_test_proc(False, ue.netns())</span><br><span style="color: hsl(120, 100%, 40%);">+proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns())</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span> wait(ue.is_connected, None)</span><br><span>diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>index 9c05d44..04aac47 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>@@ -193,6 +193,10 @@</span><br><span> PROTO_TCP = "tcp"</span><br><span> PROTO_UDP = "udp"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ DIR_UL = "ul"</span><br><span style="color: hsl(120, 100%, 40%);">+ DIR_DL = "dl"</span><br><span style="color: hsl(120, 100%, 40%);">+ DIR_BI = "bi"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> @classmethod</span><br><span> def validate_protocol(cls, val):</span><br><span> return val in (cls.PROTO_TCP, cls.PROTO_UDP)</span><br><span>@@ -215,9 +219,13 @@</span><br><span> locally = not self._run_node or self._run_node.is_local()</span><br><span> return locally</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def prepare_test_proc(self, downlink=False, netns=None, time_sec=None, proto=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ def prepare_test_proc(self, dir=None, netns=None, time_sec=None, proto=None):</span><br><span> values = config.get_defaults('iperf3cli')</span><br><span> config.overlay(values, self.testenv.suite().config().get('iperf3cli', {}))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if dir is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ dir = self.DIR_UL</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if time_sec is None:</span><br><span> time_sec_str = values.get('time', time_sec)</span><br><span> </span><br><span>@@ -239,11 +247,11 @@</span><br><span> self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name()))</span><br><span> self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE)</span><br><span> if self.runs_locally():</span><br><span style="color: hsl(0, 100%, 40%);">- return self.prepare_test_proc_locally(downlink, netns, time_sec, proto == IPerf3Client.PROTO_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.prepare_test_proc_locally(dir, netns, time_sec, proto == IPerf3Client.PROTO_UDP)</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- return self.prepare_test_proc_remotely(downlink, netns, time_sec, proto == IPerf3Client.PROTO_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.prepare_test_proc_remotely(dir, netns, time_sec, proto == IPerf3Client.PROTO_UDP)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def prepare_test_proc_remotely(self, downlink, netns, time_sec, use_udp):</span><br><span style="color: hsl(120, 100%, 40%);">+ def prepare_test_proc_remotely(self, dir, netns, time_sec, use_udp):</span><br><span> self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr())</span><br><span> </span><br><span> remote_prefix_dir = util.Dir(IPerf3Client.REMOTE_DIR)</span><br><span>@@ -257,8 +265,10 @@</span><br><span> '-t', str(time_sec))</span><br><span> if self.logfile_supported:</span><br><span> popen_args += ('--logfile', self.remote_log_file,)</span><br><span style="color: hsl(0, 100%, 40%);">- if downlink:</span><br><span style="color: hsl(120, 100%, 40%);">+ if dir == IPerf3Client.DIR_DL:</span><br><span> popen_args += ('-R',)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif dir == IPerf3Client.DIR_BI:</span><br><span style="color: hsl(120, 100%, 40%);">+ popen_args += ('--bidir',)</span><br><span> if use_udp:</span><br><span> popen_args += ('-u', '-b', '0')</span><br><span> </span><br><span>@@ -268,7 +278,7 @@</span><br><span> self.process = self.rem_host.RemoteProcess(self.name(), popen_args, env={})</span><br><span> return self.process</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def prepare_test_proc_locally(self, downlink, netns, time_sec, use_udp):</span><br><span style="color: hsl(120, 100%, 40%);">+ def prepare_test_proc_locally(self, dir, netns, time_sec, use_udp):</span><br><span> pcap_recorder.PcapRecorder(self.testenv, self.run_dir.new_dir('pcap'), None,</span><br><span> 'host %s and port not 22' % self.server.addr(), netns)</span><br><span> </span><br><span>@@ -277,8 +287,10 @@</span><br><span> '-t', str(time_sec))</span><br><span> if self.logfile_supported:</span><br><span> popen_args += ('--logfile', os.path.abspath(self.log_file),)</span><br><span style="color: hsl(0, 100%, 40%);">- if downlink:</span><br><span style="color: hsl(120, 100%, 40%);">+ if dir == IPerf3Client.DIR_DL:</span><br><span> popen_args += ('-R',)</span><br><span style="color: hsl(120, 100%, 40%);">+ elif dir == IPerf3Client.DIR_BI:</span><br><span style="color: hsl(120, 100%, 40%);">+ popen_args += ('--bidir',)</span><br><span> if use_udp:</span><br><span> popen_args += ('-u', '-b', '0')</span><br><span> </span><br><span>diff --git a/sysmocom/suites/4g/handover.py b/sysmocom/suites/4g/handover.py</span><br><span>index a503465..b0837d8 100755</span><br><span>--- a/sysmocom/suites/4g/handover.py</span><br><span>+++ b/sysmocom/suites/4g/handover.py</span><br><span>@@ -43,7 +43,7 @@</span><br><span> ue.connect(enb)</span><br><span> </span><br><span> iperf3srv.start()</span><br><span style="color: hsl(0, 100%, 40%);">-proc = iperf3cli.prepare_test_proc(False, ue.netns(), duration + 30)</span><br><span style="color: hsl(120, 100%, 40%);">+proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), duration + 30)</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span> wait(ue.is_connected, None)</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>index bcc569a..66d75bb 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_dl.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> ue.connect(enb)</span><br><span> </span><br><span> iperf3srv.start()</span><br><span style="color: hsl(0, 100%, 40%);">-proc = iperf3cli.prepare_test_proc(True, ue.netns())</span><br><span style="color: hsl(120, 100%, 40%);">+proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns())</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span> wait(ue.is_connected, None)</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>index a92a658..7dca127 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_ul.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> ue.connect(enb)</span><br><span> </span><br><span> iperf3srv.start()</span><br><span style="color: hsl(0, 100%, 40%);">-proc = iperf3cli.prepare_test_proc(False, ue.netns())</span><br><span style="color: hsl(120, 100%, 40%);">+proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns())</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span> wait(ue.is_connected, None)</span><br><span>diff --git a/sysmocom/suites/gprs/lib/testlib.py b/sysmocom/suites/gprs/lib/testlib.py</span><br><span>index 765f463..1421229 100644</span><br><span>--- a/sysmocom/suites/gprs/lib/testlib.py</span><br><span>+++ b/sysmocom/suites/gprs/lib/testlib.py</span><br><span>@@ -10,7 +10,7 @@</span><br><span> procs = []</span><br><span> for i in range(len(iperf3clients)):</span><br><span> print("Running iperf3 client to %s through %r" % (str(iperf3clients[i]), repr(ms_li[i].tmp_ctx_id)))</span><br><span style="color: hsl(0, 100%, 40%);">- procs.append(iperf3clients[i].prepare_test_proc(False, ms_li[i].netns()))</span><br><span style="color: hsl(120, 100%, 40%);">+ procs.append(iperf3clients[i].prepare_test_proc(iperf3clients[i].DIR_UL, ms_li[i].netns()))</span><br><span> try:</span><br><span> for proc in procs:</span><br><span> proc.launch()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18447">change 18447</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18447"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia6f12c65fd3ea26d412997741cb8685a9646af43 </div>
<div style="display:none"> Gerrit-Change-Number: 18447 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>