.

software/ors-amarisoft/config/enb.cfg

@@ -11,8 +11,6 @@
         XXX move to ru/sdr ?
       rx_antenna:"tx_rx",   XXX -> ru/sdr ?  FIXME don't repeat multiple times
       tdd_tx_mod: 1,
-    XXX   <- should be preset set by ru?  (specific to ru?)    XXX   <- defaults
-    XXX   <- should be preset set by ru?  (specific to ru?)    XXX   <- defaults
 
       args: "dev0=/dev/sdr3,dev1=/dev/sdr4,dev2=/dev/sdr2@0,dev3=/dev/sdr2@1",
       cpri_mapping:  ",,bf1,bf1",

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -98,13 +98,13 @@
 {%-   do slave.update({'_': _})                                       %}
 {%-   if   'ru_type'   in _                                           %}
 {%-     set iru = slave                                               %}
-{%-     do iru_dict.update({ref: iru})                                 %}
+{%-     do iru_dict.update({ref: iru})                                %}
 {%-   elif 'cell_type' in _                                           %}
 {%-     set icell = slave                                             %}
 {%-     for k, v in defaults['cell'].items()                          %}
 {%-       do _.setdefault(k, v)                                       %}
 {%-     endfor                                                        %}
-{%-     do icell_dict.update({ref: icell})                             %}
+{%-     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`     #}
@@ -169,12 +169,10 @@
 {%-     do ru_cpri_dict.update({len(dev_argv): ru})                         %}
 {%-     set link = ru['cpri_link']                                          %}
 {%-     do dev_argv.append("dev%d=/dev/sdr%d@%d" % (len(dev_argv), link['sdr_dev'], link['sfp_port']))   %}
-{#      set cpri parameters to default              #}
-{%-     do link.setdefault('mapping', 'hw')         %}    XXX   <- should be preset set by ru?  (specific to ru?)
-{%-     do link.setdefault('mult',     16)          %}    XXX   <- defaults
-{%-     do link.setdefault('rx_delay',  0)          %}
-{%-     do link.setdefault('tx_delay',  0)          %}
-{%-     do link.setdefault('tx_dbm',    0)          %}
+{#-     set cpri parameters to default              #}
+{%-     for k, v in defaults['cpri_link'].items()   %}
+{%-       do link.setdefault(k, v)                  %}
+{%-     endfor                                      %}
 {%-   else        %}
 {%-     do bug('unreachable')                                 %}
 {%-   endif                                                   %}