.

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

@@ -236,7 +236,14 @@
           manual_ref_signal_power: true,
 {%-       endif %}
 
-          drb_config: "{{ cell_ref }}-drb.cfg"
+          drb_config: "{{ cell_ref }}-drb.cfg",
+
+          sib_sched_list: [
+            {
+              filename: "{{ cell_ref }}-sib23.asn",
+              si_periodicity: 16,
+            },
+          ],
         },
 {%-   endif %}
 {%- endfor %}
@@ -270,12 +277,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     si_window_length: 40,
-    sib_sched_list: [
-      {
-        filename: "{{ sib23_file }}",
-        si_periodicity: 16,
-      },
-    ],
 
     si_pdcch_format: 2,
 

software/ors-amarisoft/config/out/CELL1_a-sib23.asn

+
+{
+  message c1: systemInformation: {
+    criticalExtensions systemInformation-r8: {
+      sib-TypeAndInfo {
+        sib2: {
+          radioResourceConfigCommon {
+            rach-ConfigCommon {
+              preambleInfo {
+                numberOfRA-Preambles n52
+              },
+              powerRampingParameters {
+                powerRampingStep dB2,
+                preambleInitialReceivedTargetPower dBm-104
+              },
+              ra-SupervisionInfo {
+                preambleTransMax n10,
+                ra-ResponseWindowSize sf10,
+                mac-ContentionResolutionTimer sf40
+              },
+              maxHARQ-Msg3Tx 5
+            },
+            bcch-Config {
+              modificationPeriodCoeff n4
+            },
+            pcch-Config {
+              defaultPagingCycle rf128,
+              nB oneT
+            },
+            prach-Config {
+              rootSequenceIndex 0, /* patched by eNB */
+              prach-ConfigInfo {
+                prach-ConfigIndex 4, /* patched by eNB */
+                highSpeedFlag FALSE,
+                zeroCorrelationZoneConfig 11,
+                prach-FreqOffset 4 /* patched by eNB */
+              }
+            },
+            pdsch-ConfigCommon {
+
+              referenceSignalPower -8, /* patched by eNB */
+
+              p-b 1 /* patched by eNB */
+            },
+            pusch-ConfigCommon {
+              pusch-ConfigBasic {
+                n-SB 1,
+                hoppingMode interSubFrame,
+                pusch-HoppingOffset 8, /* patched by eNB */
+                enable64QAM FALSE /* patched by eNB */
+              },
+              ul-ReferenceSignalsPUSCH {
+                groupHoppingEnabled FALSE,
+                groupAssignmentPUSCH 0,
+                sequenceHoppingEnabled FALSE,
+                cyclicShift 0
+              }
+            },
+            pucch-ConfigCommon {
+              deltaPUCCH-Shift ds2,
+              nRB-CQI 4, /* patched by eNB */
+              nCS-AN 0,
+              n1PUCCH-AN 12 /* patched by eNB */
+            },
+            soundingRS-UL-ConfigCommon setup: {
+              srs-BandwidthConfig bw2, /* patched by eNB */
+              srs-SubframeConfig sc3, /* patched by eNB */
+              ackNackSRS-SimultaneousTransmission TRUE
+            },
+            uplinkPowerControlCommon {
+              p0-NominalPUSCH -85,
+              alpha al1,
+              p0-NominalPUCCH -117,
+              deltaFList-PUCCH {
+                deltaF-PUCCH-Format1 deltaF0,
+                deltaF-PUCCH-Format1b deltaF3,
+                deltaF-PUCCH-Format2 deltaF1,
+                deltaF-PUCCH-Format2a deltaF2,
+                deltaF-PUCCH-Format2b deltaF2
+              },
+              deltaPreambleMsg3 4
+            },
+            ul-CyclicPrefixLength len1
+          },
+          ue-TimersAndConstants {
+            t300 ms200,
+            t301 ms200,
+            t310 ms200,
+            n310 n6,
+            t311 ms10000,
+            n311 n5
+          },
+          freqInfo {
+            additionalSpectrumEmission 1
+          },
+          timeAlignmentTimerCommon infinity
+        },
+        sib3: {
+          cellReselectionInfoCommon {
+            q-Hyst dB2
+          },
+          cellReselectionServingFreqInfo {
+            s-NonIntraSearch 3,
+            threshServingLow 2,
+            cellReselectionPriority 6
+          },
+          intraFreqCellReselectionInfo {
+            q-RxLevMin -61,
+            p-Max 23,
+            s-IntraSearch 5,
+            presenceAntennaPort1 TRUE,
+            neighCellConfig '01'B,
+            t-ReselectionEUTRA 1
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

software/ors-amarisoft/config/out/CELL1_b-sib23.asn

+
+{
+  message c1: systemInformation: {
+    criticalExtensions systemInformation-r8: {
+      sib-TypeAndInfo {
+        sib2: {
+          radioResourceConfigCommon {
+            rach-ConfigCommon {
+              preambleInfo {
+                numberOfRA-Preambles n52
+              },
+              powerRampingParameters {
+                powerRampingStep dB2,
+                preambleInitialReceivedTargetPower dBm-104
+              },
+              ra-SupervisionInfo {
+                preambleTransMax n10,
+                ra-ResponseWindowSize sf10,
+                mac-ContentionResolutionTimer sf40
+              },
+              maxHARQ-Msg3Tx 5
+            },
+            bcch-Config {
+              modificationPeriodCoeff n4
+            },
+            pcch-Config {
+              defaultPagingCycle rf128,
+              nB oneT
+            },
+            prach-Config {
+              rootSequenceIndex 0, /* patched by eNB */
+              prach-ConfigInfo {
+                prach-ConfigIndex 4, /* patched by eNB */
+                highSpeedFlag FALSE,
+                zeroCorrelationZoneConfig 11,
+                prach-FreqOffset 4 /* patched by eNB */
+              }
+            },
+            pdsch-ConfigCommon {
+
+              referenceSignalPower -8, /* patched by eNB */
+
+              p-b 1 /* patched by eNB */
+            },
+            pusch-ConfigCommon {
+              pusch-ConfigBasic {
+                n-SB 1,
+                hoppingMode interSubFrame,
+                pusch-HoppingOffset 8, /* patched by eNB */
+                enable64QAM FALSE /* patched by eNB */
+              },
+              ul-ReferenceSignalsPUSCH {
+                groupHoppingEnabled FALSE,
+                groupAssignmentPUSCH 0,
+                sequenceHoppingEnabled FALSE,
+                cyclicShift 0
+              }
+            },
+            pucch-ConfigCommon {
+              deltaPUCCH-Shift ds2,
+              nRB-CQI 4, /* patched by eNB */
+              nCS-AN 0,
+              n1PUCCH-AN 12 /* patched by eNB */
+            },
+            soundingRS-UL-ConfigCommon setup: {
+              srs-BandwidthConfig bw2, /* patched by eNB */
+              srs-SubframeConfig sc3, /* patched by eNB */
+              ackNackSRS-SimultaneousTransmission TRUE
+            },
+            uplinkPowerControlCommon {
+              p0-NominalPUSCH -85,
+              alpha al1,
+              p0-NominalPUCCH -117,
+              deltaFList-PUCCH {
+                deltaF-PUCCH-Format1 deltaF0,
+                deltaF-PUCCH-Format1b deltaF3,
+                deltaF-PUCCH-Format2 deltaF1,
+                deltaF-PUCCH-Format2a deltaF2,
+                deltaF-PUCCH-Format2b deltaF2
+              },
+              deltaPreambleMsg3 4
+            },
+            ul-CyclicPrefixLength len1
+          },
+          ue-TimersAndConstants {
+            t300 ms200,
+            t301 ms200,
+            t310 ms200,
+            n310 n6,
+            t311 ms10000,
+            n311 n5
+          },
+          freqInfo {
+            additionalSpectrumEmission 1
+          },
+          timeAlignmentTimerCommon infinity
+        },
+        sib3: {
+          cellReselectionInfoCommon {
+            q-Hyst dB2
+          },
+          cellReselectionServingFreqInfo {
+            s-NonIntraSearch 3,
+            threshServingLow 2,
+            cellReselectionPriority 6
+          },
+          intraFreqCellReselectionInfo {
+            q-RxLevMin -61,
+            p-Max 23,
+            s-IntraSearch 5,
+            presenceAntennaPort1 TRUE,
+            neighCellConfig '01'B,
+            t-ReselectionEUTRA 1
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

software/ors-amarisoft/config/out/CELL1_c-sib23.asn

+
+{
+  message c1: systemInformation: {
+    criticalExtensions systemInformation-r8: {
+      sib-TypeAndInfo {
+        sib2: {
+          radioResourceConfigCommon {
+            rach-ConfigCommon {
+              preambleInfo {
+                numberOfRA-Preambles n52
+              },
+              powerRampingParameters {
+                powerRampingStep dB2,
+                preambleInitialReceivedTargetPower dBm-104
+              },
+              ra-SupervisionInfo {
+                preambleTransMax n10,
+                ra-ResponseWindowSize sf10,
+                mac-ContentionResolutionTimer sf40
+              },
+              maxHARQ-Msg3Tx 5
+            },
+            bcch-Config {
+              modificationPeriodCoeff n4
+            },
+            pcch-Config {
+              defaultPagingCycle rf128,
+              nB oneT
+            },
+            prach-Config {
+              rootSequenceIndex 0, /* patched by eNB */
+              prach-ConfigInfo {
+                prach-ConfigIndex 4, /* patched by eNB */
+                highSpeedFlag FALSE,
+                zeroCorrelationZoneConfig 11,
+                prach-FreqOffset 4 /* patched by eNB */
+              }
+            },
+            pdsch-ConfigCommon {
+
+              referenceSignalPower -8, /* patched by eNB */
+
+              p-b 1 /* patched by eNB */
+            },
+            pusch-ConfigCommon {
+              pusch-ConfigBasic {
+                n-SB 1,
+                hoppingMode interSubFrame,
+                pusch-HoppingOffset 8, /* patched by eNB */
+                enable64QAM FALSE /* patched by eNB */
+              },
+              ul-ReferenceSignalsPUSCH {
+                groupHoppingEnabled FALSE,
+                groupAssignmentPUSCH 0,
+                sequenceHoppingEnabled FALSE,
+                cyclicShift 0
+              }
+            },
+            pucch-ConfigCommon {
+              deltaPUCCH-Shift ds2,
+              nRB-CQI 4, /* patched by eNB */
+              nCS-AN 0,
+              n1PUCCH-AN 12 /* patched by eNB */
+            },
+            soundingRS-UL-ConfigCommon setup: {
+              srs-BandwidthConfig bw2, /* patched by eNB */
+              srs-SubframeConfig sc3, /* patched by eNB */
+              ackNackSRS-SimultaneousTransmission TRUE
+            },
+            uplinkPowerControlCommon {
+              p0-NominalPUSCH -85,
+              alpha al1,
+              p0-NominalPUCCH -117,
+              deltaFList-PUCCH {
+                deltaF-PUCCH-Format1 deltaF0,
+                deltaF-PUCCH-Format1b deltaF3,
+                deltaF-PUCCH-Format2 deltaF1,
+                deltaF-PUCCH-Format2a deltaF2,
+                deltaF-PUCCH-Format2b deltaF2
+              },
+              deltaPreambleMsg3 4
+            },
+            ul-CyclicPrefixLength len1
+          },
+          ue-TimersAndConstants {
+            t300 ms200,
+            t301 ms200,
+            t310 ms200,
+            n310 n6,
+            t311 ms10000,
+            n311 n5
+          },
+          freqInfo {
+            additionalSpectrumEmission 1
+          },
+          timeAlignmentTimerCommon infinity
+        },
+        sib3: {
+          cellReselectionInfoCommon {
+            q-Hyst dB2
+          },
+          cellReselectionServingFreqInfo {
+            s-NonIntraSearch 3,
+            threshServingLow 2,
+            cellReselectionPriority 6
+          },
+          intraFreqCellReselectionInfo {
+            q-RxLevMin -61,
+            p-Max 23,
+            s-IntraSearch 5,
+            presenceAntennaPort1 TRUE,
+            neighCellConfig '01'B,
+            t-ReselectionEUTRA 1
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

software/ors-amarisoft/config/out/enb.cfg

@@ -131,7 +131,14 @@
           },
           manual_ref_signal_power: true,
 
-          drb_config: "CELL1_a-drb.cfg"
+          drb_config: "CELL1_a-drb.cfg",
+
+          sib_sched_list: [
+            {
+              filename: "CELL1_a-sib23.asn",
+              si_periodicity: 16,
+            },
+          ],
         },
 
         // CELL1_b  (_CELL1_a_ru)
@@ -221,7 +228,14 @@
           },
           manual_ref_signal_power: true,
 
-          drb_config: "CELL1_b-drb.cfg"
+          drb_config: "CELL1_b-drb.cfg",
+
+          sib_sched_list: [
+            {
+              filename: "CELL1_b-sib23.asn",
+              si_periodicity: 16,
+            },
+          ],
         },
   ],
 
@@ -240,12 +254,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     si_window_length: 40,
-    sib_sched_list: [
-      {
-        filename: "sib2_3.asn",
-        si_periodicity: 16,
-      },
-    ],
 
     si_pdcch_format: 2,
 

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

@@ -6,7 +6,7 @@
 import zc.buildout.buildout # XXX workaround import bug in vvv
 from slapos.recipe.template import jinja2_template
 
-import json, copy, sys, pprint
+import json, copy, sys, os, pprint, glob
 
 
 # j2render renders config/<src> into config/out/<out> with provided json parameters.
@@ -66,7 +66,7 @@ class Instance:
         self.shared_instance_list.append(ishared)
         return ishared
 
-# py version of jref_of_shared.
+# py version of jref_of_shared (simplified).
 def ref_of_shared(ishared):
     ref = ishared['slave_title']
     ref = ref.removeprefix('_')
@@ -306,18 +306,55 @@ def do_enb():
 
     j2render('enb.jinja2.cfg', 'enb.cfg', json_params)
 
-    # drb.cfg for all cells
+    # drb.cfg + sib.asn for all cells
+    iru_dict   = {}
+    icell_dict = {}
     for ishared in ienb.shared_instance_list:
         ref = ref_of_shared(ishared)
         _   = json.loads(ishared['_'])
-        if 'cell_type' in _:
-            cell = _
-            j2render('drb_%s.jinja2.cfg' % cell['cell_type'],
-                     '%s-drb.cfg' % ref,
-                     json.dumps({
-                         'cell_ref': ref,
-                         'cell':     cell
-                     }))
+        ishared['_'] = _
+        print(ref)
+        if 'ru_type' in _:
+            iru_dict[ref] = ishared
+        elif 'cell_type' in _:
+            icell_dict[ref] = ishared
+        else:
+            raise AssertionError('enb: unknown shared instance %r' % (ishared,))
+
+    print()
+    print(iru_dict)
+    print(icell_dict)
+
+    # ~ jcell_ru_ref (simplified).
+    def ru_of_cell(icell):
+        cell_ref = ref_of_shared(icell)
+        ru = icell['_']['ru']
+        if ru['ru_type'] == 'ru_ref':
+            return iru_dict[ru.ru_ref]
+        elif ru['ru_type'] == 'ruincell_ref':
+            return ru_of_cell(icell_dict[ru['ruincell_ref']])
+        else:
+            # embedded ru definition
+            return ru
+
+    for cell_ref, icell in icell_dict.items():
+        ru = ru_of_cell(icell)
+        cell = icell['_']
+        j2render('drb_%s.jinja2.cfg' % cell['cell_type'],
+                 '%s-drb.cfg' % cell_ref,
+                 json.dumps({
+                     'cell_ref': cell_ref,
+                     'cell':     cell,
+                 }))
+
+        j2render('sib23.jinja2.asn',
+                 '%s-sib23.asn' % cell_ref,
+                 json.dumps({
+                     'cell_ref': cell_ref,
+                     'cell':     cell,
+                     'ru':       ru,
+                 }))
+
 
 
 # ---- UE ----
@@ -389,6 +426,8 @@ def do_ue():
 
 
 def main():
+    for f in glob.glob('config/out/*'):
+        os.remove(f)
     do_enb()
     do_ue()