<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17900">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srsue, amarisoft/srsENB: Support setting rx/tx_gain attributes<br><br>Change-Id: I4228ba8746a54db4c17443718c01069d431361b9<br>---<br>M src/osmo_gsm_tester/obj/enb_amarisoft.py<br>M src/osmo_gsm_tester/obj/ms_amarisoft.py<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl<br>M src/osmo_gsm_tester/templates/srsenb.conf.tmpl<br>M src/osmo_gsm_tester/templates/srsue.conf.tmpl<br>M sysmocom/defaults.conf<br>7 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/00/17900/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>index 0b748e0..bb48880 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>@@ -209,7 +209,10 @@</span><br><span> # rf driver is shared between amarisoft enb and ue, so it has a</span><br><span> # different cfg namespace 'trx'. Copy needed values over there:</span><br><span> config.overlay(values, dict(trx=dict(rf_dev_type=values['enb'].get('rf_dev_type', None),</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args=values['enb'].get('rf_dev_args', None))))</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args=values['enb'].get('rf_dev_args', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gain=values['enb'].get('rx_gain', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_gain=values['enb'].get('tx_gain', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ )))</span><br><span> </span><br><span> self.gen_conf = values</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>index 1b49b30..6fd80ee 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>@@ -274,7 +274,10 @@</span><br><span> # rf driver is shared between amarisoft enb and ue, so it has a</span><br><span> # different cfg namespace 'trx'. Copy needed values over there:</span><br><span> config.overlay(values, dict(trx=dict(rf_dev_type=values['ue'].get('rf_dev_type', None),</span><br><span style="color: hsl(0, 100%, 40%);">- rf_dev_args=values['ue'].get('rf_dev_args', None))))</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args=values['ue'].get('rf_dev_args', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gain=values['ue'].get('rx_gain', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_gain=values['ue'].get('tx_gain', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ )))</span><br><span> </span><br><span> self.gen_conf_file(self.config_file, AmarisoftUE.CFGFILE, values)</span><br><span> self.gen_conf_file(self.config_rf_file, AmarisoftUE.CFGFILE_RF, values)</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index cafdab8..ded8568 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -92,6 +92,8 @@</span><br><span> 'enb[].id': schema.UINT,</span><br><span> 'enb[].num_prb': schema.UINT,</span><br><span> 'enb[].transmission_mode': schema.LTE_TRANSMISSION_MODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'enb[].tx_gain': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'enb[].rx_gain': schema.UINT,</span><br><span> 'enb[].rf_dev_type': schema.STR,</span><br><span> 'enb[].rf_dev_args': schema.STR,</span><br><span> 'enb[].additional_args': schema.STR,</span><br><span>@@ -134,6 +136,8 @@</span><br><span> 'modem[].additional_args': schema.STR,</span><br><span> 'modem[].airplane_t_on_ms': schema.INT,</span><br><span> 'modem[].airplane_t_off_ms': schema.INT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem[].tx_gain': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'modem[].rx_gain': 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/templates/amarisoft_rf_driver.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>index 874feca..cd08835 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>@@ -10,8 +10,8 @@</span><br><span> % endif</span><br><span> },</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-tx_gain: 89.0, /* TX gain (in dB) B2x0: 0 to 89.8 dB */</span><br><span style="color: hsl(0, 100%, 40%);">-rx_gain: 60.0, /* RX gain (in dB) B2x0: 0 to 73 dB */</span><br><span style="color: hsl(120, 100%, 40%);">+tx_gain: ${trx.tx_gain}, /* TX gain (in dB) B2x0: 0 to 89.8 dB */</span><br><span style="color: hsl(120, 100%, 40%);">+rx_gain: ${trx.rx_gain}, /* RX gain (in dB) B2x0: 0 to 73 dB */</span><br><span> % if trx.rf_dev_type == 'zmq':</span><br><span> tx_time_offset: 0,</span><br><span> % else:</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 5f7b3ea..4214b5d 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>@@ -63,8 +63,8 @@</span><br><span> # Default "auto". B210 USRP: 400 us, bladeRF: 0 us.</span><br><span> #####################################################################</span><br><span> [rf]</span><br><span style="color: hsl(0, 100%, 40%);">-tx_gain = 80</span><br><span style="color: hsl(0, 100%, 40%);">-rx_gain = 40</span><br><span style="color: hsl(120, 100%, 40%);">+tx_gain = ${enb.tx_gain}</span><br><span style="color: hsl(120, 100%, 40%);">+rx_gain = ${enb.rx_gain}</span><br><span> </span><br><span> device_name = ${enb.rf_dev_type}</span><br><span> </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 37175dd..a600f5e 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,8 +37,8 @@</span><br><span> dl_earfcn = 2850</span><br><span> % endif</span><br><span> freq_offset = 0</span><br><span style="color: hsl(0, 100%, 40%);">-tx_gain = 80</span><br><span style="color: hsl(0, 100%, 40%);">-#rx_gain = 40</span><br><span style="color: hsl(120, 100%, 40%);">+tx_gain = ${ue.tx_gain}</span><br><span style="color: hsl(120, 100%, 40%);">+rx_gain = ${ue.rx_gain}</span><br><span> </span><br><span> #nof_radios = 1</span><br><span> nof_antennas = ${ue.num_antennas}</span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index aea2791..f7820c0 100644</span><br><span>--- a/sysmocom/defaults.conf</span><br><span>+++ b/sysmocom/defaults.conf</span><br><span>@@ -135,16 +135,22 @@</span><br><span> srsenb:</span><br><span> num_prb: 100</span><br><span> enable_pcap: false</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_gain: 80</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gain: 40</span><br><span> </span><br><span> amarisoftenb:</span><br><span> num_prb: 100</span><br><span> enable_pcap: false</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_gain: 89</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gain: 60</span><br><span> </span><br><span> srsue:</span><br><span> enable_pcap: false</span><br><span> airplane_t_on_ms: -1</span><br><span> airplane_t_off_ms: -1</span><br><span> num_carriers: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_gain: 80</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_gain: 40</span><br><span> </span><br><span> iperf3cli:</span><br><span> time: 60</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17900">change 17900</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/+/17900"/><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: I4228ba8746a54db4c17443718c01069d431361b9 </div>
<div style="display:none"> Gerrit-Change-Number: 17900 </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>