<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24275">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">4g-iperf3-dl: modified the test to parameterize the number of ue in the test.<br><br>Parameterize the iperf3 downlink test for the 4g test suite to execute a<br>given number of UEs. By default, the number of ue is 1.<br><br>Change-Id: Ifafea196289d1ce0d35ae66c6564266ba123b27a<br>---<br>M sysmocom/suites/4g/iperf3_dl.py<br>1 file changed, 73 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>index 9e172c4..8d4cb5a 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_dl.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>@@ -6,43 +6,93 @@</span><br><span> if os.path.isdir(os.path.join(os.path.dirname(__file__), 'templates')):</span><br><span> tenv.set_overlay_template_dir(os.path.join(os.path.dirname(__file__), 'templates'))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Retrieve the number of physical ue from the test suite configuration.</span><br><span style="color: hsl(120, 100%, 40%);">+test_config = tenv.config_test_specific()</span><br><span style="color: hsl(120, 100%, 40%);">+nof_ue = int(test_config.get("nof_physical_ue", 1))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+print(f'Number of physical ue: {nof_ue}')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ue_li = []</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Get the ue from the test configuration.</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ ue_li.append(tenv.modem())</span><br><span style="color: hsl(120, 100%, 40%);">+ print(f'ue index{n}: {ue_li[n]}')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> epc = tenv.epc()</span><br><span> enb = tenv.enb()</span><br><span style="color: hsl(0, 100%, 40%);">-ue = tenv.modem()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv.set_run_node(epc.run_node())</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3cli = iperf3srv.create_client()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3cli.set_run_node(ue.run_node())</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-epc.subscriber_add(ue)</span><br><span style="color: hsl(120, 100%, 40%);">+iperf3srv = []</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3srv.append(tenv.iperf3srv({'addr': epc.tun_addr()}))</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3srv[n].set_run_node(epc.run_node())</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3srv[n].set_port(iperf3srv[n].DEFAULT_SRV_PORT + n)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Set the iperf clients in the ue.</span><br><span style="color: hsl(120, 100%, 40%);">+iperf3cli = []</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3cli.append(iperf3srv[n].create_client())</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3cli[n].set_run_node(ue_li[n].run_node())</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ epc.subscriber_add(ue_li[n])</span><br><span> epc.start()</span><br><span style="color: hsl(0, 100%, 40%);">-enb.ue_add(ue)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enb.ue_add(ue_li[0])</span><br><span> enb.start(epc)</span><br><span> </span><br><span> print('waiting for ENB to connect to EPC...')</span><br><span> wait(epc.enb_is_connected, enb)</span><br><span> print('ENB is connected to EPC')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ue.connect(enb)</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ ue_li[n].connect(enb)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-max_rate = enb.ue_max_rate(downlink=True, num_carriers=ue.num_carriers)</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3srv[n].start()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv.start()</span><br><span style="color: hsl(0, 100%, 40%);">-proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+proc_li = []</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_registered)</span><br><span style="color: hsl(0, 100%, 40%);">-print('UE is attached')</span><br><span style="color: hsl(120, 100%, 40%);">+# Attach all the ue's.</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ max_rate = enb.ue_max_rate(downlink=True, num_carriers=ue_li[n].num_carriers);</span><br><span style="color: hsl(120, 100%, 40%);">+ client = iperf3cli[n].prepare_test_proc(iperf3cli[n].DIR_DL, ue_li[n].netns(), bitrate=max_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+ print(f'Iperf client type: {type(client)}')</span><br><span style="color: hsl(120, 100%, 40%);">+ proc_li.append(client)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))</span><br><span style="color: hsl(0, 100%, 40%);">-proc.launch_sync()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv.stop()</span><br><span style="color: hsl(120, 100%, 40%);">+# Wait until all ue are attached.</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ print(f'waiting for UE {n} to attach...')</span><br><span style="color: hsl(120, 100%, 40%);">+ wait(ue_li[n].is_registered)</span><br><span style="color: hsl(120, 100%, 40%);">+ print(f'UE {n} is attached')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-iperf3cli.print_results()</span><br><span style="color: hsl(0, 100%, 40%);">-iperf3srv.print_results(iperf3cli.proto() == iperf3cli.PROTO_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+# Execute the iperfs and wait for its finish.</span><br><span style="color: hsl(120, 100%, 40%);">+try:</span><br><span style="color: hsl(120, 100%, 40%);">+ for proc in proc_li:</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.launch()</span><br><span style="color: hsl(120, 100%, 40%);">+ for proc in proc_li:</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.wait()</span><br><span style="color: hsl(120, 100%, 40%);">+except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ for proc in proc_li:</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.terminate()</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Exception while terminanting process %r" % repr(process))</span><br><span style="color: hsl(120, 100%, 40%);">+ raise e</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3cli[n].print_results()</span><br><span style="color: hsl(120, 100%, 40%);">+ iperf3srv[n].print_results(iperf3cli[n].proto() == iperf3cli[n].PROTO_UDP)</span><br><span> </span><br><span> # 80% of the maximum rate for half of the test duration</span><br><span style="color: hsl(0, 100%, 40%);">-half_duration = int(round(iperf3cli.time_sec() / 2))</span><br><span style="color: hsl(0, 100%, 40%);">-res_str = ue.verify_metric(max_rate * 0.8, operation='max_rolling_avg', metric='dl_brate', criterion='gt', window=half_duration)</span><br><span style="color: hsl(0, 100%, 40%);">-print(res_str)</span><br><span style="color: hsl(0, 100%, 40%);">-test.set_report_stdout(res_str)</span><br><span style="color: hsl(120, 100%, 40%);">+out = ''</span><br><span style="color: hsl(120, 100%, 40%);">+for n in range(0, nof_ue):</span><br><span style="color: hsl(120, 100%, 40%);">+ half_duration = int(round(iperf3cli[n].time_sec() / 2))</span><br><span style="color: hsl(120, 100%, 40%);">+ max_rate = enb.ue_max_rate(downlink=True, num_carriers=ue_li[n].num_carriers);</span><br><span style="color: hsl(120, 100%, 40%);">+ res_str = ue_li[n].verify_metric(max_rate * 0.8, operation='max_rolling_avg', metric='dl_brate', criterion='gt', window=half_duration)</span><br><span style="color: hsl(120, 100%, 40%);">+ print(res_str)</span><br><span style="color: hsl(120, 100%, 40%);">+ out += res_str</span><br><span style="color: hsl(120, 100%, 40%);">+ if n != nof_ue - 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ out += '\n'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+test.set_report_stdout(out)</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24275">change 24275</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/+/24275"/><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: Ifafea196289d1ce0d35ae66c6564266ba123b27a </div>
<div style="display:none"> Gerrit-Change-Number: 24275 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: alealcon <alejandro.leal@srs.io> </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-MessageType: merged </div>