.

software/ors-amarisoft/amari/lte.jinja2

@@ -115,511 +115,3 @@
                '20 MHz': 100}   %}
 {{-   _[cell.bandwidth] }}
 {%- endmacro -%}
-
-
-{#- cell_drb_config returns drb_config section for an LTE cell.
-    DRB configuration varies in beteen FDD and TDD modes. #}
-{%- macro cell_drb_config(cell) %}
-{%-   if cell.rf_mode == 'tdd' %}
-{%-     set T_REORDERING = 65 %}
-{%-   else %}
-{%-     set T_REORDERING = 35 %}
-{%-   endif %}
-  [
-  {
-    qci: 1,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
-
-
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 12,
-      pdcp_SN_SizeDL: 12,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-
-
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 5,
-      },
-      dl_um: {
-        sn_FieldLength: 5,
-        t_Reordering: {{ T_REORDERING }},
-      },
-    },
-    logical_channel_config: {
-
-      priority: 7,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 2,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: {{ T_REORDERING }},
-      },
-    },
-    logical_channel_config: {
-      priority: 9,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 3,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: {{ T_REORDERING }},
-      },
-    },
-    logical_channel_config: {
-      priority: 8,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 4,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 10,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 65,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
-
-
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 12,
-      pdcp_SN_SizeDL: 12,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-
-
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 5,
-      },
-      dl_um: {
-        sn_FieldLength: 5,
-        t_Reordering: {{ T_REORDERING }},
-      },
-    },
-    logical_channel_config: {
-
-      priority: 5,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 66,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: {{ T_REORDERING }},
-      },
-    },
-    logical_channel_config: {
-
-      priority: 7,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 67,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: {{ T_REORDERING }},
-      },
-    },
-    logical_channel_config: {
-      priority: 6,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-
-  {
-    qci: 5,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 6,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 6,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 12,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 7,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: {{ T_REORDERING }},
-      },
-    },
-    logical_channel_config: {
-      priority: 13,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 8,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 14,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 9,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-    },
-    en_dc_split: {
-      type: "scg",
-      ul_data_threshold: 0
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 15,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 3,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 69,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 4,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 70,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: {{ T_REORDERING }},
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 11,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  ]
-{%- endmacro %}

software/ors-amarisoft/amari/slap.jinja2

@@ -272,9 +272,7 @@
 {%-   if ref.startswith(partition_id)                                       %}
 {%-     set ref = ref[len(partition_id):]                                   %}
 {%-   endif                                                                 %}
-{%-   if ref.startswith('_')                                                %}
-{%-     set ref = ref[1:]                                                   %}
-{%-   endif                                                                 %}
+{%-   set ref = ref.removeprefix('_')                                       %}
 {{-   ref | tojson                                                          }}
 {%- endmacro                                                                %}
 

software/ors-amarisoft/config/CELL1_a-drb.cfg

