Skip to content

S
slapos
Commit db9134be authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent 4a053944
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 42 deletions
software/ors-amarisoft/amari/slap.jinja2
View file @ db9134be
...@@ -139,52 +139,55 @@ ...@@ -139,52 +139,55 @@
XXX defaults ? XXX defaults ?
#} #}
{%- macro load_iru_and_icell(iru_dict, icell_dict, icell_kind) %} {%- macro load_iru_and_icell(iru_dict, icell_dict, icell_kind) %}
{%- set qother = [] %} {%- set qother = [] %}
{%- for ishared in qshared_instance_list %} {%- for ishared in qshared_instance_list %}
{%- set ref = J(jref_of_shared(ishared)) %} {%- set ref = J(jref_of_shared(ishared)) %}
{%- set _ = ishared['_'] %} {%- set _ = ishared['_'] %}
{%- if 'ru_type' in _ %} {%- if 'ru_type' in _ %}
{%- set iru = ishared %} {%- set iru = ishared %}
{%- if _.ru_link_type == 'cpri' %} {%- if _.ru_link_type == 'cpri' %}
{%- set link = _.cpri_link %} {%- set link = _.cpri_link %}
{%- for k, v in defaults['cpri_link'].items() %} {%- for k, v in defaults['cpri_link'].items() %}
{%- do link.setdefault(k, v) %} {%- do link.setdefault(k, v) %}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{%- do iru_dict.update({ref: iru}) %} {%- do iru_dict.update({ref: iru}) %}
{%- elif (icell_kind == 'enb' and 'cell_type' in _) or {%- elif (icell_kind == 'enb' and 'cell_type' in _) or
(icell_kind == 'ue' and 'ue_cell_type' in _) %} (icell_kind == 'ue' and 'ue_cell_type' in _) %}
{%- set icell = ishared %} {%- set icell = ishared %}
{%- if icell_kind == 'enb' %} {%- if icell_kind == 'enb' %}
{%- for k, v in defaults['cell/' + _.cell_type].items() %} {%- for k, v in defaults['cell/' + _.cell_type].items() %}
{%- do _.setdefault(k, v) %} {%- do _.setdefault(k, v) %}
{%- endfor %} {%- endfor %}
{%- if _.cell_type == 'lte' %} {%- set xcell_type = _.cell_type %}
{%- do _.setdefault('ul_earfcn', default_ul_earfcn(_.dl_earfcn)) %} {%- else %}
{%- elif _.cell_type == 'nr' %} {%- set xcell_type = _.ue_cell_type %}
{%- do _.setdefault('ul_nr_arfcn', default_ul_nr_arfcn(_.dl_nr_arfcn, _.nr_band)) %} {%- endif %}
{%- do _.setdefault('ssb_nr_arfcn', default_ssb_nr_arfcn(_.dl_nr_arfcn)) %} {%- if xcell_type == 'lte' %}
{%- else %} {%- do _.setdefault('ul_earfcn', default_ul_earfcn(_.dl_earfcn)) %}
{%- do bug('unreachable') %} {%- elif xcell_type == 'nr' %}
{%- endif %} {%- do _.setdefault('ul_nr_arfcn', default_ul_nr_arfcn(_.dl_nr_arfcn, _.nr_band)) %}
{%- endif %} {%- do _.setdefault('ssb_nr_arfcn', default_ssb_nr_arfcn(_.dl_nr_arfcn)) %}
{%- do icell_dict.update({ref: icell}) %} {%- else %}
{%- set ru = _['ru'] %} {%- do bug('unreachable') %}
{%- if ru.ru_type not in ('ru_ref', 'ruincell_ref') %} {%- endif %}
{#- embedded ru definition -> expose it as `_<cell_ref>_ru` #} {%- do icell_dict.update({ref: icell}) %}
{%- set ru = _['ru'] %}
{%- if ru.ru_type not in ('ru_ref', 'ruincell_ref') %}
{#- embedded ru definition -> expose it as `_<cell_ref>_ru` #}
{%- do iru_dict.update({'_%s_ru' % ref: { {%- do iru_dict.update({'_%s_ru' % ref: {
'_': ru, '_': ru,
'slave_title': '%s. RU' % icell.slave_title, 'slave_title': '%s. RU' % icell.slave_title,
'slave_reference': icell.slave_reference, 'slave_reference': icell.slave_reference,
}}) %} }}) %}
{%- endif %} {%- endif %}
{%- else %} {%- else %}
{%- do qother.append(ishared) %} {%- do qother.append(ishared) %}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{%- do qshared_instance_list.clear() %} {%- do qshared_instance_list.clear() %}
{%- do qshared_instance_list.extend(qother) %} {%- do qshared_instance_list.extend(qother) %}
{#- do print('\n>>> iru_dict:'), pprint(iru_dict) #} {#- do print('\n>>> iru_dict:'), pprint(iru_dict) #}
{#- do print('\n>>> icell_dict:'), pprint(icell_dict) #} {#- do print('\n>>> icell_dict:'), pprint(icell_dict) #}
......
software/ors-amarisoft/config/ue.cfg
View file @ db9134be
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
n_antenna_ul: 1, n_antenna_ul: 1,
dl_earfcn: 38050, dl_earfcn: 38050,
ul_earfcn: 38050,
bandwidth: 5, bandwidth: 5,
global_timing_advance: -1, global_timing_advance: -1,
...@@ -56,8 +57,9 @@ ...@@ -56,8 +57,9 @@
band: 7, band: 7,
dl_nr_arfcn: 537200, dl_nr_arfcn: 537200,
bandwidth: 5, ul_nr_arfcn: 513200,
ssb_nr_arfcn: 537170, ssb_nr_arfcn: 537170,
bandwidth: 5,
subcarrier_spacing: 15, subcarrier_spacing: 15,
}, },
......
software/ors-amarisoft/ue/cell/lte/input-schema.json
View file @ db9134be
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
}, },
"dl_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/dl_earfcn" }, "dl_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/dl_earfcn" },
"ul_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/ul_earfcn" },
"bandwidth": { "$ref": "../../../cell/lte/input-schema.json#/properties/bandwidth" } "bandwidth": { "$ref": "../../../cell/lte/input-schema.json#/properties/bandwidth" }
} }
} }
software/ors-amarisoft/ue/cell/nr/input-schema.json
View file @ db9134be
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,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" },
"bandwidth": { "$ref": "../../../cell/nr/input-schema.json#/properties/bandwidth" }, "bandwidth": { "$ref": "../../../cell/nr/input-schema.json#/properties/bandwidth" },
"nr_band": { "$ref": "../../../cell/nr/input-schema.json#/properties/nr_band" }, "nr_band": { "$ref": "../../../cell/nr/input-schema.json#/properties/nr_band" },
"ul_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/ul_nr_arfcn" },
"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" }
} }
} }
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7