<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17651">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">iperf3: add config to adjust the duration of the iperf run<br><br>the time is passed as a string param and is then converted<br>into seconds when literals "h" or "m" are found.<br>So it would accept 2m and would convert it to 120s, for example.<br><br>Example:<br><br>+cfg-iperf3-time@15+<br><br>Change-Id: Iff28816f83670751e9e91de31ec59b1b0ad8fc0d<br>---<br>M example/defaults.conf<br>A example/scenarios/cfg-iperf3-time@.conf<br>M src/osmo_gsm_tester/iperf3.py<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/schema.py<br>M suites/4g/iperf3_dl.py<br>M suites/4g/iperf3_ul.py<br>7 files changed, 34 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/defaults.conf b/example/defaults.conf</span><br><span>index aa1e1dc..0b9136d 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -123,3 +123,6 @@</span><br><span> airplane_t_on_ms: -1</span><br><span> airplane_t_off_ms: -1</span><br><span> num_carriers: 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+iperf3cli:</span><br><span style="color: hsl(120, 100%, 40%);">+ time: 60</span><br><span>diff --git a/example/scenarios/cfg-iperf3-time@.conf b/example/scenarios/cfg-iperf3-time@.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..f46c59a</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/cfg-iperf3-time@.conf</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+config:</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3cli:</span><br><span style="color: hsl(120, 100%, 40%);">+ time: ${param1}</span><br><span>diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py</span><br><span>index be4dd6f..7103193 100644</span><br><span>--- a/src/osmo_gsm_tester/iperf3.py</span><br><span>+++ b/src/osmo_gsm_tester/iperf3.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import json</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, util, process, pcap_recorder, run_node, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, util, config, process, pcap_recorder, run_node, remote</span><br><span> </span><br><span> def iperf3_result_to_json(file):</span><br><span> with open(file) as f:</span><br><span>@@ -154,8 +154,23 @@</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=10):</span><br><span style="color: hsl(0, 100%, 40%);">- self.log('Starting iperf3-client connecting to %s:%d' % (self.server.addr(), self.server.port()))</span><br><span style="color: hsl(120, 100%, 40%);">+ def prepare_test_proc(self, downlink=False, netns=None, time_sec=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ if time_sec is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ values = config.get_defaults('iperf3cli')</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, self.suite_run.config().get('iperf3cli', {}))</span><br><span style="color: hsl(120, 100%, 40%);">+ time_sec_str = values.get('time', time_sec)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Convert duration to seconds</span><br><span style="color: hsl(120, 100%, 40%);">+ if isinstance(time_sec_str, str) and time_sec_str.endswith('h'):</span><br><span style="color: hsl(120, 100%, 40%);">+ time_sec = int(time_sec_str[:-1]) * 3600</span><br><span style="color: hsl(120, 100%, 40%);">+ elif isinstance(time_sec_str, str) and time_sec_str.endswith('m'):</span><br><span style="color: hsl(120, 100%, 40%);">+ time_sec = int(time_sec_str[:-1]) * 60</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ time_sec = int(time_sec_str)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(time_sec)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Preparing iperf3-client connecting to %s:%d (time=%ds)' % (self.server.addr(), self.server.port(), time_sec))</span><br><span> self.log_copied = False</span><br><span> self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span> self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE)</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index a13fd2d..3b6e341 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -127,6 +127,7 @@</span><br><span> 'config.epc.enable_pcap': schema.BOOL_STR,</span><br><span> 'config.modem.enable_pcap': schema.BOOL_STR,</span><br><span> 'config.amarisoft.license_server_addr': schema.IPV4,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'config.iperf3cli.time': schema.DURATION,</span><br><span> },</span><br><span> dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()]),</span><br><span> dict([('modifiers.%s' % key, val) for key, val in WANT_SCHEMA.items()]))</span><br><span>diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py</span><br><span>index 7fe6689..85c5fd6 100644</span><br><span>--- a/src/osmo_gsm_tester/schema.py</span><br><span>+++ b/src/osmo_gsm_tester/schema.py</span><br><span>@@ -136,6 +136,11 @@</span><br><span> return</span><br><span> raise ValueError('Unknown LTE RLC DRB Mode value: %r' % val)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def duration(val):</span><br><span style="color: hsl(120, 100%, 40%);">+ if val.isdecimal() or val.endswith('m') or val.endswith('h'):</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('Invalid duration value: %r' % val)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> INT = 'int'</span><br><span> STR = 'str'</span><br><span> UINT = 'uint'</span><br><span>@@ -157,6 +162,7 @@</span><br><span> OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref'</span><br><span> LTE_TRANSMISSION_MODE = 'lte_transmission_mode'</span><br><span> LTE_RLC_DRB_MODE = 'lte_rlc_drb_mode'</span><br><span style="color: hsl(120, 100%, 40%);">+DURATION = 'duration'</span><br><span> </span><br><span> SCHEMA_TYPES = {</span><br><span> INT: int,</span><br><span>@@ -180,6 +186,7 @@</span><br><span> OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref,</span><br><span> LTE_TRANSMISSION_MODE: lte_transmission_mode,</span><br><span> LTE_RLC_DRB_MODE: lte_rlc_drb_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ DURATION: duration,</span><br><span> }</span><br><span> </span><br><span> def validate(config, schema):</span><br><span>diff --git a/suites/4g/iperf3_dl.py b/suites/4g/iperf3_dl.py</span><br><span>index 38a3891..88ae82d 100755</span><br><span>--- a/suites/4g/iperf3_dl.py</span><br><span>+++ b/suites/4g/iperf3_dl.py</span><br><span>@@ -32,7 +32,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(), time_sec=60)</span><br><span style="color: hsl(120, 100%, 40%);">+proc = iperf3cli.prepare_test_proc(True, 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/suites/4g/iperf3_ul.py b/suites/4g/iperf3_ul.py</span><br><span>index f467696..597b50d 100755</span><br><span>--- a/suites/4g/iperf3_ul.py</span><br><span>+++ b/suites/4g/iperf3_ul.py</span><br><span>@@ -32,7 +32,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(), time_sec=60)</span><br><span style="color: hsl(120, 100%, 40%);">+proc = iperf3cli.prepare_test_proc(False, 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17651">change 17651</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/+/17651"/><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: Iff28816f83670751e9e91de31ec59b1b0ad8fc0d </div>
<div style="display:none"> Gerrit-Change-Number: 17651 </div>
<div style="display:none"> Gerrit-PatchSet: 10 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>