<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17753">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;">srs/amarisoft{ue,enb}: Fix b200 specific rf_dev_args<br><br>Commit 12ae6d79a5b53a213f619999ef0230c1dae88bb7 switched the rf_dev_type<br>to be in lowercase but forgot to change these conditions.<br><br>Change-Id: I91d3877381b4e6343dc4aa0465e699341ed6648d<br>---<br>M doc/manuals/chapters/config.adoc<br>M doc/manuals/chapters/config_mangling.adoc<br>M src/osmo_gsm_tester/amarisoft_enb.py<br>M src/osmo_gsm_tester/srs_enb.py<br>M src/osmo_gsm_tester/srs_ue.py<br>5 files changed, 8 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/config.adoc b/doc/manuals/chapters/config.adoc</span><br><span>index e70b396..4dd90ff 100644</span><br><span>--- a/doc/manuals/chapters/config.adoc</span><br><span>+++ b/doc/manuals/chapters/config.adoc</span><br><span>@@ -416,14 +416,15 @@</span><br><span> - num_prb: ${param2}</span><br><span> ----</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-Finally, it can be referenced during {app-name} execution this wya, for instance when running a suite named '4g':</span><br><span style="color: hsl(120, 100%, 40%);">+Finally, it can be referenced during {app-name} execution this way, for instance</span><br><span style="color: hsl(120, 100%, 40%);">+when running a suite named '4g':</span><br><span> ----</span><br><span style="color: hsl(0, 100%, 40%);">-- 4g:my-parametrized-scenario@UHD,6</span><br><span style="color: hsl(120, 100%, 40%);">+- 4g:my-parametrized-scenario@uhd,6</span><br><span> ----</span><br><span> This way {app-name} when parsing the scenarios and combining them with the suite will::</span><br><span> . Find out it is parametrized (name contains '@').</span><br><span> . Split the name</span><br><span style="color: hsl(0, 100%, 40%);">- ('my-parametrized-scenario') from the parameter list (param1='UHD', param2='6')</span><br><span style="color: hsl(120, 100%, 40%);">+ ('my-parametrized-scenario') from the parameter list (param1='uhd', param2='6')</span><br><span> . Attempt to match a '.conf' file fully matching name and parameters (hence</span><br><span> specific content can be set for specific values while still using parameters</span><br><span> for general values), and otherwise match only by name.</span><br><span>diff --git a/doc/manuals/chapters/config_mangling.adoc b/doc/manuals/chapters/config_mangling.adoc</span><br><span>index 310b15f..e579732 100644</span><br><span>--- a/doc/manuals/chapters/config_mangling.adoc</span><br><span>+++ b/doc/manuals/chapters/config_mangling.adoc</span><br><span>@@ -188,7 +188,7 @@</span><br><span> </span><br><span> - label: srsENB-B200</span><br><span> type: srsenb</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_type: UHD</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_type: uhd</span><br><span> rf_dev_args: "type=b200,serial=317B9FE"</span><br><span> remote_user: jenkins</span><br><span> addr: 10.12.1.206</span><br><span>diff --git a/src/osmo_gsm_tester/amarisoft_enb.py b/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>index df8e0db..c92bf50 100644</span><br><span>--- a/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>+++ b/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>@@ -185,7 +185,7 @@</span><br><span> rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span> # Set UHD frame size as a function of the cell bandwidth on B2XX</span><br><span style="color: hsl(0, 100%, 40%);">- if self._conf.get('rf_dev_type') == 'UHD' and values['enb'].get('rf_dev_args', None) is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._conf.get('rf_dev_type') == 'uhd' and values['enb'].get('rf_dev_args', None) is not None:</span><br><span> if 'b200' in values['enb'].get('rf_dev_args'):</span><br><span> rf_dev_args = values['enb'].get('rf_dev_args', '')</span><br><span> rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span>diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py</span><br><span>index fe0e550..372848d 100644</span><br><span>--- a/src/osmo_gsm_tester/srs_enb.py</span><br><span>+++ b/src/osmo_gsm_tester/srs_enb.py</span><br><span>@@ -214,7 +214,7 @@</span><br><span> config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span> # Set UHD frame size as a function of the cell bandwidth on B2XX</span><br><span style="color: hsl(0, 100%, 40%);">- if self._conf.get('rf_dev_type') == 'UHD' and values['enb'].get('rf_dev_args', None) is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._conf.get('rf_dev_type') == 'uhd' and values['enb'].get('rf_dev_args', None) is not None:</span><br><span> if 'b200' in values['enb'].get('rf_dev_args'):</span><br><span> rf_dev_args = values['enb'].get('rf_dev_args', '')</span><br><span> rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span>diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py</span><br><span>index 00f729f..119a477 100644</span><br><span>--- a/src/osmo_gsm_tester/srs_ue.py</span><br><span>+++ b/src/osmo_gsm_tester/srs_ue.py</span><br><span>@@ -242,7 +242,7 @@</span><br><span> )))</span><br><span> </span><br><span> # Set UHD frame size as a function of the cell bandwidth on B2XX</span><br><span style="color: hsl(0, 100%, 40%);">- if self._conf.get('rf_dev_type') == 'UHD' and values['ue'].get('rf_dev_args', None) is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._conf.get('rf_dev_type') == 'uhd' and values['ue'].get('rf_dev_args', None) is not None:</span><br><span> if 'b200' in values['ue'].get('rf_dev_args'):</span><br><span> rf_dev_args = values['ue'].get('rf_dev_args', '')</span><br><span> rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17753">change 17753</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/+/17753"/><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: I91d3877381b4e6343dc4aa0465e699341ed6648d </div>
<div style="display:none"> Gerrit-Change-Number: 17753 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>