Change in osmo-gsm-tester[master]: osmo-bts-trx: Add support for osmo-trx-lms

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11285 )

Change subject: osmo-bts-trx: Add support for osmo-trx-lms
......................................................................

osmo-bts-trx: Add support for osmo-trx-lms

Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7
---
M contrib/jenkins-build-osmo-trx.sh
M example/resources.conf.prod
A example/scenarios/trx-lms.conf
M src/osmo_gsm_tester/bts_osmotrx.py
4 files changed, 57 insertions(+), 2 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins-build-osmo-trx.sh b/contrib/jenkins-build-osmo-trx.sh
index 67fca35..f15a9e0 100755
--- a/contrib/jenkins-build-osmo-trx.sh
+++ b/contrib/jenkins-build-osmo-trx.sh
@@ -4,8 +4,34 @@
 name="osmo-trx"
 . "$(dirname "$0")/jenkins-build-common.sh"
 
+build_repo_limesuite() {
+set +x; echo "
+
+====================== $dep
+
+"; set -x
+
+prev_git_url="${git_url}"
+git_url="https://github.com/myriadrf/"
+have_repo "LimeSuite" "master"
+git_url="${prev_git_url}"
+cd "LimeSuite"
+
+set +x; echo; echo; set -x
+mkdir -p builddir && cd builddir
+set +x; echo; echo; set -x
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix ../
+set +x; echo; echo; set -x
+make -j5
+set +x; echo; echo; set -x
+make install
+}
+
+# We want to use LimSuite installed by debian repos
+# build_repo_limesuite
+
 # AddressSanitizer is not enabled on purpose since overhead affects the clocking.
 build_repo libosmocore --disable-doxygen
-build_repo osmo-trx --without-sse --with-uhd
+build_repo osmo-trx --without-sse --with-uhd --with-lms
 
-create_bin_tgz osmo-trx-uhd
+create_bin_tgz "osmo-trx-uhd osmo-trx-lms"
diff --git a/example/resources.conf.prod b/example/resources.conf.prod
index e69726a..22134e7 100644
--- a/example/resources.conf.prod
+++ b/example/resources.conf.prod
@@ -26,12 +26,26 @@
   band: GSM-1800
   ciphers: [a5_0, a5_1]
   osmo_trx:
+    type: uhd
     launch_trx: true
     remote_user: jenkins
     trx_ip: 10.42.42.116
     clock_reference: external
     multi_arfcn: true
 
+- label: LimeSDR-USB
+  type: osmo-bts-trx
+  ipa_unit_id: 11
+  addr: 10.42.42.53
+  band: GSM-1800
+  ciphers: [a5_0, a5_1]
+  osmo_trx:
+    type: lms
+    launch_trx: true
+    remote_user: jenkins
+    trx_ip: 10.42.42.117
+    clock_reference: external
+
 - label: sysmoCell 5000
   type: osmo-bts-trx
   ipa_unit_id: 7
diff --git a/example/scenarios/trx-lms.conf b/example/scenarios/trx-lms.conf
new file mode 100644
index 0000000..15802db
--- /dev/null
+++ b/example/scenarios/trx-lms.conf
@@ -0,0 +1,4 @@
+resources:
+  bts:
+  - label: LimeSDR-USB
+    type: osmo-bts-trx
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index 79c541d..92b726c 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -165,6 +165,7 @@
     def get_instance_by_type(cls, type, suite_run, conf):
         KNOWN_OSMOTRX_TYPES = {
             'uhd': OsmoTrxUHD,
+            'lms': OsmoTrxLMS,
         }
         osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type)
         return osmo_trx_class(suite_run, conf)
@@ -281,4 +282,14 @@
     def binary_name(self):
         return OsmoTrxUHD.BIN_TRX
 
+class OsmoTrxLMS(OsmoTrx):
+    BIN_TRX = 'osmo-trx-lms'
+
+    def __init__(self, suite_run, conf):
+        super().__init__(suite_run, conf)
+        self.conf['osmo_trx']['channels'][0]['rx_path'] = 'LNAW'
+
+    def binary_name(self):
+        return OsmoTrxLMS.BIN_TRX
+
 # vim: expandtab tabstop=4 shiftwidth=4

-- 
To view, visit https://gerrit.osmocom.org/11285
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I44db0fe4592109ecb665e1880806d90379da64f7
Gerrit-Change-Number: 11285
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181010/73db8de9/attachment.htm>