.

software/ors-amarisoft/amarisoft-rf-info.jinja2.py

@@ -41,7 +41,7 @@ class enbWebSocket:
         if {{ testing }}:
             r = {
                 'message': 'rf',
-                'rf_info': "CPRI: x16 HW SW\n"
+                'rf_info': "CPRI: x16 HW SW\n"  # XXX update
             }
         else:
             self.send({

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

@@ -36,7 +36,6 @@ parts =
   check-lopcomm-sync.py
   check-lopcomm-config-log.py
   check-lopcomm-stats-log.py
-  check-cpri-lock.py
 {% endif %}
 {% if slapparameter_dict.get("dnsmasq", None) %}
   dnsmasq-service
@@ -659,13 +658,6 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-config-log = ${lopcomm-rrh-config-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> trx_sdr ?
-[check-cpri-lock.py]
-<= macro.promise
-promise = check_cpri_lock
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
 [check-rx-saturated.py]
 <= macro.promise

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

@@ -22,28 +22,38 @@
 {%-     do parts_list.append(name)  %}
 [{{ name }}]
 {%-   endmacro    %}
+{%-   macro promise(name) %}
+{{ part(name) }}
+<= macro.promise
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+{%-   endmacro %}
 {%-   for ru_ref, iru in iru_dict|dictsort %}
 {%-     set ru = iru['_']  %}
 
 # {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R   XXX + ru arg
 {%-     if ru.ru_link_type == 'sdr'  %}
 {%-       for (i, n) in enumerate(ru.sdr_dev_list)  %}
-{{ part('%s-check-sdr-busy%s.py' % (ru_ref, '-%d' % (i+1)  if i > 0  else '')) }}
-<= macro.promise
+{{ promise('%s-check-sdr-busy%s.py' % (ru_ref, '-%d' % (i+1)  if i > 0  else '')) }}
 promise = check_sdr_busy
-config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-sdr = {{ sdr }}
 config-sdr_dev = {{ n }}
 config-dma_chan = 0
 {%-       endfor  %}
+
 {%-     elif ru.ru_link_type == 'cpri'  %}
-{{ part('%s-check-sdr-busy.py' % ru_ref) }}
-<= macro.promise
+{{ promise('%s-check-sdr-busy.py' % ru_ref) }}
 promise = check_sdr_busy
-config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-sdr = {{ sdr }}
 config-sdr_dev  = {{ ru.cpri_link.sdr_dev }}
 config-dma_chan = {{ ru.cpri_link.sfp_port }}
+
+{{ promise('%s-check-cpri-lock.py' % ru_ref) }}
+promise = check_cpri_lock
+config-sdr_dev  = {{ ru.cpri_link.sdr_dev }}
+config-sfp_port = {{ ru.cpri_link.sfp_port }}
+config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
 {%-     else %}
 {%-       do bug('unreachable') %}
 {%-     endif %}