.

software/ors-amarisoft/amari/lte.jinja2

@@ -30,7 +30,7 @@
   {%- set ru_cpri_dict = {} %}  {#- dev -> ru  for ru with link_kind = cpri   #}
   {%- set tx_gainv = [] %}      {#- tx_gain by tx channel                     #}
   {%- set rx_gainv = [] %}      {#- rx_gain by tx channel                     #}
-  {%- for rf_port, (ru_ref, iru) in enumerate(iru_dict|dictsort)              %}
+  {%- for rf_port, (ru_ref, iru) in enumerate(iru_dict|dictsort)              %}  XXX adjust
   {%-   set ru = iru['_']                                                     %}
       // {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R  ({{ ru.ru_type }})
   {%-   do ru.update({'_rf_port': rf_port})                                   %}

software/ors-amarisoft/amari/slap.jinja2

@@ -167,6 +167,18 @@
 {%-       do error(icell, "referred RU %s does not exist" % ru_ref)   %}
 {%-     endif                                                         %}
 {%-   endfor                                                          %}
+
+{#-   assign rf_port and rf tx/rx indices to RUs                      #}
+{%-   set rf_idx = namespace(tx=0, rx=0)                              %}
+{%-   for rf_port, (ru_ref, iru) in enumerate(iru_dict|dictsort)      %}
+{%-     set ru = iru['_']                                             %}
+{%-     do ru.update({'_rf_port':   rf_port,
+                      '_rf_idx_tx': rf_idx.tx,
+                      '_rf_idx_rx': rf_idx.rx})                       %}
+{%-     set rf_idx.tx = rf_idx.tx + ru.n_antenna_dl                   %}
+{%-     set rf_idx.rx = rf_idx.rx + ru.n_antenna_ul                   %}
+{%-   endfor                                                          %}
+
 {%- endmacro                                                          %}
 
 {#- jcell_ru_ref returns RU reference linked from a cell.

software/ors-amarisoft/buildout.hash.cfg

@@ -60,7 +60,7 @@ md5sum = e22257ef526b0acc10a8203daa41028b
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 74f7f908ececded519271f2e89b5eb7f
+md5sum = 7065f74b78477169ca47ab2278a69dc7
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

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

@@ -43,9 +43,6 @@ parts =
 
   check-baseband-latency.py
   check-amarisoft-stats-log.py
-{% if not ru == "lopcomm"  %}
-  check-rx-saturated.py
-{% endif %}
   monitor-base
   publish-connection-information
 
@@ -657,12 +654,3 @@ promise = check_lopcomm_config_log
 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) }}
-
-
-[check-rx-saturated.py]
-<= macro.promise
-promise = check_rx_saturated
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}

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

@@ -65,6 +65,14 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 {%-     endif %}
 {%-   endfor %}
 
+
+{{ promise('%s-check-rx-saturated.py' % ru_ref) }}
+promise = check_rx_saturated
+config-rf-rx-idx-list = {{ range(ru._rf_idx_rx, ru._rf_idx_rx + ru.n_antenna_ul) }}
+config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
+
 [buildout]
 parts +=
 {%- for part in parts_list %}