<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17438">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srsue,srsenb: Configure num_ports for tmode > 1<br><br>Change-Id: I35d8ee907738845e729f58c23f377a42bb665672<br>---<br>M example/defaults.conf<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/srs_enb.py<br>M src/osmo_gsm_tester/srs_ue.py<br>M src/osmo_gsm_tester/templates/srsenb.conf.tmpl<br>M src/osmo_gsm_tester/templates/srsue.conf.tmpl<br>6 files changed, 24 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/38/17438/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 9b92ad0..aa61bca 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -103,3 +103,6 @@</span><br><span> mnc: 70</span><br><span> num_prb: 100</span><br><span> transmission_mode: 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+srsue:</span><br><span style="color: hsl(120, 100%, 40%);">+ num_rx_ant: 1</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 07d32e2..05d54e9 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -107,6 +107,7 @@</span><br><span> 'modem[].features[]': schema.MODEM_FEATURE,</span><br><span> 'modem[].rf_dev_type': schema.STR,</span><br><span> 'modem[].rf_dev_args': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem[].num_rx_ant': schema.UINT,</span><br><span> 'osmocon_phone[].serial_device': schema.STR,</span><br><span> }</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 1fb2db1..716217e 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>@@ -184,13 +184,17 @@</span><br><span> assert self._num_prb</span><br><span> self._txmode = int(values['enb'].get('transmission_mode', None))</span><br><span> assert self._txmode</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(enb={ 'num_ports': self.num_ports() }))</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> base_srate = num_prb2base_srate(self._num_prb)</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args = 'fail_on_disconnect=true,tx_port=tcp://' + self.addr() \</span><br><span style="color: hsl(0, 100%, 40%);">- + ':2000,rx_port=tcp://' + self.ue.addr() \</span><br><span style="color: hsl(0, 100%, 40%);">- + ':2001,id=enb,base_srate=' + str(base_srate)</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args = 'fail_on_disconnect=true' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_port=tcp://' + self.addr() + ':2000' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_port2=tcp://' + self.addr() + ':2002' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port=tcp://' + self.ue.addr() + ':2001' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port2=tcp://' + self.ue.addr() + ':2003' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',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> self.dbg('srsENB ' + filename + ':\n' + pprint.pformat(values))</span><br><span>@@ -226,6 +230,11 @@</span><br><span> def num_prb(self):</span><br><span> return self._num_prb</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def num_ports(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._txmode == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1</span><br><span style="color: hsl(120, 100%, 40%);">+ return 2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def ue_max_rate(self, downlink=True):</span><br><span> # The max rate for a single UE per PRB in TM1</span><br><span> max_phy_rate_tm1_dl = { 6 : 2.3e6,</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 2cb05a2..a453bc7 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>@@ -213,9 +213,12 @@</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> base_srate = num_prb2base_srate(self.enb.num_prb())</span><br><span style="color: hsl(0, 100%, 40%);">- config.overlay(values, dict(ue=dict(rf_dev_args='tx_port=tcp://' + self.addr()</span><br><span style="color: hsl(0, 100%, 40%);">- +':2001,rx_port=tcp://' + self.enb.addr()</span><br><span style="color: hsl(0, 100%, 40%);">- +':2000,id=ue,base_srate='+ str(base_srate)</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(rf_dev_args = 'tx_port=tcp://' + self.addr() + ':2001' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_port2=tcp://' + self.addr() + ':2003' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port=tcp://' + self.enb.addr() + ':2000' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port2=tcp://' + self.enb.addr() + ':2002' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',id=ue,base_srate='+ str(base_srate),</span><br><span style="color: hsl(120, 100%, 40%);">+ num_rx_ant = self.enb.num_ports()</span><br><span> )))</span><br><span> </span><br><span> self.dbg('SRSUE CONFIG:\n' + pprint.pformat(values))</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 7775947..dccade5 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>@@ -27,7 +27,7 @@</span><br><span> s1c_bind_addr = ${enb.addr}</span><br><span> n_prb = ${enb.num_prb}</span><br><span> tm = ${enb.transmission_mode}</span><br><span style="color: hsl(0, 100%, 40%);">-#nof_ports = 2</span><br><span style="color: hsl(120, 100%, 40%);">+nof_ports = ${enb.num_ports}</span><br><span> </span><br><span> #####################################################################</span><br><span> # eNB configuration files</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 627f592..0a4b426 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>@@ -37,7 +37,7 @@</span><br><span> #rx_gain = 40</span><br><span> </span><br><span> #nof_radios = 1</span><br><span style="color: hsl(0, 100%, 40%);">-#nof_rx_ant = 1</span><br><span style="color: hsl(120, 100%, 40%);">+nof_rx_ant = ${ue.num_rx_ant}</span><br><span> </span><br><span> device_name = ${ue.rf_dev_type}</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17438">change 17438</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/+/17438"/><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: I35d8ee907738845e729f58c23f377a42bb665672 </div>
<div style="display:none"> Gerrit-Change-Number: 17438 </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>