Change in osmo-gsm-tester[master]: enb: add rf_port to cell list param

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

pespin gerrit-no-reply at lists.osmocom.org
Wed May 6 20:21:18 UTC 2020


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

Change subject: enb: add rf_port to cell list param
......................................................................

enb: add rf_port to cell list param

we need to make the rf_port a param in the cell list because for CA with
two cells on different EARFNCs, the RF port is different

for two cells without CA on the same EARFCN the RF port is the same

so we need to be able to configure it

Change-Id: I32e83cc34811588757104c5ce1cae7277402addd
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
M sysmocom/defaults.conf
4 files changed, 5 insertions(+), 2 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 4848ea4..42ff647 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -51,6 +51,7 @@
         'a3_time_to_trigger': schema.INT,
         'num_cells': schema.UINT,
         'cell_list[].cell_id': schema.UINT,
+        'cell_list[].rf_port': schema.UINT,
         'cell_list[].pci': schema.UINT,
         'cell_list[].ncell_list[]': schema.UINT,
         'cell_list[].scell_list[]': schema.UINT,
diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index 46bdf10..29b5fb8 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -59,7 +59,7 @@
 %for cell in enb.cell_list:
   {
     dl_earfcn: ${cell.dl_earfcn},
-    rf_port: 0, /* FIXME: this may need to be configurable based on device specifics (B2xx vs X310) */
+    rf_port: ${cell.rf_port},
     cell_id: ${cell.cell_id},
     n_id_cell: ${cell.pci},
     tac: 0x0001,
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 597f6ef..2e25f6b 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -65,7 +65,7 @@
 %for cell in enb.cell_list:
   ${',' if loop.index != 0 else ''}
   {
-    // rf_port = 0; Not yet implemented!
+    rf_port = ${cell.rf_port};
     cell_id = ${cell.cell_id};
     tac = 0x0001;
     pci = ${loop.index + 1};
diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf
index 871a45c..6694652 100644
--- a/sysmocom/defaults.conf
+++ b/sysmocom/defaults.conf
@@ -128,11 +128,13 @@
    - cell_id: 0x01
      pci: 0x01
      dl_earfcn: 2850
+     rf_port: 0
      scell_list: []
      ncell_list: [0x02]
    - cell_id: 0x02
      pci: 0x02
      dl_earfcn: 2850
+     rf_port: 0
      scell_list: []
      ncell_list: [0x01]
 

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


More information about the gerrit-log mailing list