Change in osmo-gsm-tester[master]: amarisoft_ue: fix UHD support

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17752 )

Change subject: amarisoft_ue: fix UHD support
......................................................................

amarisoft_ue: fix UHD support

the Amarisoft UE seems to be only working with UHD when the bandwidth
param is provided. It seems the set_bandwidth() API is used.

Change-Id: I3f20a5a8ca80c63374f0ad500fd2794e2dc45479
---
M src/osmo_gsm_tester/amarisoft_ue.py
M src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
2 files changed, 23 insertions(+), 1 deletion(-)

Approvals:
  pespin: Looks good to me, approved; Verified



diff --git a/src/osmo_gsm_tester/amarisoft_ue.py b/src/osmo_gsm_tester/amarisoft_ue.py
index 31e814e..9bfc182 100644
--- a/src/osmo_gsm_tester/amarisoft_ue.py
+++ b/src/osmo_gsm_tester/amarisoft_ue.py
@@ -47,6 +47,21 @@
 def num_prb2base_srate(num_prb):
     return num_prb2symbol_sz(num_prb) * 15 * 1000
 
+def num_prb2bandwidth(num_prb):
+    if num_prb <= 6:
+        return 1.4
+    if num_prb <= 15:
+        return 3
+    if num_prb <= 25:
+        return 5
+    if num_prb <= 50:
+        return 10
+    if num_prb <= 75:
+        return 15
+    if num_prb <= 110:
+        return 20
+    raise log.Error('invalid num_prb %r', num_prb)
+
 class AmarisoftUE(MS):
 
     REMOTE_DIR = '/osmo-gsm-tester-amarisoftue'
@@ -210,8 +225,13 @@
             config.overlay(values, dict(ue=dict(sample_rate = base_srate / (1000*1000),
                                                 rf_dev_args = rf_dev_args)))
 
+        # The UHD rf driver seems to require the bandwidth configuration
+        if self._conf.get('rf_dev_type') == 'uhd':
+            bandwidth = num_prb2bandwidth(self.enb.num_prb())
+            config.overlay(values, dict(ue=dict(bandwidth = bandwidth)))
+
         # Set UHD frame size as a function of the cell bandwidth on B2XX
-        if self._conf.get('rf_dev_type') == 'UHD' and values['ue'].get('rf_dev_args', None) is not None:
+        if self._conf.get('rf_dev_type') == 'uhd' and values['ue'].get('rf_dev_args', None) is not None:
             if 'b200' in values['ue'].get('rf_dev_args'):
                 rf_dev_args = values['ue'].get('rf_dev_args', '')
                 rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''
diff --git a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
index 4831278..59ab8b2 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
@@ -13,6 +13,8 @@
 % if ue.rf_dev_type == 'zmq':
   /* Force sampling rate (if uncommented) */
   sample_rate: ${ue.sample_rate},
+% else:
+  bandwidth: ${ue.bandwidth},
 %endif
 
 //  log_options: "all.level=debug,all.max_size=32",

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17752
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I3f20a5a8ca80c63374f0ad500fd2794e2dc45479
Gerrit-Change-Number: 17752
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200407/c142c397/attachment.htm>