+// DRB configuration for LTE cell CELL1_a.
+// DRB configuration vary in beteen FDD and TDD modes.
+
+// TDD
+#define T_REORDERING 65
+
+[
+  {
+    qci: 1,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 7,
+
+
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+
+
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 5,
+      },
+      dl_um: {
+        sn_FieldLength: 5,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 2,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 9,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 3,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 8,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 4,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 10,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 65,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 7,
+
+
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+
+
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 5,
+      },
+      dl_um: {
+        sn_FieldLength: 5,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 5,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 66,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 67,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+
+  {
+    qci: 5,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 6,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 12,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 7,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 13,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 8,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 14,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 9,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    en_dc_split: {
+      type: "scg",
+      ul_data_threshold: 0
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 15,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 3,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 69,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 4,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 70,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+]
\ No newline at end of file

software/ors-amarisoft/config/CELL1_b-drb.cfg

+// DRB configuration for LTE cell CELL1_b.
+// DRB configuration vary in beteen FDD and TDD modes.
+
+// TDD
+#define T_REORDERING 65
+
+[
+  {
+    qci: 1,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 7,
+
+
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+
+
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 5,
+      },
+      dl_um: {
+        sn_FieldLength: 5,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 2,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 9,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 3,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 8,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 4,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 10,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 65,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 7,
+
+
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+
+
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 5,
+      },
+      dl_um: {
+        sn_FieldLength: 5,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 5,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 66,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 67,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+
+  {
+    qci: 5,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 6,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 12,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 7,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 13,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 8,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 14,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 9,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    en_dc_split: {
+      type: "scg",
+      ul_data_threshold: 0
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 15,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 3,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 69,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 4,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 70,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+]
\ No newline at end of file

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

+// DRB configuration for LTE cell {{ cell_ref }}.
+// DRB configuration vary in beteen FDD and TDD modes.
+
+// {{ cell.rf_mode | upper }}
+{%- if cell.rf_mode == 'tdd' %}
+#define T_REORDERING 65
+{%- else %}
+#define T_REORDERING 35
+{%- endif %}
+
+[
+  {
+    qci: 1,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 7,
+
+
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+
+
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 5,
+      },
+      dl_um: {
+        sn_FieldLength: 5,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 2,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 9,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 3,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 8,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 4,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 10,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 65,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 7,
+
+
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+
+
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 5,
+      },
+      dl_um: {
+        sn_FieldLength: 5,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 5,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 66,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 67,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+
+  {
+    qci: 5,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 6,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 12,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 7,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_Size: 12,
+    },
+    nr_pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 10,
+      },
+      dl_um: {
+        sn_FieldLength: 10,
+        t_Reordering: T_REORDERING,
+      },
+    },
+    logical_channel_config: {
+      priority: 13,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 8,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 14,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 9,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    en_dc_split: {
+      type: "scg",
+      ul_data_threshold: 0
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 15,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 3,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 69,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 4,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+  {
+    qci: 70,
+    pdcp_config: {
+      discardTimer: 0,
+      statusReportRequired: true,
+    },
+    nr_pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+      restrict_to_ng_enb: true,
+    },
+    rlc_config: {
+      ul_am: {
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 32,
+      },
+      dl_am: {
+        t_Reordering: T_REORDERING,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+      logicalChannelSR_Mask: false,
+      logicalChannelSR_Prohibit: false,
+    },
+  },
+]

software/ors-amarisoft/config/enb.cfg

@@ -131,504 +131,7 @@
           },
           manual_ref_signal_power: true,
 
-          drb_config: 
-  [
-  {
-    qci: 1,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
-
-
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 12,
-      pdcp_SN_SizeDL: 12,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-
-
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 5,
-      },
-      dl_um: {
-        sn_FieldLength: 5,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-
-      priority: 7,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 2,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 9,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 3,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 8,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 4,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 10,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 65,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
-
-
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 12,
-      pdcp_SN_SizeDL: 12,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-
-
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 5,
-      },
-      dl_um: {
-        sn_FieldLength: 5,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-
-      priority: 5,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 66,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-
-      priority: 7,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 67,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 6,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-
-  {
-    qci: 5,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 6,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 6,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 12,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 7,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 13,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 8,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 14,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 9,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-    },
-    en_dc_split: {
-      type: "scg",
-      ul_data_threshold: 0
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 15,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 3,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 69,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 4,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 70,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 11,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  ]
+          drb_config: "CELL1_a-drb.cfg"
         },
 
         // CELL1_b  (_CELL1_a_ru)
@@ -718,504 +221,7 @@
           },
           manual_ref_signal_power: true,
 
-          drb_config: 
-  [
-  {
-    qci: 1,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
-
-
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 12,
-      pdcp_SN_SizeDL: 12,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-
-
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 5,
-      },
-      dl_um: {
-        sn_FieldLength: 5,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-
-      priority: 7,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 2,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 9,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 3,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 8,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 4,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 10,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 65,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 7,
-
-
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 12,
-      pdcp_SN_SizeDL: 12,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-
-
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 5,
-      },
-      dl_um: {
-        sn_FieldLength: 5,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-
-      priority: 5,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 66,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 150,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-
-      priority: 7,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 67,
-    ims_dedicated_bearer: true,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 6,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-
-  {
-    qci: 5,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 6,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 6,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 12,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 7,
-    pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_Size: 12,
-    },
-    nr_pdcp_config: {
-      discardTimer: 100,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: false,
-      outOfOrderDelivery: false,
-      t_Reordering: 0,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_um: {
-        sn_FieldLength: 10,
-      },
-      dl_um: {
-        sn_FieldLength: 10,
-        t_Reordering: 65,
-      },
-    },
-    logical_channel_config: {
-      priority: 13,
-      prioritisedBitRate: 0,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 8,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 14,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 9,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-    },
-    en_dc_split: {
-      type: "scg",
-      ul_data_threshold: 0
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 15,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 3,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 69,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 4,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 1,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  {
-    qci: 70,
-    pdcp_config: {
-      discardTimer: 0,
-      statusReportRequired: true,
-    },
-    nr_pdcp_config: {
-      discardTimer: 0,
-      pdcp_SN_SizeUL: 18,
-      pdcp_SN_SizeDL: 18,
-      statusReportRequired: true,
-      outOfOrderDelivery: false,
-      restrict_to_ng_enb: true,
-    },
-    rlc_config: {
-      ul_am: {
-        t_PollRetransmit: 80,
-        pollPDU: 64,
-        pollByte: 125,
-        maxRetxThreshold: 32,
-      },
-      dl_am: {
-        t_Reordering: 65,
-        t_StatusProhibit: 10,
-      },
-    },
-    logical_channel_config: {
-      priority: 11,
-      prioritisedBitRate: 8,
-      bucketSizeDuration: 100,
-      logicalChannelGroup: 2,
-      logicalChannelSR_Mask: false,
-      logicalChannelSR_Prohibit: false,
-    },
-  },
-  ]
+          drb_config: "CELL1_b-drb.cfg"
         },
   ],
 

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

@@ -236,7 +236,7 @@
           manual_ref_signal_power: true,
 {%-       endif %}
 
-          drb_config: {{ lte.cell_drb_config(cell) }}
+          drb_config: "{{ cell_ref }}-drb.cfg"
         },
 {%-   endif %}
 {%- endfor %}

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

@@ -9,8 +9,8 @@ from slapos.recipe.template import jinja2_template
 import json, copy, sys, pprint
 
 
-# j2render renders config/<config>.jinja2.cfg into config/<config>.cfg with provided json parameters.
-def j2render(config, jcfg):
+# j2render renders config/<src> into config/<out> with provided json parameters.
+def j2render(src, out, jcfg):
     ctx = json.loads(jcfg)
     assert '_standalone' not in ctx
     ctx['_standalone'] = True
@@ -23,8 +23,8 @@ def j2render(config, jcfg):
     buildout = None # stub
     r = jinja2_template.Recipe(buildout, "recipe", {
       'extensions': 'jinja2.ext.do',
-      'url': 'config/{}.jinja2.cfg'.format(config),
-      'output': 'config/{}.cfg'.format(config),
+      'url': 'config/{}'.format(src),
+      'output': 'config/{}'.format(out),
       'context': textctx,
       'import-list': '''
         rawfile amari_lte.jinja2  amari/lte.jinja2
@@ -43,7 +43,7 @@ def j2render(config, jcfg):
         'pprint': lambda obj:    pprint.pprint(obj, sys.stderr),
     })
 
-    with open('config/{}.cfg'.format(config), 'w+') as f:
+    with open('config/{}'.format(out), 'w+') as f:
       f.write(r._render().decode())
 
 
@@ -66,6 +66,12 @@ class Instance:
         self.shared_instance_list.append(ishared)
         return ishared
 
+# py version of jref_of_shared.
+def ref_of_shared(ishared):
+    ref = ishared['slave_title']
+    ref = ref.removeprefix('_')
+    return ref
+
 
 # ---- eNB ----
 
@@ -298,7 +304,20 @@ def do_enb():
         }
     }""" % locals()
 
-    j2render('enb', json_params)
+    j2render('enb.jinja2.cfg', 'enb.cfg', json_params)
+
+    # drb.cfg for all cells
+    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
+                     }))
 
 
 # ---- UE ----
@@ -366,7 +385,7 @@ def do_ue():
         }
     }""" % locals()
 
-    j2render('ue', json_params)
+    j2render('ue.jinja2.cfg', 'ue.cfg', json_params)
 
 
 def main():