<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11285">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: Add support for osmo-trx-lms<br><br>Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7<br>---<br>M contrib/jenkins-build-osmo-trx.sh<br>M example/resources.conf.prod<br>A example/scenarios/trx-lms.conf<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>4 files changed, 57 insertions(+), 2 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/85/11285/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins-build-osmo-trx.sh b/contrib/jenkins-build-osmo-trx.sh</span><br><span>index 67fca35..f15a9e0 100755</span><br><span>--- a/contrib/jenkins-build-osmo-trx.sh</span><br><span>+++ b/contrib/jenkins-build-osmo-trx.sh</span><br><span>@@ -4,8 +4,34 @@</span><br><span> name="osmo-trx"</span><br><span> . "$(dirname "$0")/jenkins-build-common.sh"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+build_repo_limesuite() {</span><br><span style="color: hsl(120, 100%, 40%);">+set +x; echo "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+====================== $dep</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+"; set -x</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+prev_git_url="${git_url}"</span><br><span style="color: hsl(120, 100%, 40%);">+git_url="https://github.com/myriadrf/"</span><br><span style="color: hsl(120, 100%, 40%);">+have_repo "LimeSuite" "master"</span><br><span style="color: hsl(120, 100%, 40%);">+git_url="${prev_git_url}"</span><br><span style="color: hsl(120, 100%, 40%);">+cd "LimeSuite"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+set +x; echo; echo; set -x</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir -p builddir && cd builddir</span><br><span style="color: hsl(120, 100%, 40%);">+set +x; echo; echo; set -x</span><br><span style="color: hsl(120, 100%, 40%);">+cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix ../</span><br><span style="color: hsl(120, 100%, 40%);">+set +x; echo; echo; set -x</span><br><span style="color: hsl(120, 100%, 40%);">+make -j5</span><br><span style="color: hsl(120, 100%, 40%);">+set +x; echo; echo; set -x</span><br><span style="color: hsl(120, 100%, 40%);">+make install</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# We want to use LimSuite installed by debian repos</span><br><span style="color: hsl(120, 100%, 40%);">+# build_repo_limesuite</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # AddressSanitizer is not enabled on purpose since overhead affects the clocking.</span><br><span> build_repo libosmocore --disable-doxygen</span><br><span style="color: hsl(0, 100%, 40%);">-build_repo osmo-trx --without-sse --with-uhd</span><br><span style="color: hsl(120, 100%, 40%);">+build_repo osmo-trx --without-sse --with-uhd --with-lms</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-create_bin_tgz osmo-trx-uhd</span><br><span style="color: hsl(120, 100%, 40%);">+create_bin_tgz "osmo-trx-uhd osmo-trx-lms"</span><br><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index e69726a..22134e7 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -26,12 +26,26 @@</span><br><span> band: GSM-1800</span><br><span> ciphers: [a5_0, a5_1]</span><br><span> osmo_trx:</span><br><span style="color: hsl(120, 100%, 40%);">+ type: uhd</span><br><span> launch_trx: true</span><br><span> remote_user: jenkins</span><br><span> trx_ip: 10.42.42.116</span><br><span> clock_reference: external</span><br><span> multi_arfcn: true</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+- label: LimeSDR-USB</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-bts-trx</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_unit_id: 11</span><br><span style="color: hsl(120, 100%, 40%);">+ addr: 10.42.42.53</span><br><span style="color: hsl(120, 100%, 40%);">+ band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_trx:</span><br><span style="color: hsl(120, 100%, 40%);">+ type: lms</span><br><span style="color: hsl(120, 100%, 40%);">+ launch_trx: true</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_user: jenkins</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_ip: 10.42.42.117</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_reference: external</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> - label: sysmoCell 5000</span><br><span> type: osmo-bts-trx</span><br><span> ipa_unit_id: 7</span><br><span>diff --git a/example/scenarios/trx-lms.conf b/example/scenarios/trx-lms.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..15802db</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/trx-lms.conf</span><br><span>@@ -0,0 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+resources:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts:</span><br><span style="color: hsl(120, 100%, 40%);">+ - label: LimeSDR-USB</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-bts-trx</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>index 79c541d..92b726c 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>@@ -165,6 +165,7 @@</span><br><span> def get_instance_by_type(cls, type, suite_run, conf):</span><br><span> KNOWN_OSMOTRX_TYPES = {</span><br><span> 'uhd': OsmoTrxUHD,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'lms': OsmoTrxLMS,</span><br><span> }</span><br><span> osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type)</span><br><span> return osmo_trx_class(suite_run, conf)</span><br><span>@@ -281,4 +282,14 @@</span><br><span> def binary_name(self):</span><br><span> return OsmoTrxUHD.BIN_TRX</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+class OsmoTrxLMS(OsmoTrx):</span><br><span style="color: hsl(120, 100%, 40%);">+ BIN_TRX = 'osmo-trx-lms'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.conf['osmo_trx']['channels'][0]['rx_path'] = 'LNAW'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def binary_name(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return OsmoTrxLMS.BIN_TRX</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11285">change 11285</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/11285"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7 </div>
<div style="display:none"> Gerrit-Change-Number: 11285 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>