Commit c362e5cd authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb: nr: Let root_sequence_index to also be cell parameter

For uniformity with LTE where it already is.

We do not expose it in ORS schema because it will be exposed only in generic
LTE and NR schemas, but for ORS schemas I prefer to keep them intact myself.

Tests will be added later as full tests for generic MultiRU.

Backward compatibility: no change for ORS and everything else.

Diff for rendered configs:

$ ./pythonwitheggs slapos-render-config.py && git diff -w --no-index config/{old,out}
diff --git a/config/old/gnb.cfg b/config/out/gnb.cfg
index 5849bb924..b8a385a71 100644
--- a/config/old/gnb.cfg
+++ b/config/out/gnb.cfg
@@ -56,6 +56,7 @@
     subcarrier_spacing: 30,
     ssb_pos_bitmap: "10000000",

+    root_sequence_index: 1,
     inactivity_timer: 10000,

       // Handover
@@ -176,7 +176,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     q_qual_min: -20,
-    root_sequence_index: 1,
     sr_period: 40,
     dmrs_type_a_pos: 2,
     prach: {
parent 8f63dc22
...@@ -434,6 +434,7 @@ ...@@ -434,6 +434,7 @@
subcarrier_spacing: 30, subcarrier_spacing: 30,
ssb_pos_bitmap: "{{ cell.ssb_pos_bitmap }}", ssb_pos_bitmap: "{{ cell.ssb_pos_bitmap }}",
root_sequence_index: {{ cell.root_sequence_index }},
inactivity_timer: {{ cell.inactivity_timer }}, inactivity_timer: {{ cell.inactivity_timer }},
// Handover // Handover
...@@ -751,7 +752,6 @@ ...@@ -751,7 +752,6 @@
intra_freq_reselection: true, intra_freq_reselection: true,
q_rx_lev_min: -70, q_rx_lev_min: -70,
q_qual_min: -20, q_qual_min: -20,
root_sequence_index: 1,
sr_period: 40, sr_period: 40,
dmrs_type_a_pos: 2, dmrs_type_a_pos: 2,
prach: { prach: {
......
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
"type": "string", "type": "string",
"default": "0x01" "default": "0x01"
}, },
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 1
},
"inactivity_timer": { "inactivity_timer": {
"title": "Inactivity Timer", "title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.", "description": "Send RRC connection release after this time (in ms) of network inactivity.",
......
...@@ -151,6 +151,12 @@ ...@@ -151,6 +151,12 @@
"type": "string", "type": "string",
"default": "0x01" "default": "0x01"
}, },
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 1
},
"inactivity_timer": { "inactivity_timer": {
"title": "Inactivity Timer", "title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.", "description": "Send RRC connection release after this time (in ms) of network inactivity.",
......
...@@ -227,6 +227,12 @@ ...@@ -227,6 +227,12 @@
"type": "string", "type": "string",
"default": "0x01" "default": "0x01"
}, },
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 1
},
"inactivity_timer": { "inactivity_timer": {
"title": "Inactivity Timer", "title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.", "description": "Send RRC connection release after this time (in ms) of network inactivity.",
......
...@@ -66,6 +66,12 @@ ...@@ -66,6 +66,12 @@
"type": "string", "type": "string",
"default": "0x01" "default": "0x01"
}, },
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 1
},
"inactivity_timer": { "inactivity_timer": {
"title": "Inactivity Timer", "title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.", "description": "Send RRC connection release after this time (in ms) of network inactivity.",
......
...@@ -113,6 +113,12 @@ ...@@ -113,6 +113,12 @@
"type": "string", "type": "string",
"default": "0x01" "default": "0x01"
}, },
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 1
},
"inactivity_timer": { "inactivity_timer": {
"title": "Inactivity Timer", "title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.", "description": "Send RRC connection release after this time (in ms) of network inactivity.",
......
...@@ -163,6 +163,7 @@ ...@@ -163,6 +163,7 @@
{%- do cell.setdefault('dl_nr_arfcn', RF.dl_nr_arfcn) %} {%- do cell.setdefault('dl_nr_arfcn', RF.dl_nr_arfcn) %}
{%- do cell.setdefault('bandwidth', slapparameter_dict.get('nr_bandwidth', default_nr_bandwidth)) %} {%- do cell.setdefault('bandwidth', slapparameter_dict.get('nr_bandwidth', default_nr_bandwidth)) %}
{%- do cell.setdefault('ssb_pos_bitmap', slapparameter_dict.get('ssb_pos_bitmap', default_nr_ssb_pos_bitmap)) %} {%- do cell.setdefault('ssb_pos_bitmap', slapparameter_dict.get('ssb_pos_bitmap', default_nr_ssb_pos_bitmap)) %}
{%- do cell.setdefault('root_sequence_index', slapparameter_dict.get('root_sequence_index', 1 + i)) %}
{%- do cell.setdefault('inactivity_timer', slapparameter_dict.get('inactivity_timer', default_nr_inactivity_timer)) %} {%- do cell.setdefault('inactivity_timer', slapparameter_dict.get('inactivity_timer', default_nr_inactivity_timer)) %}
{%- else %} {%- else %}
{%- do bug('unreachable') %} {%- do bug('unreachable') %}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment