Commit eed66d5d authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 9a8cddb9
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
"nr_cell_id", "nr_cell_id",
"gnb_id_bits", "gnb_id_bits",
"dl_nr_arfcn", "dl_nr_arfcn",
"nr_band", "nr_band"
"ul_nr_arfcn"
], ],
"properties": { "properties": {
...@@ -36,11 +35,7 @@ ...@@ -36,11 +35,7 @@
"dl_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/dl_nr_arfcn" }, "dl_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/dl_nr_arfcn" },
"nr_band": { "$ref": "../../../cell/nr/input-schema.json#/properties/nr_band" }, "nr_band": { "$ref": "../../../cell/nr/input-schema.json#/properties/nr_band" },
"ssb_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/ssb_nr_arfcn" }, "ssb_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/ssb_nr_arfcn" },
"ul_nr_arfcn": { "ul_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/ul_nr_arfcn" },
"title": "UL NR ARFCN",
"description": "Uplink NR Absolute Radio Frequency Channel Number of the cell",
"type": "integer"
},
"pci": { "$ref": "../../../cell/nr/input-schema.json#/properties/pci" }, "pci": { "$ref": "../../../cell/nr/input-schema.json#/properties/pci" },
"tac": { "$ref": "../../../cell/lte/input-schema.json#/properties/tac" } "tac": { "$ref": "../../../cell/lte/input-schema.json#/properties/tac" }
} }
......
...@@ -117,7 +117,8 @@ ...@@ -117,7 +117,8 @@
"tac": { "tac": {
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number",
"default": "0x0001"
} }
}, },
"type": "object" "type": "object"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"gtp_addr": "127.0.1.1", "gtp_addr": "127.0.1.1",
"lte_handover_a3_offset": 6, "lte_handover_a3_offset": 6,
"lte_handover_a3_time_to_trigger": 480, "lte_handover_a3_time_to_trigger": 480,
"ncell_list": {},
"inactivity_timer": 10000, "inactivity_timer": 10000,
"disable_sdr": false "disable_sdr": false
} %} } %}
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
"gnb_id_bits": 28, "gnb_id_bits": 28,
"nr_handover_a3_offset": 6, "nr_handover_a3_offset": 6,
"nr_handover_time_to_trigger": 100, "nr_handover_time_to_trigger": 100,
"ncell_list": {},
"inactivity_timer": 10000, "inactivity_timer": 10000,
"disable_sdr": false "disable_sdr": false
} %} } %}
...@@ -44,8 +46,8 @@ ...@@ -44,8 +46,8 @@
{%- do slapparameter_dict.setdefault(k, v) %} {%- do slapparameter_dict.setdefault(k, v) %}
{%- endfor %} {%- 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', []) %} {%- set ishared_list = slap_configuration.setdefault('slave-instance-list', []) %}
{%- for ishared in ishared_list %} {%- for ishared in ishared_list %}
{%- set _ = json_module.loads(ishared['_']) %} {%- set _ = json_module.loads(ishared['_']) %}
...@@ -54,6 +56,7 @@ ...@@ -54,6 +56,7 @@
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{#- inject ru+cell synthesized from ORS-specific parameters
{%- do ishared_list.append({ {%- do ishared_list.append({
'slave_title': '%s_RU' % slap_configuration['slap-computer-partition-id'], 'slave_title': '%s_RU' % slap_configuration['slap-computer-partition-id'],
'slave_reference': 'XXX', 'slave_reference': 'XXX',
......
...@@ -182,7 +182,8 @@ ...@@ -182,7 +182,8 @@
"tac": { "tac": {
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number",
"default": "0x0001"
} }
}, },
"type": "object" "type": "object"
......
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