Commit a8c744ec authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 0c31de27
...@@ -331,14 +331,14 @@ ...@@ -331,14 +331,14 @@
#} #}
{%- macro jref_of_shared(ishared) %} {%- macro jref_of_shared(ishared) %}
{#- do print('jref_of_shared %r' % (ishared,)) #} {#- do print('jref_of_shared %r' % (ishared,)) #}
{%- set ref = ishared['slave_title'] %} {%- set ref = ishared['slave_title'] %}
{%- set partition_id = slap_configuration['slap-computer-partition-id'] %} {%- set partition_id = slap_configuration['slap-computer-partition-id'] %}
{%- if ref.startswith(partition_id) %} {%- if ref.startswith(partition_id) %}
{%- set ref = ref[len(partition_id):] %} {%- set ref = ref[len(partition_id):] %}
{%- endif %} {%- endif %}
{%- set ref = ref.removeprefix('_') %} {%- set ref = ref.removeprefix('_') %}
{{- ref | tojson }} {{- ref | tojson }}
{%- endmacro %} {%- endmacro %}
{#- load_ipeer initializes peer registry. {#- load_ipeer initializes peer registry.
...@@ -402,24 +402,24 @@ ...@@ -402,24 +402,24 @@
iue_dict keeps ue shared instance: reference -> iue iue_dict keeps ue shared instance: reference -> iue
#} #}
{%- macro load_iue(iue_dict) %} {%- macro load_iue(iue_dict) %}
{%- 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 'ue_type' in _ %} {%- if 'ue_type' in _ %}
{%- set iue = ishared %} {%- set iue = ishared %}
{%- for k, v in defaults['ue'].items() %} {%- for k, v in defaults['ue'].items() %}
{%- do _.setdefault(k, v) %} {%- do _.setdefault(k, v) %}
{%- endfor %} {%- endfor %}
{%- do iue_dict.update({ref: iue}) %} {%- do iue_dict.update({ref: iue}) %}
{%- 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) %}
{%- endmacro %} {%- endmacro %}
{#- ---- building configuration ---- #} {#- ---- building configuration ---- #}
...@@ -434,23 +434,23 @@ ...@@ -434,23 +434,23 @@
{%- set tx_gainv = [] %} {#- tx_gain by tx channel #} {%- set tx_gainv = [] %} {#- tx_gain by tx channel #}
{%- set rx_gainv = [] %} {#- rx_gain by rx channel #} {%- set rx_gainv = [] %} {#- rx_gain by rx channel #}
{%- for (ru_ref, iru) in iru_dict.items() | sort(attribute="1._._rf_port") %} {%- for (ru_ref, iru) in iru_dict.items() | sort(attribute="1._._rf_port") %}
{%- set ru = iru['_'] %} {%- set ru = iru['_'] %}
// {{ B(ru_ref) }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R ({{ ru.ru_type }}) // {{ B(ru_ref) }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R ({{ ru.ru_type }})
{%- if ru.ru_type == 'sdr' %} {%- if ru.ru_type == 'sdr' %}
{%- do ru_sdr_dict.update({len(dev_argv): ru}) %} {%- do ru_sdr_dict.update({len(dev_argv): ru}) %}
{%- for n in ru.sdr_dev_list %} {%- for n in ru.sdr_dev_list %}
{%- do dev_argv.append("dev%d=/dev/sdr%d" % (len(dev_argv), n)) %} {%- do dev_argv.append("dev%d=/dev/sdr%d" % (len(dev_argv), n)) %}
{%- endfor %} {%- endfor %}
{%- elif ru.ru_link_type == 'cpri' %} {%- elif ru.ru_link_type == 'cpri' %}
{%- do ru_cpri_dict.update({len(dev_argv): ru}) %} {%- do ru_cpri_dict.update({len(dev_argv): ru}) %}
{%- set link = ru.cpri_link %} {%- set link = ru.cpri_link %}
{%- do dev_argv.append("dev%d=/dev/sdr%d@%d" % (len(dev_argv), link.sdr_dev, link.sfp_port)) %} {%- do dev_argv.append("dev%d=/dev/sdr%d@%d" % (len(dev_argv), link.sdr_dev, link.sfp_port)) %}
{%- else %} {%- else %}
{%- do bug('unreachable') %} {%- do bug('unreachable') %}
{%- endif %} {%- endif %}
{%- set ru_tx_gain = ru.tx_gain if ru.txrx_active == 'ACTIVE' else -1000 %} {%- set ru_tx_gain = ru.tx_gain if ru.txrx_active == 'ACTIVE' else -1000 %}
{%- do tx_gainv.extend([ru_tx_gain]*ru.n_antenna_dl) %} {%- do tx_gainv.extend([ru_tx_gain]*ru.n_antenna_dl) %}
{%- do rx_gainv.extend([ru.rx_gain]*ru.n_antenna_ul) %} {%- do rx_gainv.extend([ru.rx_gain]*ru.n_antenna_ul) %}
{%- endfor %} {%- endfor %}
{#- emit big error if both sdr and cpri are present {#- emit big error if both sdr and cpri are present
......
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