.

software/ors-amarisoft/buildout.hash.cfg

@@ -106,6 +106,15 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 filename = config/enb.jinja2.cfg
 md5sum = 681628be40bfe4ec126bfc93509beaa1
 
+[drb_lte.jinja2.cfg]
+filename = config/drb_lte.jinja2.cfg
+md5sum =
+
+[drb_nr.jinja2.cfg]
+filename = config/drb_nr.jinja2.cfg
+md5sum =
+
+
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
 md5sum = 610df0a6d244b556bee8eae868068577

software/ors-amarisoft/config/sib23.jinja2.asn

@@ -39,9 +39,9 @@
             pdsch-ConfigCommon {
 {% if bbu == "ors" %}
 {%- if one_watt == "True" %}
-              referenceSignalPower {{ (tx_gain | int) - 54 }}, /* patched by eNB */
+              referenceSignalPower {{ (ru.tx_gain | int) - 54 }}, /* patched by eNB */
 {%- else %}
-              referenceSignalPower {{ (tx_gain | int) - 35 }}, /* patched by eNB */
+              referenceSignalPower {{ (ru.tx_gain | int) - 35 }}, /* patched by eNB */
 {%- endif %}
 {% else %}
               referenceSignalPower -8, /* patched by eNB */

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

@@ -349,11 +349,6 @@ context =
 {# raw rx_gain {{ ors_version['current-rx-gain'] }}         #}
 {# raw earfcn  {{ ors_version['current-earfcn'] }}          #}
 
-[sib-config]
-<= config-base
-url = {{ sib23_template }}
-output = ${directory:etc}/sib23.cfg
-
 [enb-config]
 <= config-base
 {% if slapparameter_dict.get("enb_config_link", None) %}
@@ -363,7 +358,6 @@ url = {{ enb_template }}
 {% endif %}
 output = ${directory:etc}/enb.cfg
 extra-context =
-    key sib23_file sib-config:output
     json iru_dict {{ rulib.iru_dict | tojson }}
     json icell_dict {{ rulib.icell_dict | tojson }}
     import json_module json

software/ors-amarisoft/instance.cfg

@@ -280,6 +280,8 @@ extra-context =
     raw enb_template   ${enb.jinja2.cfg:target}
     raw amari_lte_template   ${amari_lte.jinja2:target}
     raw amari_slap_template  ${amari_slap.jinja2:target}
+    raw drb_lte_template ${drb_lte.jinja2.cfg:target}
+    raw drb_nr_template  ${drb_nr.jinja2.cfg:target}
     raw sib23_template   ${sib23.jinja2.asn:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}

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

@@ -118,8 +118,32 @@ cell-list = {{ iru_icell_ref_list | join(', ') }}
 
 {%-   endfor %}
 
-{#-   publish information about cells #}
+{#-   handle configured cells  XXX -> cell/libinstance ? #}
 {%-   for cell_ref, icell in icell_dict|dictsort %}
+{%-     set cell   = icell['_'] %}
+{%-     set ru_ref = J(jcell_ru_ref(icell, icell_dict))   %}
+{%-     set ru     = iru_dict[ru_ref]   %}
+
+{#-     generate CELL-drb.cfg and CELL-sib23.asn  #}
+{{ part('drb-config-%s' % cell_ref }}
+<= config-base
+url = {{ {'lte': drb_lte_template, 'nr': drb_nr_template} [cell.cell_type] }}
+output = ${directory:etc}/{{cell_ref}}-drb.cfg
+extra-context =
+    json cell_ref {{ cell_ref | tojson }}
+    json cell     {{ cell     | tojson }}
+    json ru       {{ ru       | tojson }}
+
+{{ part('sib23-config-%s' % cell_ref }}
+<= config-base
+url = {{ sib23_template }}
+output = ${directory:etc}/{{cell_ref}}-sib23.asn
+extra-context =
+    json cell_ref {{ cell_ref | tojson }}
+    json cell     {{ cell     | tojson }}
+    json ru       {{ ru       | tojson }}
+
+{#-     publish information about the cell #}
 {{ part('publish-%s' % cell_ref) }}
 recipe = slapos.cookbook:publish.serialised
 -slave-reference = {{ icell.slave_reference }}

software/ors-amarisoft/slapos-render-config.py

@@ -333,21 +333,18 @@ def do_enb():
     for cell_ref, icell in icell_dict.items():
         ru = ru_of_cell(icell)
         cell = icell['_']
+        jctx = json.dumps({
+                    'cell_ref': cell_ref,
+                    'cell':     cell,
+                    'ru':       ru,
+               })
         j2render('drb_%s.jinja2.cfg' % cell['cell_type'],
                  '%s-drb.cfg' % cell_ref,
-                 json.dumps({
-                     'cell_ref': cell_ref,
-                     'cell':     cell,
-                 }))
+                 jctx)
 
         j2render('sib23.jinja2.asn',
                  '%s-sib23.asn' % cell_ref,
-                 json.dumps({
-                     'cell_ref': cell_ref,
-                     'cell':     cell,
-                     'ru':       ru,
-                 }))
-
+                 jctx)
 
 
 # ---- UE ----

software/ors-amarisoft/software-base.cfg

@@ -31,6 +31,8 @@ parts +=
   ue_db.jinja2.cfg
   ue.jinja2.cfg
   amari_lte.jinja2
+  drb_lte.jinja2.cfg
+  drb_nr.jinja2.cfg
   sib23.jinja2.asn
   monitor-httpd-extra-conf
 # copy all gadget file
@@ -112,31 +114,26 @@ destination =  ${buildout:directory}/gadget/${:_buildout_section_name_}
 
 [enb.jinja2.cfg]
 <= copy-config-to-instance
-filename = enb.jinja2.cfg
+[drb_lte.jinja2.cfg]
+<= copy-config-to-instance
+[drb_nr.jinja2.cfg]
+<= copy-config-to-instance
 [sib23.jinja2.asn]
 <= copy-config-to-instance
-filename = sib23.jinja2.asn
 [gnb.jinja2.cfg]
 <= copy-config-to-instance
-filename = gnb.jinja2.cfg
 [ltelogs.jinja2.sh]
 <= copy-to-instance
-filename = ltelogs.jinja2.sh
 [ue_db.jinja2.cfg]
 <= copy-config-to-instance
-filename = ue_db.jinja2.cfg
 [mme.jinja2.cfg]
 <= copy-config-to-instance
-filename = mme.jinja2.cfg
 [dnsmasq.jinja2.cfg]
 <= copy-config-to-instance
-filename = dnsmasq.jinja2.cfg
 [ims.jinja2.cfg]
 <= copy-config-to-instance
-filename = ims.jinja2.cfg
 [ue.jinja2.cfg]
 <= copy-config-to-instance
-filename = ue.jinja2.cfg
 
 [amari_lte.jinja2]
 <= download-base