Change in osmo-gsm-tester[master]: enb_amarisoft: add option to enable and configure DL AWGN channel

[pespin]

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

Change subject: enb_amarisoft: add option to enable and configure DL AWGN channel
......................................................................

enb_amarisoft: add option to enable and configure DL AWGN channel

expose option to enable DL AWGN noise and make SNR configurable

Change-Id: Ib248e87e5abd855d4c974eab42ec40828c6e1d40
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/obj/enb_amarisoft.py
M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
M sysmocom/defaults.conf
4 files changed, 13 insertions(+), 0 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index d9fe1a5..be48887 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -36,6 +36,8 @@
         'rf_dev_args': schema.STR,
         'additional_args[]': schema.STR,
         'enable_measurements': schema.BOOL_STR,
+        'enable_dl_awgn': schema.BOOL_STR,
+        'dl_awgn_snr': schema.INT,
         'a1_report_type': schema.STR,
         'a1_report_value': schema.INT,
         'a1_hysteresis': schema.INT,
diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py
index 4b24844..c7a9810 100644
--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py
@@ -160,6 +160,8 @@
         self.enable_measurements = util.str2bool(values['enb'].get('enable_measurements', 'false'))
         config.overlay(values, dict(enb={'enable_measurements': self.enable_measurements}))
 
+        config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))}))
+
         # We need to set some specific variables programatically here to match IP addresses:
         if self._conf.get('rf_dev_type') == 'zmq':
             base_srate = self.num_prb2base_srate(self.num_prb())
diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index 09532cc..7896ecb 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -38,6 +38,13 @@
   /* RF driver configuration */
   include "amarisoft_rf_driver.cfg",
 
+% if enb.enable_dl_awgn:
+  channel_dl: {
+    type: "awgn",
+    snr: ${enb.dl_awgn_snr}
+  },
+% endif
+
   mme_list: [
     {
       s1ap_bind_addr: "${enb.addr}",
diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf
index 2c99e04..dd97456 100644
--- a/sysmocom/defaults.conf
+++ b/sysmocom/defaults.conf
@@ -113,6 +113,8 @@
   transmission_mode: 1
   num_cells: 1
   enable_measurements: false
+  enable_dl_awgn: false
+  dl_awgn_snr: 30
   a1_report_type: rsrp
   a1_report_value: -105
   a1_hysteresis: 0

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19185
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: Ib248e87e5abd855d4c974eab42ec40828c6e1d40
Gerrit-Change-Number: 19185
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: srs_andre <andre at softwareradiosystems.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200709/1e31dfbc/attachment.htm>