Commit 91d41b1d authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent bbcca51a
......@@ -35,7 +35,7 @@
{
{%- if cell2.cell_type == 'lte' %}
rat: "eutra",
cell_id: {{ cfg('enb_id') }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ cell2_ref }}
cell_id: {{ slapparameter_dict.enb_id }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ cell2_ref }}
n_id_cell: {{ cell2.pci }},
dl_earfcn: {{ cell2.dl_earfcn }},
tac: {{ cell2.tac }},
......@@ -171,11 +171,11 @@
{% endif %}
{%- if do_lte %}
enb_id: {{ cfg('enb_id') }},
enb_id: {{ slapparameter_dict.enb_id }},
{%- endif %}
{%- if do_nr %}
gnb_id: {{ cfg('gnb_id') }},
gnb_id_bits: {{ cfg('gnb_id_bits') }},
gnb_id: {{ slapparameter_dict.gnb_id }},
gnb_id_bits: {{ slapparameter_dict.get('gnb_id_bits', 28) }},
en_dc_support: true,
{%- endif %}
......
......@@ -40,8 +40,8 @@
gtp_addr: "127.0.1.1",
enb_id: 0x1A2D0,
gnb_id: 0x12345,
enb_id: 0x10012,
gnb_id: 0x54321,
gnb_id_bits: 28,
en_dc_support: true,
......@@ -269,7 +269,7 @@
// Intra-ENB HO
{
rat: "eutra",
cell_id: 0x1A2D001, // -> CELL_a
cell_id: 0x1001201, // -> CELL_a
n_id_cell: 1,
dl_earfcn: 38050,
tac: 0x1234,
......
......@@ -2,6 +2,10 @@
"type": "object",
"$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"required": [
"enb_id",
"gnb_id"
],
"properties": {
"enb_id": {
"title": "eNB ID",
......@@ -35,8 +39,7 @@
"gnb_id": {
"title": "gNB ID",
"description": "gNB ID",
"type": "string",
"default": "0x12345"
"type": "string"
},
"gnb_id_bits": {
"title": "gNB ID bits",
......
......@@ -17,9 +17,6 @@
{#- XXX txrx_active=ACTIVE for sdr - needed ? (bwcompat for ORS) - if yes -> update ru/sdr/input-schema.json #}
{#- XXX add inactivity timer to cell schemas #}
{%- set defaults = {
'gnb_id': '0x12345',
'gnb_id_bits': 28,
'ru': {
'txrx_active': 'INACTIVE',
},
......@@ -108,11 +105,6 @@
{%- endmacro %}
{#- cfg returns value of configuration parameter name #}
{%- macro cfg(name) %}
{{- slapparameter_dict.get(name, defaults.get(name)) }}
{%- endmacro %}
{#- tap indicates tap interface, that slapos told us to use,
or 'xxx-notap-xxx' if slapos provided us either nothing or empty string. #}
{%- set tap = slap_configuration.get('tap-name', '') %}
......
......@@ -419,7 +419,10 @@ def do_enb():
"etc": "etc",
"var": "var"
},
"slapparameter_dict": {}
"slapparameter_dict": {
"enb_id": "0x10012",
"gnb_id": "0x54321"
}
}""" % locals()
j2render('enb.jinja2.cfg', 'enb.cfg', json_params)
......
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