From eed66d5d89dbfdc676f59537a525a046a6261ea7 Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@nexedi.com>
Date: Tue, 26 Dec 2023 13:45:00 +0300
Subject: [PATCH] .
---
software/ors-amarisoft/cell/peer/nr/input-schema.json | 9 ++-------
.../ors-amarisoft/instance-ors-enb-input-schema.json | 3 ++-
software/ors-amarisoft/instance-ors-enb.jinja2.cfg | 7 +++++--
.../ors-amarisoft/instance-ors-gnb-input-schema.json | 3 ++-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/software/ors-amarisoft/cell/peer/nr/input-schema.json b/software/ors-amarisoft/cell/peer/nr/input-schema.json
index f80321e1a..f818f46f0 100644
--- a/software/ors-amarisoft/cell/peer/nr/input-schema.json
+++ b/software/ors-amarisoft/cell/peer/nr/input-schema.json
@@ -12,8 +12,7 @@
"nr_cell_id",
"gnb_id_bits",
"dl_nr_arfcn",
- "nr_band",
- "ul_nr_arfcn"
+ "nr_band"
],
"properties": {
@@ -36,11 +35,7 @@
"dl_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/dl_nr_arfcn" },
"nr_band": { "$ref": "../../../cell/nr/input-schema.json#/properties/nr_band" },
"ssb_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/ssb_nr_arfcn" },
- "ul_nr_arfcn": {
- "title": "UL NR ARFCN",
- "description": "Uplink NR Absolute Radio Frequency Channel Number of the cell",
- "type": "integer"
- },
+ "ul_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/ul_nr_arfcn" },
"pci": { "$ref": "../../../cell/nr/input-schema.json#/properties/pci" },
"tac": { "$ref": "../../../cell/lte/input-schema.json#/properties/tac" }
}
diff --git a/software/ors-amarisoft/instance-ors-enb-input-schema.json b/software/ors-amarisoft/instance-ors-enb-input-schema.json
index 2b54faaa3..5cccd7b81 100644
--- a/software/ors-amarisoft/instance-ors-enb-input-schema.json
+++ b/software/ors-amarisoft/instance-ors-enb-input-schema.json
@@ -117,7 +117,8 @@
"tac": {
"title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)",
- "type": "number"
+ "type": "number",
+ "default": "0x0001"
}
},
"type": "object"
diff --git a/software/ors-amarisoft/instance-ors-enb.jinja2.cfg b/software/ors-amarisoft/instance-ors-enb.jinja2.cfg
index 4a235cbf2..44bb53405 100644
--- a/software/ors-amarisoft/instance-ors-enb.jinja2.cfg
+++ b/software/ors-amarisoft/instance-ors-enb.jinja2.cfg
@@ -15,6 +15,7 @@
"gtp_addr": "127.0.1.1",
"lte_handover_a3_offset": 6,
"lte_handover_a3_time_to_trigger": 480,
+ "ncell_list": {},
"inactivity_timer": 10000,
"disable_sdr": false
} %}
@@ -31,6 +32,7 @@
"gnb_id_bits": 28,
"nr_handover_a3_offset": 6,
"nr_handover_time_to_trigger": 100,
+ "ncell_list": {},
"inactivity_timer": 10000,
"disable_sdr": false
} %}
@@ -44,8 +46,8 @@
{%- do slapparameter_dict.setdefault(k, v) %}
{%- endfor %}
-{# inject ru+cell synthesized from ORS-specific parameters
- make real ru/cell shared instances to be rejected in ORS mode #}
+
+{#- make real ru/cell/peer/... shared instances to be rejected in ORS mode #}
{%- set ishared_list = slap_configuration.setdefault('slave-instance-list', []) %}
{%- for ishared in ishared_list %}
{%- set _ = json_module.loads(ishared['_']) %}
@@ -54,6 +56,7 @@
{%- endif %}
{%- endfor %}
+{#- inject ru+cell synthesized from ORS-specific parameters
{%- do ishared_list.append({
'slave_title': '%s_RU' % slap_configuration['slap-computer-partition-id'],
'slave_reference': 'XXX',
diff --git a/software/ors-amarisoft/instance-ors-gnb-input-schema.json b/software/ors-amarisoft/instance-ors-gnb-input-schema.json
index 02e5a4c6b..d2794fff6 100644
--- a/software/ors-amarisoft/instance-ors-gnb-input-schema.json
+++ b/software/ors-amarisoft/instance-ors-gnb-input-schema.json
@@ -182,7 +182,8 @@
"tac": {
"title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)",
- "type": "number"
+ "type": "number",
+ "default": "0x0001"
}
},
"type": "object"
--
2.30.9