.

software/ors-amarisoft/amari/slap.jinja2

@@ -45,18 +45,18 @@
     }
 %}
 
-{%- macro default_ul_earfcn(dl_earfcn)  %}
-{{-   earfcn_module.dl2ul(dl_earfcn)    }}
+{%- macro jdefault_ul_earfcn(dl_earfcn)  %}
+{{-   earfcn_module.dl2ul(dl_earfcn) | tojson    }}
 {%- endmacro %}
 
-{%- macro default_ul_nr_arfcn(dl_nr_arfcn, nr_band)             %}
+{%- macro jdefault_ul_nr_arfcn(dl_nr_arfcn, nr_band)            %}
 {%-   set nr = nrarfcn_module                                   %}
 {%-   set dl_lo, dl_hi = nr.get_nrarfcn_range(nr_band, 'dl')    %}
 {%-   set ul_lo, ul_hi = nr.get_nrarfcn_range(nr_band, 'ul')    %}
-{{-   ul_lo + (dl_nr_arfcn - dl_lo)                             }}
+{{-   (ul_lo + (dl_nr_arfcn - dl_lo)) | tojson                  }}
 {%- endmacro %}
 
-{%- macro default_ssb_nr_arfcn(dl_nr_arfcn) %}
+{%- macro jdefault_ssb_nr_arfcn(dl_nr_arfcn) %}
 {#- NOTE: computations rechecked wrt https://tech-academy.amarisoft.com/OutOfBox_UEsim_SA.html#Tips_SSB_Frequency #}
 {%-   set nr = nrarfcn_module                       %}
 {%-   set f = nr.get_frequency(nrarfcn=dl_nr_arfcn) %}
@@ -66,7 +66,7 @@
 {%-   endif                                         %}
 {%-   set fg = nr.get_frequency_by_gscn(gscn)       %}
 {%-   set fg_arfcn = nr.get_nrarfcn(fg)             %}
-{{- fg_arfcn }}
+{{- fg_arfcn | tojson }}
 {%- endmacro %}
 
 
@@ -165,10 +165,10 @@
 {%-         set xcell_type = _.ue_cell_type                                                     %}
 {%-       endif                                                                                 %}
 {%-       if xcell_type == 'lte'                                                                %}
-{%-         do _.setdefault('ul_earfcn',    default_ul_earfcn(_.dl_earfcn))                 %}
+{%-         do _.setdefault('ul_earfcn',    J(jdefault_ul_earfcn(_.dl_earfcn)))                 %}
 {%-       elif xcell_type == 'nr'                                                               %}
-{%-         do _.setdefault('ul_nr_arfcn',  default_ul_nr_arfcn(_.dl_nr_arfcn, _.nr_band))  %}
-{%-         do _.setdefault('ssb_nr_arfcn', default_ssb_nr_arfcn(_.dl_nr_arfcn))            %}
+{%-         do _.setdefault('ul_nr_arfcn',  J(jdefault_ul_nr_arfcn(_.dl_nr_arfcn, _.nr_band)))  %}
+{%-         do _.setdefault('ssb_nr_arfcn', J(jdefault_ssb_nr_arfcn(_.dl_nr_arfcn)))            %}
 {%-       else                                                                                  %}
 {%-         do bug('unreachable')                                                               %}
 {%-       endif                                                                                 %}

software/ors-amarisoft/buildout.hash.cfg

@@ -24,7 +24,7 @@ md5sum = bcb9011d930de644827ec9c713837d71
 
 [amari_slap.jinja2]
 _update_hash_filename_ = amari/slap.jinja2
-md5sum = c30fa5e9843212f94ae595d8394ac6b8
+md5sum = 4120fe398197ef49922bcfbc0e2116c6
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
@@ -140,7 +140,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
 
 [ru_lopcomm_cu_config.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml
-md5sum = c9ba974fd94ffacd8d72144c950fdf9a
+md5sum = 3589be1efdfa9c2ebb26c6dcd07c0e02
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

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

@@ -92,14 +92,14 @@
 {%- if cell.cell_type == 'lte'                                                %}
 {%-   set dl_arfcn = cell.dl_earfcn                                           %}
 {%-   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 dl_freq  = int(earfcn_module.frequency(dl_arfcn) * 1e6)             %}
+{%-   set ul_freq  = int(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_module.get_frequency(dl_arfcn) * 1e6             %}
-{%-   set ul_freq  = nrarfcn_module.get_frequency(ul_arfcn) * 1e6             %}
+{%-   set dl_freq  = int(nrarfcn_module.get_frequency(dl_arfcn) * 1e6)        %}
+{%-   set ul_freq  = int(nrarfcn_module.get_frequency(ul_arfcn) * 1e6)        %}
 {%-   set bw       = int(cell.bandwidth * 1e6)                                %}
 {%- else                                                                      %}
 {%-   do bug('unreachable')                                                   %}