.

software/ors-amarisoft/buildout.hash.cfg

@@ -32,15 +32,15 @@ md5sum = 69bd174aaf604029f06e7f32791c35f6
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
-md5sum = e27ebe0ff200a3e4492412f164ca9b73
+md5sum = 7cd5331db13a8a901cb1b55a4596cf50
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 3a83b8c04a04e07ebd9d0d3847c62726
+md5sum = af0e3e3e991e19080bdc90e4fbde5975
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
-md5sum = d41d8cd98f00b204e9800998ecf8427e
+md5sum = e291dd9197e16f1af955a40f03d4ddb5
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -140,7 +140,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
 
 [ru_lopcomm_cu_config.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml
-md5sum = 9f8b1b6e3a891c3cf10c88bd591391f6
+md5sum = c9ba974fd94ffacd8d72144c950fdf9a
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

software/ors-amarisoft/ru/lopcomm/cu_config.jinja2.xml

@@ -91,15 +91,15 @@
             <!-- XXX error with "TODO" do not support multiple cells over 1 RU -->
 {%- if cell.cell_type == 'lte'                                                %}
 {%-   set dl_arfcn = cell.dl_earfcn                                           %}
-{%-   set ul_arfcn = cell.ul_earfcb                                           %}
-{%-   set dl_freq  = earfcn.frequency(dl_arfcn) * 1e6                         %}
-{%-   set ul_freq  = earfcn.frequency(ul_arfcn) * 1e6                         %}
+{%-   set ul_arfcn = cell.ul_earfcn                                           %}
+{%-   set dl_freq  = earfcn_module.frequency(dl_arfcn) * 1e6                  %}
+{%-   set ul_freq  = earfcn_module.frequency(ul_arfcn) * 1e6                  %}
 {%-   set bw       = int(float(cell.bandwidth.removesuffix(' MHz')) * 1e6)    %}
 {%- elif cell.cell_type == 'nr'                                               %}
 {%-   set dl_arfcn = cell.dl_nr_arfcn                                         %}
 {%-   set ul_arfcn = cell.ul_nr_arfcn                                         %}
-{%-   set dl_freq  = nrarfcn.get_frequency(dl_arfcn) * 1e6                    %}
-{%-   set ul_freq  = nrarfcn.get_frequency(ul_arfcn) * 1e6                    %}
+{%-   set dl_freq  = nrarfcn_module.get_frequency(dl_arfcn) * 1e6             %}
+{%-   set ul_freq  = nrarfcn_module.get_frequency(ul_arfcn) * 1e6             %}
 {%-   set bw       = int(cell.bandwidth * 1e6)                                %}
 {%- else                                                                      %}
 {%-   do bug('unreachable')                                                   %}

software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg

@@ -3,15 +3,12 @@
 {%- macro buildout_iru(iru, icell_list)  %}
 {%-  set ru_ref = J(jref_of_shared(iru))  %}
 {%-  set ru     = iru['_']  %}
-{%-  do assert(False, ru_ref) %}
 
-{#
 {%-  if len(icell_list) != 1  %}
-{%-    do error('ru/lopcomm supports only 1 cell  %}
+{%-    do error('ru/lopcomm supports only 1 cell')  %}
 {%-  endif %}
 {%-  set icell = icell_list[0]  %}
-{%-  set cell  = icell._  %}
-#}
+{%-  set cell  = icell['_']  %}
 
 {#-  indicate whether RU is listening for netconf #}
 
@@ -109,6 +106,8 @@ url = {{ ru_lopcomm_cu_config_template }}
 {% endif %}
 output = ${directory:etc}/{{ru_ref}}-cu_config.xml
 extra-context =
+  import earfcn_module  xlte.earfcn
+  import nrarfcn_module nrarfcn
   json ru   {{ ru   | tojson }}
   json cell {{ cell | tojson }}