<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17650">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;">srs_{ue,enb}: change UHD stream args and buffer size as function of cell width for B2XX<br><br>Change-Id: I2de0526ee9bd2f7bb75c7d529b3f52d75117c5cc<br>---<br>M example/resources.conf.prod<br>M src/osmo_gsm_tester/srs_enb.py<br>M src/osmo_gsm_tester/srs_ue.py<br>3 files changed, 39 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index cbcaafd..438184d 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -165,7 +165,7 @@</span><br><span> - label: srsENB-B200</span><br><span> type: srsenb</span><br><span> rf_dev_type: UHD</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args: "type=b200,serial=306BD11,recv_frame_size=9232,send_frame_size=9232"</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args: "type=b200,serial=306BD11"</span><br><span> remote_user: jenkins</span><br><span> addr: 10.42.42.117</span><br><span> </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 91881c0..15c1e0c 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>@@ -208,6 +208,25 @@</span><br><span> + ',id=enb,base_srate=' + str(base_srate)</span><br><span> config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Set UHD frame size as a function of the cell bandwidth on B2XX</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 style="color: hsl(120, 100%, 40%);">+ if 'b200' in values['enb'].get('rf_dev_args'):</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args = values['enb'].get('rf_dev_args', '')</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb < 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._num_prb == 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self._num_prb > 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'num_recv_frames=64,num_send_frames=64'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._num_prb > 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Reduce over the wire format to sc12</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',otw_format=sc12'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.config_file = self.run_dir.child(srsENB.CFGFILE)</span><br><span> self.config_sib_file = self.run_dir.child(srsENB.CFGFILE_SIB)</span><br><span> self.config_rr_file = self.run_dir.child(srsENB.CFGFILE_RR)</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 398fea7..190fd86 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>@@ -236,6 +236,25 @@</span><br><span> + ',id=ue,base_srate='+ str(base_srate)</span><br><span> )))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Set UHD frame size as a function of the cell bandwidth on B2XX</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 style="color: hsl(120, 100%, 40%);">+ if 'b200' in values['ue'].get('rf_dev_args'):</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args = values['ue'].get('rf_dev_args', '')</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_prb() < 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.enb.num_prb() == 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.enb.num_prb() > 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'num_recv_frames=64,num_send_frames=64'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # For 15 and 20 MHz, further reduce over the wire format to sc12</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_prb() >= 75:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',otw_format=sc12'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(rf_dev_args=rf_dev_args)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.dbg('SRSUE CONFIG:\n' + pprint.pformat(values))</span><br><span> </span><br><span> with open(self.config_file, 'w') as f:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17650">change 17650</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/+/17650"/><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: I2de0526ee9bd2f7bb75c7d529b3f52d75117c5cc </div>
<div style="display:none"> Gerrit-Change-Number: 17650 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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-MessageType: merged </div>