<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17286">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srs_enb: Make num_prb a config parameter<br><br>Change-Id: I336e71f53556596050cf3eb55a7810a009dbf7a8<br>---<br>M example/defaults.conf<br>M src/osmo_gsm_tester/srs_enb.py<br>M src/osmo_gsm_tester/templates/srsenb.conf.tmpl<br>3 files changed, 12 insertions(+), 9 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/86/17286/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/defaults.conf b/example/defaults.conf</span><br><span>index f32e1f5..0bff86a 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -100,3 +100,4 @@</span><br><span> srsenb:</span><br><span>   mcc: 901</span><br><span>   mnc: 70</span><br><span style="color: hsl(120, 100%, 40%);">+  num_prb: 100</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 6fb186f..85180e4 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>@@ -57,11 +57,6 @@</span><br><span>         self.remote_config_drb_file = None</span><br><span>         self.remote_log_file = None</span><br><span>         self.suite_run = suite_run</span><br><span style="color: hsl(0, 100%, 40%);">-        self.nof_prb=100</span><br><span style="color: hsl(0, 100%, 40%);">-        if self.nof_prb == 75:</span><br><span style="color: hsl(0, 100%, 40%);">-          self.base_srate=15.36e6</span><br><span style="color: hsl(0, 100%, 40%);">-        else:</span><br><span style="color: hsl(0, 100%, 40%);">-          self.base_srate=23.04e6</span><br><span>         self.remote_user = conf.get('remote_user', None)</span><br><span>         if not rf_type_valid(conf.get('rf_dev_type', None)):</span><br><span>             raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))</span><br><span>@@ -125,7 +120,6 @@</span><br><span>                 '--enb_files.drb_config=' + self.remote_config_drb_file,</span><br><span>                 '--expert.nof_phy_threads=1',</span><br><span>                 '--expert.rrc_inactivity_timer=1500',</span><br><span style="color: hsl(0, 100%, 40%);">-                '--enb.n_prb=' + str(self.nof_prb),</span><br><span>                 '--log.filename=' + self.remote_log_file)</span><br><span> </span><br><span>         self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsENB.BINFILE, util.Dir(srsENB.REMOTE_DIR), args, remote_env=remote_env)</span><br><span>@@ -151,7 +145,6 @@</span><br><span>                 '--enb_files.drb_config=' + os.path.abspath(self.config_drb_file),</span><br><span>                 '--expert.nof_phy_threads=1',</span><br><span>                 '--expert.rrc_inactivity_timer=1500',</span><br><span style="color: hsl(0, 100%, 40%);">-                '--enb.n_prb=' + str(self.nof_prb),</span><br><span>                 '--log.filename=' + self.log_file)</span><br><span> </span><br><span>         self.process = process.Process(self.name(), self.run_dir, args, env=env)</span><br><span>@@ -168,7 +161,16 @@</span><br><span> </span><br><span>         # We need to set some specific variables programatically here to match IP addresses:</span><br><span>         if self._conf.get('rf_dev_type') == 'zmq':</span><br><span style="color: hsl(0, 100%, 40%);">-            config.overlay(values, dict(enb=dict(rf_dev_args='fail_on_disconnect=true,tx_port=tcp://'+ self.addr() +':2000,rx_port=tcp://'+ self.ue.addr() +':2001,id=enb,base_srate='+ str(self.base_srate))))</span><br><span style="color: hsl(120, 100%, 40%);">+            num_prb = values['enb'].get('num_prb', None)</span><br><span style="color: hsl(120, 100%, 40%);">+            assert num_prb</span><br><span style="color: hsl(120, 100%, 40%);">+            if num_prb == 75:</span><br><span style="color: hsl(120, 100%, 40%);">+              base_srate=15.36e6</span><br><span style="color: hsl(120, 100%, 40%);">+            else:</span><br><span style="color: hsl(120, 100%, 40%);">+              base_srate=23.04e6</span><br><span style="color: hsl(120, 100%, 40%);">+            rf_dev_args = 'fail_on_disconnect=true,tx_port=tcp://' + self.addr() \</span><br><span style="color: hsl(120, 100%, 40%);">+                        + ':2000,rx_port=tcp://'+ self.ue.addr() \</span><br><span style="color: hsl(120, 100%, 40%);">+                        + ':2001,id=enb,base_srate='+ str(base_srate)</span><br><span style="color: hsl(120, 100%, 40%);">+            config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span>         self.dbg('srsENB ' + filename + ':\n' + pprint.pformat(values))</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>index 2006832..f040156 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>@@ -28,7 +28,7 @@</span><br><span> mme_addr = ${enb.mme_addr}</span><br><span> gtp_bind_addr = ${enb.addr}</span><br><span> s1c_bind_addr = ${enb.addr}</span><br><span style="color: hsl(0, 100%, 40%);">-n_prb = 50</span><br><span style="color: hsl(120, 100%, 40%);">+n_prb = ${enb.num_prb}</span><br><span> #tm = 4</span><br><span> #nof_ports = 2</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17286">change 17286</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/+/17286"/><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: I336e71f53556596050cf3eb55a7810a009dbf7a8 </div>
<div style="display:none"> Gerrit-Change-Number: 17286 </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-MessageType: newchange </div>