software/ors-amarisoft: enb/generic: Interlink RU/CELLs by publishing info who uses who

For example by publishing on RU the list of CELLs that are using it.

While at it and as we are introducing per-RU publication, fix a long-standing
TODO in ru/lopcomm to publish RU-specific information in per-RU way instead of
global.

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

@@ -231,6 +231,23 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
 {%-       do rudrv_init.update({ru.ru_type: 1}) %}
 {%-     endif %}
 {{      rudrv.buildout_iru(iru, iru_icell_list) }}
+
+{#-     publish information about RU (skipping synthetic)  #}
+{%-     if iru.slave_reference  %}
+{{ part('ipublish-%s' % ru_ref) }}
+recipe = slapos.cookbook:publish.serialised
+-slave-reference = {{ dumps(iru.slave_reference) }}
+{{ slap_configuration['slap-software-type'] }} = {{ dumps(root) }}
+{%-       set iru_icell_ref_list = [] %}
+{%-       for icell in iru_icell_list %}
+{%-         do iru_icell_ref_list.append(J(jref_of_shared(icell)))  %}
+{%-       endfor  %}
+cell-list = {{ dumps(iru_icell_ref_list) }}
+{%-       if ru.ru_link_type == 'cpri'  %}
+ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway}
+{%-       endif %}
+{%-     endif %}
+
 {%-   endfor %}
 
 {#-   handle configured cells #}
@@ -275,6 +292,7 @@ ru       = {{ dumps(ru      ) }}
 recipe = slapos.cookbook:publish.serialised
 -slave-reference = {{ dumps(icell.slave_reference) }}
 {{ slap_configuration['slap-software-type'] }} = {{ dumps(root) }}
+ru  = {{ dumps(ru_ref) }}
 {%- if cell.cell_type == 'lte' %}
 dl_earfcn   = {{ dumps(cell.dl_earfcn) }}
 {%- elif cell.cell_type == 'nr' %}

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

@@ -234,13 +234,11 @@ hash-files =
 {%- endif %}
 
 
-{#- amend published information with Lopcomm-specific bits
-    TODO make it per-RU #}
-[publish-connection-information]
-ssh-command = ssh ${user-info:pw-name}@${sshd-service:ipv6} -p ${sshd-service:port}
-ssh-url = ssh://${user-info:pw-name}@[${sshd-service:ipv6}]:${sshd-service:port}
-ru-firmware = {{ru_lopcomm_firmware_filename}}
-ru-ipv6 = ${slap-configuration:tap-ipv6-gateway}
+{#- amend RU-published information with Lopcomm-specific bits #}
+[{{ B('ipublish-%s' % ru_ref) }}]
+bbu-ssh-command = ssh ${user-info:pw-name}@${sshd-service:ipv6} -p ${sshd-service:port}
+bbu-ssh-url = ssh://${user-info:pw-name}@[${sshd-service:ipv6}]:${sshd-service:port}
+firmware = {{ru_lopcomm_firmware_filename}}
 
 {%- endmacro  %}