software/ors-amarisoft: Adjust check-cpri-lock promise to explicitly specify watched CPRI ports

In multiRU we will need to be able to check multiple CPRI boards and multiple
SFP ports on them, not only SFP ports on CPRI board 0 that was implicitly used
until now.

-> As a preparatory step the SR to explicitly specify which CPRI resources are being verified.

This patch is necessary because in slapos.toolbox!127
we adjust check_cpri_lock plugin to require CPRI device + SFP port to be
explicitly specified.

/cc @tomo, @xavier_thompson, @Daetalus
/reviewed-by @lu.xu, @jhuge
/reviewed-on !1461

software/ors-amarisoft/buildout.hash.cfg

@@ -56,7 +56,7 @@ md5sum = 63472d5dc9bd46923d3941b5189e2ccd
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = f61ba5e691bf263c8666e92f9eeef643
+md5sum = d37801f7d613618d5a26605415093fd7
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

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

@@ -35,7 +35,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
@@ -48,6 +47,7 @@ parts =
 {% endif %}
   monitor-base
   publish-connection-information
+{% set extra_part_list = [] %}
 
 extends = {{ monitor_template }}
 
@@ -690,12 +690,21 @@ 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-cpri-lock.py]
+{%  if ru == "lopcomm" %}
+{%-   set cell_list = slapparameter_dict.get('cell_list', {'default': {}}) %}
+{%-   for i, k in enumerate(cell_list) %}
+{%-     set sfp_port = cell_list[k].get('cpri_port_number', i) %}
+{%-     do extra_part_list.append('SFP%s-cpri-lock.py' % sfp_port) %}
+[SFP{{sfp_port}}-cpri-lock.py]
 <= macro.promise
 promise = check_cpri_lock
 config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-sdr_dev  = {{ slapparameter_dict.get('sdr_number', 0) }}
+config-sfp_port = {{ sfp_port }}
 config-amarisoft-rf-info-log = ${amarisoft-rf-info-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+{%-  endfor %}
+{% endif %}
 
 [check-rx-saturated.py]
 <= macro.promise
@@ -705,3 +714,9 @@ config-rf-rx-chan-list = {{ list(range(0, int(slapparameter_dict.get('n_antenna_
 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 extra_part_list %}
+    {{ part }}
+{%- endfor %}