Change in osmo-gsm-tester[master]: srs_enb: add num_cells param to srsENB

[srs_andre]

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

Change subject: srs_enb: add num_cells param to srsENB
......................................................................

srs_enb: add num_cells param to srsENB

this is needed to support the upcoming multi-cell feature in srsENB.
It's required for carrier aggregation (CA) but can also
be used for (currently) two independent 4G cells.

This commit adds baseline support for the parameter. Upcoming
commits will add hooks to configure the cell's EARFCN, etc.

Change-Id: I6d1658bf820163aee03b64b0f4ac68046c243f37
---
M example/defaults.conf
A example/scenarios/mod-enb-ncells at .conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
5 files changed, 47 insertions(+), 0 deletions(-)

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



diff --git a/example/defaults.conf b/example/defaults.conf
index dcb84db..b1fbfbb 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -105,6 +105,7 @@
   num_prb: 100
   transmission_mode: 1
   enable_pcap: false
+  num_cells: 1
 
 srsue:
   enable_pcap: false
diff --git a/example/scenarios/mod-enb-ncells at .conf b/example/scenarios/mod-enb-ncells at .conf
new file mode 100644
index 0000000..b57b94a
--- /dev/null
+++ b/example/scenarios/mod-enb-ncells at .conf
@@ -0,0 +1,3 @@
+modifiers:
+  enb:
+  - num_cells: ${param1}
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 5862aef..3b805ff 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -90,6 +90,7 @@
         'enb[].addr': schema.IPV4,
         'enb[].num_prb': schema.UINT,
         'enb[].transmission_mode': schema.LTE_TRANSMISSION_MODE,
+        'enb[].num_cells': schema.UINT,
         'enb[].rf_dev_type': schema.STR,
         'enb[].rf_dev_args': schema.STR,
         'arfcn[].arfcn': schema.INT,
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 940665e..c4c72bc 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -201,6 +201,8 @@
         assert self._num_prb
         self._txmode = int(values['enb'].get('transmission_mode', None))
         assert self._txmode
+        self._num_cells = int(values['enb'].get('num_cells', None))
+        assert self._num_cells
         config.overlay(values, dict(enb={ 'num_ports': self.num_ports() }))
 
         # We need to set some specific variables programatically here to match IP addresses:
@@ -248,6 +250,9 @@
     def num_prb(self):
         return self._num_prb
 
+    def num_cells(self):
+        return self._num_cells
+
     def num_ports(self):
         if self._txmode == 1:
             return 1
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 3dd3fee..2d31c3d 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -86,5 +86,42 @@
       rsrq_config = 4;
     };
   }
+% if enb.get('num_cells') == '2':
+  ,
+  {
+    rf_port = 1;
+    cell_id = 0x02;
+    tac = 0x0002;
+    pci = 2;
+    root_seq_idx = 205;
+    dl_earfcn = 2910;
+    ul_earfcn = 20910;
+    ho_active = false;
+
+    // CA cells
+    scell_list = (
+      {cell_id = 0x01; cross_carrier_scheduling = false; scheduling_cell_id = 0x01; ul_allowed = true}
+    )
+
+    // Cells available for handover
+    meas_cell_list =
+    (
+      {
+        eci = 0x19C02;
+        dl_earfcn = 2850;
+        pci = 1;
+      }
+    );
+
+    // ReportCfg (only A3 supported)
+    meas_report_desc = {
+      a3_report_type = "RSRP";
+      a3_offset = 6;
+      a3_hysteresis = 0;
+      a3_time_to_trigger = 480;
+      rsrq_config = 4;
+    };
+  }
+% endif
   // Add here more cells
 );

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17583
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: I6d1658bf820163aee03b64b0f4ac68046c243f37
Gerrit-Change-Number: 17583
Gerrit-PatchSet: 2
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/20200324/23a8f925/attachment.htm>