Change in osmo-gsm-tester[master]: enb: add measurement config scenario files

[srs_andre]

srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17744 )


Change subject: enb: add measurement config scenario files
......................................................................

enb: add measurement config scenario files

this commit adds basic support for configuring measurement in the
eNB config. It currently support A1, A2, and A3 events.
By default UE measurements are turned off and need to be enabled
with +cfg-enb-meas+

Change-Id: Ia7657be2396886840570bc41645450a268b4cfff
---
M example/defaults.conf
A example/scenarios/cfg-enb-meas-a1 at .conf
A example/scenarios/cfg-enb-meas-a2 at .conf
A example/scenarios/cfg-enb-meas-a3 at .conf
A example/scenarios/cfg-enb-meas.conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
7 files changed, 72 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/44/17744/1

diff --git a/example/defaults.conf b/example/defaults.conf
index 5cda132..59140b2 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -118,6 +118,19 @@
 amarisoftenb:
   num_prb: 100
   enable_pcap: false
+  enable_measurements: false
+  a1_report_type: rsrp
+  a1_rsrp: -105
+  a1_hysteresis: 0
+  a1_time_to_trigger: 640
+  a2_report_type: rsrp
+  a2_rsrp: -110
+  a2_hysteresis: 0
+  a2_time_to_trigger: 640
+  a3_report_type: rsrp
+  a3_offset: 6
+  a3_hysteresis: 0
+  a3_time_to_trigger: 480
 
 srsue:
   enable_pcap: false
diff --git a/example/scenarios/cfg-enb-meas-a1 at .conf b/example/scenarios/cfg-enb-meas-a1 at .conf
new file mode 100644
index 0000000..3b9ea63
--- /dev/null
+++ b/example/scenarios/cfg-enb-meas-a1 at .conf
@@ -0,0 +1,6 @@
+config:
+  enb:
+    a1_report_type: ${param1}
+    a1_rsrp: ${param2}
+    a1_hysteresis: ${param3}
+    a1_time_to_trigger: ${param4}
diff --git a/example/scenarios/cfg-enb-meas-a2 at .conf b/example/scenarios/cfg-enb-meas-a2 at .conf
new file mode 100644
index 0000000..0ec4e9e
--- /dev/null
+++ b/example/scenarios/cfg-enb-meas-a2 at .conf
@@ -0,0 +1,6 @@
+config:
+  enb:
+    a2_report_type: ${param1}
+    a2_rsrp: ${param2}
+    a2_hysteresis: ${param3}
+    a2_time_to_trigger: ${param4}
diff --git a/example/scenarios/cfg-enb-meas-a3 at .conf b/example/scenarios/cfg-enb-meas-a3 at .conf
new file mode 100644
index 0000000..8a2bd54
--- /dev/null
+++ b/example/scenarios/cfg-enb-meas-a3 at .conf
@@ -0,0 +1,6 @@
+config:
+  enb:
+    a3_report_type: ${param1}
+    a3_offset: ${param2}
+    a3_hysteresis: ${param3}
+    a3_time_to_trigger: ${param4}
diff --git a/example/scenarios/cfg-enb-meas.conf b/example/scenarios/cfg-enb-meas.conf
new file mode 100644
index 0000000..7f1776c
--- /dev/null
+++ b/example/scenarios/cfg-enb-meas.conf
@@ -0,0 +1,3 @@
+config:
+  enb:
+    enable_measurements: true
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index ea1b543..cce8428 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -124,6 +124,19 @@
     { 'defaults.timeout': schema.STR,
       'config.bsc.net.codec_list[]': schema.CODEC,
       'config.enb.enable_pcap': schema.BOOL_STR,
+      'config.enb.enable_measurements': schema.BOOL_STR,
+      'config.enb.a1_report_type': schema.STR,
+      'config.enb.a1_rsrp': schema.INT,
+      'config.enb.a1_hysteresis': schema.INT,
+      'config.enb.a1_time_to_trigger': schema.INT,
+      'config.enb.a2_report_type': schema.STR,
+      'config.enb.a2_rsrp': schema.INT,
+      'config.enb.a2_hysteresis': schema.INT,
+      'config.enb.a2_time_to_trigger': schema.INT,
+      'config.enb.a3_report_type': schema.STR,
+      'config.enb.a3_offset': schema.INT,
+      'config.enb.a3_hysteresis': schema.INT,
+      'config.enb.a3_time_to_trigger': schema.INT,
       'config.epc.type': schema.STR,
       'config.epc.qci': schema.UINT,
       'config.epc.enable_pcap': schema.BOOL_STR,
diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index 763af08..50b8561 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -229,5 +229,30 @@
 
     /* DRB configuration */
     drb_config: "amarisoft_drb.cfg",
+
+% if enb.enable_measurements == 'True':
+    /* measurement configuration */
+    meas_config_desc: {
+        a1_report_type: "${enb.a1_report_type}",
+        a1_rsrp: ${enb.a1_rsrp},
+        a1_hysteresis: ${enb.a1_hysteresis},
+        a1_time_to_trigger: ${enb.a1_time_to_trigger},
+        a2_report_type: "${enb.a2_report_type}",
+        a2_rsrp: ${enb.a2_rsrp},
+        a2_hysteresis: ${enb.a2_hysteresis},
+        a2_time_to_trigger: ${enb.a2_time_to_trigger},
+        a3_report_type: "${enb.a3_report_type}",
+        a3_offset: ${enb.a3_offset},
+        a3_hysteresis: ${enb.a3_hysteresis},
+        a3_time_to_trigger: ${enb.a3_time_to_trigger},
+    },
+
+    /* measurement gap configuration */
+    meas_gap_config: "gp0",
+
+    /* if true, initiate a handover when a suitable measurement report
+       is received */
+    ho_from_meas: true,
+% endif
   },
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17744
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: Ia7657be2396886840570bc41645450a268b4cfff
Gerrit-Change-Number: 17744
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200407/5cc080be/attachment.htm>