<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21097">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">{enb,ms}_srs: Add DL QAM-256 support<br><br>Due to the integration of DL-QAM256 another table for DL max rates is needed.<br>Therefore, I added the parameter 'qam256' to the feature list in the resource.cfg.<br><br>The patch also enables the correct UE settings in the config file.<br><br>Change-Id: I2d34395449cdcfb31db66ea887d9adbee551e757<br>---<br>M src/osmo_gsm_tester/core/schema.py<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M src/osmo_gsm_tester/templates/srsue.conf.tmpl<br>4 files changed, 26 insertions(+), 8 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/97/21097/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py</span><br><span>index 72c2738..816f439 100644</span><br><span>--- a/src/osmo_gsm_tester/core/schema.py</span><br><span>+++ b/src/osmo_gsm_tester/core/schema.py</span><br><span>@@ -111,7 +111,7 @@</span><br><span> raise ValueError('Unknown Cipher value: %r' % val)</span><br><span> </span><br><span> def modem_feature(val):</span><br><span style="color: hsl(0, 100%, 40%);">- if val in ('sms', 'gprs', 'voice', 'ussd', 'sim', '2g', '3g', '4g'):</span><br><span style="color: hsl(120, 100%, 40%);">+ if val in ('sms', 'gprs', 'voice', 'ussd', 'sim', '2g', '3g', '4g', 'dl_qam256'):</span><br><span> return True</span><br><span> raise ValueError('Unknown Modem Feature: %r' % val)</span><br><span> </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 93168bf..8319ba4 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>@@ -269,19 +269,30 @@</span><br><span> return rfemu_obj</span><br><span> </span><br><span> def ue_max_rate(self, downlink=True, num_carriers=1):</span><br><span style="color: hsl(0, 100%, 40%);">- # The max rate for a single UE per PRB configuration in TM1 with MCS 28 QAM64</span><br><span style="color: hsl(0, 100%, 40%);">- max_phy_rate_tm1_dl = { 6 : 3.5e6,</span><br><span style="color: hsl(0, 100%, 40%);">- 15 : 11e6,</span><br><span style="color: hsl(0, 100%, 40%);">- 25 : 18e6,</span><br><span style="color: hsl(0, 100%, 40%);">- 50 : 36e6,</span><br><span style="color: hsl(0, 100%, 40%);">- 75 : 55e6,</span><br><span style="color: hsl(0, 100%, 40%);">- 100 : 75e6 }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # The max rate for a single UE per PRB configuration in TM1 with MCS 28</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'dl_qam256' in self.ue.features():</span><br><span style="color: hsl(120, 100%, 40%);">+ max_phy_rate_tm1_dl = {6: 5.9e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 15: 14.6e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 25: 24.5e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 50: 48.9e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 75: 75.3e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 100: 97.8e6}</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ max_phy_rate_tm1_dl = {6: 3.5e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 15: 11e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 25: 18e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 50: 36e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 75: 55e6,</span><br><span style="color: hsl(120, 100%, 40%);">+ 100: 75e6}</span><br><span> max_phy_rate_tm1_ul = { 6 : 1.7e6,</span><br><span> 15 : 4.7e6,</span><br><span> 25 : 10e6,</span><br><span> 50 : 23e6,</span><br><span> 75 : 34e6,</span><br><span> 100 : 51e6 }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if downlink:</span><br><span> max_rate = max_phy_rate_tm1_dl[self.num_prb()]</span><br><span> else:</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index a3505c8..610d3e6 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -128,6 +128,9 @@</span><br><span> # Collect KPIs for each TC</span><br><span> self.testenv.test().set_kpis(self.get_kpis())</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def features(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._conf.get('features', [])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def scp_back_metrics(self, raiseException=True):</span><br><span> ''' Copy back metrics only if they have not been copied back yet '''</span><br><span> if not self.have_metrics_file:</span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>index 284922b..31642cd 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>@@ -150,6 +150,10 @@</span><br><span> % if int(ue.num_carriers) > 1:</span><br><span> ue_category = 7</span><br><span> release = 10</span><br><span style="color: hsl(120, 100%, 40%);">+% elif "dl_qam256" in ue.features:</span><br><span style="color: hsl(120, 100%, 40%);">+ue_category = 7</span><br><span style="color: hsl(120, 100%, 40%);">+release = 13</span><br><span style="color: hsl(120, 100%, 40%);">+ue_category_dl = 14</span><br><span> % else:</span><br><span> #ue_category = 4</span><br><span> #release = 8</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21097">change 21097</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/+/21097"/><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: I2d34395449cdcfb31db66ea887d9adbee551e757 </div>
<div style="display:none"> Gerrit-Change-Number: 21097 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>