<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955">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;">enb: incorporate number of carriers into ue_max_rate() API<br><br>this allows the enb to calculate the max rate in a single<br>spot rather than each test individually<br><br>Change-Id: Id225a986e0b271cf9c057c74c9aefd6c7f3d39d6<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/obj/enb_amarisoft.py<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>M sysmocom/suites/4g/iperf3_dl.py<br>M sysmocom/suites/4g/iperf3_ul.py<br>5 files changed, 12 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index 85aca35..6384f15 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -213,7 +213,7 @@</span><br><span> pass</span><br><span> </span><br><span> @abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def ue_max_rate(self, downlink=True):</span><br><span style="color: hsl(120, 100%, 40%);">+ def ue_max_rate(self, downlink=True, num_carriers=1):</span><br><span> pass</span><br><span> </span><br><span> @abstractmethod</span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>index 657cb2e..f2d328d 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>@@ -251,7 +251,7 @@</span><br><span> rfemu_obj = rfemu.get_instance_by_type(rfemu_cfg['type'], rfemu_cfg)</span><br><span> return rfemu_obj</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def ue_max_rate(self, downlink=True):</span><br><span style="color: hsl(120, 100%, 40%);">+ def ue_max_rate(self, downlink=True, num_carriers=1):</span><br><span> # The max rate for a single UE per PRB configuration in TM1 with MCS 28 QAM64</span><br><span> max_phy_rate_tm1_dl = { 6 : 3.2e6,</span><br><span> 15 : 9.2e6,</span><br><span>@@ -278,6 +278,9 @@</span><br><span> if self._txmode >= 2 and self.num_prb() <= 25:</span><br><span> max_rate *= 0.85</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Assume we schedule all carriers</span><br><span style="color: hsl(120, 100%, 40%);">+ max_rate *= num_carriers</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return max_rate</span><br><span> </span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index aa2ec87..7556f92 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -249,10 +249,11 @@</span><br><span> rfemu_cfg = cell_list[cell].get('dl_rfemu', None)</span><br><span> if rfemu_cfg is None:</span><br><span> raise log.Error('rfemu attribute not found in cell_list item!')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rfemu_obj = rfemu.get_instance_by_type(rfemu_cfg['type'], rfemu_cfg)</span><br><span> return rfemu_obj</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def ue_max_rate(self, downlink=True):</span><br><span style="color: hsl(120, 100%, 40%);">+ def ue_max_rate(self, downlink=True, num_carriers=1):</span><br><span> # The max rate for a single UE per PRB configuration in TM1 with MCS 28 QAM64</span><br><span> max_phy_rate_tm1_dl = { 6 : 3.5e6,</span><br><span> 15 : 11e6,</span><br><span>@@ -280,6 +281,9 @@</span><br><span> if self._txmode >= 2 and self.num_prb() == 6:</span><br><span> max_rate *= 0.85</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Assume we schedule all carriers</span><br><span style="color: hsl(120, 100%, 40%);">+ max_rate *= num_carriers</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return max_rate</span><br><span> </span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>index 0d8bfcd..6f79076 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_dl.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>@@ -20,8 +20,7 @@</span><br><span> </span><br><span> ue.connect(enb)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-max_rate = enb.ue_max_rate(downlink=True)</span><br><span style="color: hsl(0, 100%, 40%);">-max_rate *= ue.num_carriers</span><br><span style="color: hsl(120, 100%, 40%);">+max_rate = enb.ue_max_rate(downlink=True, num_carriers=ue.num_carriers)</span><br><span> </span><br><span> iperf3srv.start()</span><br><span> proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate)</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>index 83ac465..4ae0118 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_ul.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>@@ -20,8 +20,7 @@</span><br><span> </span><br><span> ue.connect(enb)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-max_rate = enb.ue_max_rate(downlink=False)</span><br><span style="color: hsl(0, 100%, 40%);">-max_rate *= ue.num_carriers</span><br><span style="color: hsl(120, 100%, 40%);">+max_rate = enb.ue_max_rate(downlink=False, num_carriers=ue.num_carriers)</span><br><span> </span><br><span> iperf3srv.start()</span><br><span> proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19955">change 19955</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/+/19955"/><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: Id225a986e0b271cf9c057c74c9aefd6c7f3d39d6 </div>
<div style="display:none"> Gerrit-Change-Number: 19955 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>