.

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

+// DRB configuration for NR cell {{ cell_ref }}.
+// XXX (?) DRB configuration vary in beteen FDD and TDD modes.
+
+// {{ cell.rf_mode | upper }}
+// XXX recheck for TDD vs FDD
+[
+  {
+    qci: 1,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 6,
+      },
+      dl_um: {
+        sn_FieldLength: 6,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+    },
+  },
+  {
+    qci: 2,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 8,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+    },
+  },
+  {
+    qci: 3,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+    },
+  },
+  {
+    qci: 4,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 9,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 3,
+    },
+  },
+  {
+    qci: 65,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 6,
+      },
+      dl_um: {
+        sn_FieldLength: 6,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 5,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 66,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 67,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+  {
+    qci: 5,
+    use_for_mr_dc_scg: false,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 6,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 10,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+  {
+    qci: 7,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 6,
+    },
+  },
+  {
+    qci: 8,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 12,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 7,
+    },
+  },
+  {
+    qci: 9,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 13,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 7,
+    },
+  },
+  {
+    qci: 69,
+    use_for_mr_dc_scg: false,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 4,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 70,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+]

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

@@ -843,412 +843,7 @@
     integ_algo_pref: [2, 1],
     inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
 
-    drb_config: [
-    {
-      qci: 1,
-      use_for_mr_dc_scg: false,
-      ims_dedicated_bearer: true,
-      pdcp_config: {
-        discardTimer: 100,
-        pdcp_SN_SizeUL: 12,
-        pdcp_SN_SizeDL: 12,
-        statusReportRequired: false,
-        outOfOrderDelivery: false,
-        t_Reordering: 0,
-      },
-      rlc_config: {
-        ul_um: {
-          sn_FieldLength: 6,
-        },
-        dl_um: {
-          sn_FieldLength: 6,
-          t_Reassembly: 50,
-        },
-      },
-      logical_channel_config: {
-        priority: 7,
-        prioritisedBitRate: 0,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 1,
-      },
-    },
-    {
-      qci: 2,
-      use_for_mr_dc_scg: false,
-      ims_dedicated_bearer: true,
-      pdcp_config: {
-        discardTimer: 150,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: false,
-        outOfOrderDelivery: false,
-        t_Reordering: 0,
-      },
-      rlc_config: {
-        ul_um: {
-          sn_FieldLength: 12,
-        },
-        dl_um: {
-          sn_FieldLength: 12,
-          t_Reassembly: 50,
-        },
-      },
-      logical_channel_config: {
-        priority: 8,
-        prioritisedBitRate: 0,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 1,
-      },
-    },
-    {
-      qci: 3,
-      pdcp_config: {
-        discardTimer: 100,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: false,
-        outOfOrderDelivery: false,
-        t_Reordering: 0,
-      },
-      rlc_config: {
-        ul_um: {
-          sn_FieldLength: 12,
-        },
-        dl_um: {
-          sn_FieldLength: 12,
-          t_Reassembly: 50,
-        },
-      },
-      logical_channel_config: {
-        priority: 7,
-        prioritisedBitRate: 0,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 2,
-      },
-    },
-    {
-      qci: 4,
-      pdcp_config: {
-        discardTimer: 0,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: true,
-        outOfOrderDelivery: false,
-      },
-      rlc_config: {
-        ul_am: {
-          sn_FieldLength: 18,
-          t_PollRetransmit: 80,
-          pollPDU: 64,
-          pollByte: 125,
-          maxRetxThreshold: 4,
-        },
-        dl_am: {
-          sn_FieldLength: 18,
-          t_Reassembly: 80,
-          t_StatusProhibit: 10,
-        },
-      },
-      logical_channel_config: {
-        priority: 9,
-        prioritisedBitRate: 8,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 3,
-      },
-    },
-    {
-      qci: 65,
-      use_for_mr_dc_scg: false,
-      ims_dedicated_bearer: true,
-      pdcp_config: {
-        discardTimer: 100,
-        pdcp_SN_SizeUL: 12,
-        pdcp_SN_SizeDL: 12,
-        statusReportRequired: false,
-        outOfOrderDelivery: false,
-        t_Reordering: 0,
-      },
-      rlc_config: {
-        ul_um: {
-          sn_FieldLength: 6,
-        },
-        dl_um: {
-          sn_FieldLength: 6,
-          t_Reassembly: 50,
-        },
-      },
-      logical_channel_config: {
-        priority: 5,
-        prioritisedBitRate: 0,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 4,
-      },
-    },
-    {
-      qci: 66,
-      use_for_mr_dc_scg: false,
-      ims_dedicated_bearer: true,
-      pdcp_config: {
-        discardTimer: 150,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: false,
-        outOfOrderDelivery: false,
-        t_Reordering: 0,
-      },
-      rlc_config: {
-        ul_um: {
-          sn_FieldLength: 12,
-        },
-        dl_um: {
-          sn_FieldLength: 12,
-          t_Reassembly: 50,
-        },
-      },
-      logical_channel_config: {
-        priority: 7,
-        prioritisedBitRate: 0,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 4,
-      },
-    },
-    {
-      qci: 67,
-      use_for_mr_dc_scg: false,
-      ims_dedicated_bearer: true,
-      pdcp_config: {
-        discardTimer: 100,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: false,
-        outOfOrderDelivery: false,
-        t_Reordering: 0,
-      },
-      rlc_config: {
-        ul_um: {
-          sn_FieldLength: 12,
-        },
-        dl_um: {
-          sn_FieldLength: 12,
-          t_Reassembly: 50,
-        },
-      },
-      logical_channel_config: {
-        priority: 6,
-        prioritisedBitRate: 0,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 5,
-      },
-    },
-    {
-      qci: 5,
-      use_for_mr_dc_scg: false,
-      pdcp_config: {
-        discardTimer: 0,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: true,
-        outOfOrderDelivery: false,
-      },
-      rlc_config: {
-        ul_am: {
-          sn_FieldLength: 18,
-          t_PollRetransmit: 80,
-          pollPDU: 64,
-          pollByte: 125,
-          maxRetxThreshold: 4,
-        },
-        dl_am: {
-          sn_FieldLength: 18,
-          t_Reassembly: 80,
-          t_StatusProhibit: 10,
-        },
-      },
-      logical_channel_config: {
-        priority: 6,
-        prioritisedBitRate: 8,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 4,
-      },
-    },
-    {
-      qci: 6,
-      pdcp_config: {
-        discardTimer: 0,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: true,
-        outOfOrderDelivery: false,
-      },
-      rlc_config: {
-        ul_am: {
-          sn_FieldLength: 18,
-          t_PollRetransmit: 80,
-          pollPDU: 64,
-          pollByte: 125,
-          maxRetxThreshold: 4,
-        },
-        dl_am: {
-          sn_FieldLength: 18,
-          t_Reassembly: 80,
-          t_StatusProhibit: 10,
-        },
-      },
-      logical_channel_config: {
-        priority: 10,
-        prioritisedBitRate: 8,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 5,
-      },
-    },
-    {
-      qci: 7,
-      pdcp_config: {
-        discardTimer: 100,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: false,
-        outOfOrderDelivery: false,
-        t_Reordering: 0,
-      },
-      rlc_config: {
-        ul_um: {
-          sn_FieldLength: 12,
-        },
-        dl_um: {
-          sn_FieldLength: 12,
-          t_Reassembly: 50,
-        },
-      },
-      logical_channel_config: {
-        priority: 11,
-        prioritisedBitRate: 0,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 6,
-      },
-    },
-    {
-      qci: 8,
-      pdcp_config: {
-        discardTimer: 0,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: true,
-        outOfOrderDelivery: false,
-      },
-      rlc_config: {
-        ul_am: {
-          sn_FieldLength: 18,
-          t_PollRetransmit: 80,
-          pollPDU: 64,
-          pollByte: 125,
-          maxRetxThreshold: 4,
-        },
-        dl_am: {
-          sn_FieldLength: 18,
-          t_Reassembly: 80,
-          t_StatusProhibit: 10,
-        },
-      },
-      logical_channel_config: {
-        priority: 12,
-        prioritisedBitRate: 8,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 7,
-      },
-    },
-    {
-      qci: 9,
-      pdcp_config: {
-        discardTimer: 0,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: true,
-        outOfOrderDelivery: false,
-      },
-      rlc_config: {
-        ul_am: {
-          sn_FieldLength: 18,
-          t_PollRetransmit: 80,
-          pollPDU: 64,
-          pollByte: 125,
-          maxRetxThreshold: 4,
-        },
-        dl_am: {
-          sn_FieldLength: 18,
-          t_Reassembly: 80,
-          t_StatusProhibit: 10,
-        },
-      },
-      logical_channel_config: {
-        priority: 13,
-        prioritisedBitRate: 8,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 7,
-      },
-    },
-    {
-      qci: 69,
-      use_for_mr_dc_scg: false,
-      pdcp_config: {
-        discardTimer: 0,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: true,
-        outOfOrderDelivery: false,
-      },
-      rlc_config: {
-        ul_am: {
-          sn_FieldLength: 18,
-          t_PollRetransmit: 80,
-          pollPDU: 64,
-          pollByte: 125,
-          maxRetxThreshold: 4,
-        },
-        dl_am: {
-          sn_FieldLength: 18,
-          t_Reassembly: 80,
-          t_StatusProhibit: 10,
-        },
-      },
-      logical_channel_config: {
-        priority: 4,
-        prioritisedBitRate: 8,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 4,
-      },
-    },
-    {
-      qci: 70,
-      pdcp_config: {
-        discardTimer: 0,
-        pdcp_SN_SizeUL: 18,
-        pdcp_SN_SizeDL: 18,
-        statusReportRequired: true,
-        outOfOrderDelivery: false,
-      },
-      rlc_config: {
-        ul_am: {
-          sn_FieldLength: 18,
-          t_PollRetransmit: 80,
-          pollPDU: 64,
-          pollByte: 125,
-          maxRetxThreshold: 4,
-        },
-        dl_am: {
-          sn_FieldLength: 18,
-          t_Reassembly: 80,
-          t_StatusProhibit: 10,
-        },
-      },
-      logical_channel_config: {
-        priority: 11,
-        prioritisedBitRate: 8,
-        bucketSizeDuration: 100,
-        logicalChannelGroup: 5,
-      },
-    },
-  ],
+    drb_config: "{{ cell_ref }}-drb.cfg",
 
   meas_config_desc: {
     a1_report_type: "rsrp",

software/ors-amarisoft/config/out/CELL1_c-drb.cfg

+// DRB configuration for NR cell CELL1_c.
+// XXX (?) DRB configuration vary in beteen FDD and TDD modes.
+
+// TDD
+// XXX recheck for TDD vs FDD
+[
+  {
+    qci: 1,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 6,
+      },
+      dl_um: {
+        sn_FieldLength: 6,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+    },
+  },
+  {
+    qci: 2,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 8,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+    },
+  },
+  {
+    qci: 3,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+    },
+  },
+  {
+    qci: 4,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 9,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 3,
+    },
+  },
+  {
+    qci: 65,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 6,
+      },
+      dl_um: {
+        sn_FieldLength: 6,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 5,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 66,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 67,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+  {
+    qci: 5,
+    use_for_mr_dc_scg: false,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 6,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 10,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+  {
+    qci: 7,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 6,
+    },
+  },
+  {
+    qci: 8,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 12,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 7,
+    },
+  },
+  {
+    qci: 9,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 13,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 7,
+    },
+  },
+  {
+    qci: 69,
+    use_for_mr_dc_scg: false,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 4,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 70,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+]
\ No newline at end of file

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

@@ -9,7 +9,7 @@ from slapos.recipe.template import jinja2_template
 import json, copy, sys, pprint
 
 
-# j2render renders config/<src> into config/<out> with provided json parameters.
+# j2render renders config/<src> into config/out/<out> with provided json parameters.
 def j2render(src, out, jcfg):
     ctx = json.loads(jcfg)
     assert '_standalone' not in ctx
@@ -24,7 +24,7 @@ def j2render(src, out, jcfg):
     r = jinja2_template.Recipe(buildout, "recipe", {
       'extensions': 'jinja2.ext.do',
       'url': 'config/{}'.format(src),
-      'output': 'config/{}'.format(out),
+      'output': 'config/out/{}'.format(out),
       'context': textctx,
       'import-list': '''
         rawfile amari_lte.jinja2  amari/lte.jinja2
@@ -43,7 +43,7 @@ def j2render(src, out, jcfg):
         'pprint': lambda obj:    pprint.pprint(obj, sys.stderr),
     })
 
-    with open('config/{}'.format(out), 'w+') as f:
+    with open('config/out/{}'.format(out), 'w+') as f:
       f.write(r._render().decode())