Skip to content

slapos
slapos
Commit 695518f2 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

software/ors-amarisoft: gnb: Move DRB configuration to standalone file 

A preparatory step for multiRU for the same reason as for LTE and also to be
able to support Carrier Aggregation in between NR and LTE cells in the future
(called Dual Connectivity by 3GPP).

/cc @xavier_thompson, @Daetalus
/reviewed-by @jhuge, @lu.xu
/reviewed-on nexedi/slapos!1473
parent accc2c86
Pipeline #31167 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 429 additions and 409 deletions
    software/ors-amarisoft/buildout.hash.cfg
    View file @ 695518f2
    ...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
    [template] [template]
    filename = instance.cfg filename = instance.cfg
    md5sum = 2b12292c66af2bc5b8bf3d5375a4f11c md5sum = 4a38fac68d3a6ca8d9114673cfa42b77
    [amarisoft-stats.jinja2.py] [amarisoft-stats.jinja2.py]
    _update_hash_filename_ = amarisoft-stats.jinja2.py _update_hash_filename_ = amarisoft-stats.jinja2.py
    ...@@ -76,7 +76,7 @@ md5sum = 516f993bb7835710ba08a0cc592f70d1 ...@@ -76,7 +76,7 @@ md5sum = 516f993bb7835710ba08a0cc592f70d1
    [template-gnb] [template-gnb]
    _update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
    md5sum = a64a0d06740f97cd82eeec0932f61004 md5sum = e8e87a50b861d733894eb69e1aefa683
    [template-core-network] [template-core-network]
    _update_hash_filename_ = instance-core-network.jinja2.cfg _update_hash_filename_ = instance-core-network.jinja2.cfg
    ...@@ -106,13 +106,17 @@ md5sum = 8bcf0524a89da28a0329ae598165684b ...@@ -106,13 +106,17 @@ md5sum = 8bcf0524a89da28a0329ae598165684b
    filename = config/drb_lte.jinja2.cfg filename = config/drb_lte.jinja2.cfg
    md5sum = 6c8bdb0ce1d2bdd846a87aa6c5204a9c md5sum = 6c8bdb0ce1d2bdd846a87aa6c5204a9c
    [drb_nr.jinja2.cfg]
    filename = config/drb_nr.jinja2.cfg
    md5sum = 84d3cef8fc7f1c2aed7c348d500f5636
    [sib23.jinja2.asn] [sib23.jinja2.asn]
    filename = config/sib23.jinja2.asn filename = config/sib23.jinja2.asn
    md5sum = a1973ba6e43d40e510d61d461c2d13ac md5sum = a1973ba6e43d40e510d61d461c2d13ac
    [gnb.jinja2.cfg] [gnb.jinja2.cfg]
    filename = config/gnb.jinja2.cfg filename = config/gnb.jinja2.cfg
    md5sum = 003bf8098175415c975a10c102df6b8c md5sum = a4f91c1c9cfd91d000f4845a88cdb38a
    [mme.jinja2.cfg] [mme.jinja2.cfg]
    filename = config/mme.jinja2.cfg filename = config/mme.jinja2.cfg
    ......
    software/ors-amarisoft/config/drb_nr.jinja2.cfg 0 → 100644
    View file @ 695518f2
    // DRB configuration for NR cell.
    [
    {
    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/gnb.jinja2.cfg
    View file @ 695518f2
    ...@@ -583,412 +583,7 @@ ...@@ -583,412 +583,7 @@
    cipher_algo_pref: [], cipher_algo_pref: [],
    integ_algo_pref: [2, 1], integ_algo_pref: [2, 1],
    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }}, inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
    drb_config: [ drb_config: "{{ drb_file }}",
    {
    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,
    },
    },
    ],
    meas_config_desc: { meas_config_desc: {
    a1_report_type: "rsrp", a1_report_type: "rsrp",
    ......
    software/ors-amarisoft/instance-gnb.jinja2.cfg
    View file @ 695518f2
    ...@@ -225,6 +225,7 @@ hash-files = ...@@ -225,6 +225,7 @@ hash-files =
    [config-base] [config-base]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    extensions = jinja2.ext.do extensions = jinja2.ext.do
    extra-context =
    context = context =
    section directory directory section directory directory
    section slap_configuration slap-configuration section slap_configuration slap-configuration
    ...@@ -242,6 +243,12 @@ context = ...@@ -242,6 +243,12 @@ context =
    raw bbu {{ bbu }} raw bbu {{ bbu }}
    raw ru {{ ru }} raw ru {{ ru }}
    import netaddr netaddr import netaddr netaddr
    ${:extra-context}
    [drb-config]
    <= config-base
    url = {{ drb_nr_template }}
    output = ${directory:etc}/drb.cfg
    [gnb-config] [gnb-config]
    <= config-base <= config-base
    ...@@ -251,6 +258,8 @@ url = ${gnb-config-dl:target} ...@@ -251,6 +258,8 @@ url = ${gnb-config-dl:target}
    url = {{ gnb_template }} url = {{ gnb_template }}
    {% endif %} {% endif %}
    output = ${directory:etc}/gnb.cfg output = ${directory:etc}/gnb.cfg
    extra-context =
    key drb_file drb-config:output
    [publish-connection-information] [publish-connection-information]
    <= monitor-publish <= monitor-publish
    ......
    software/ors-amarisoft/instance.cfg
    View file @ 695518f2
    ...@@ -313,6 +313,7 @@ extra-context = ...@@ -313,6 +313,7 @@ extra-context =
    key enb amarisoft:enb key enb amarisoft:enb
    key sdr amarisoft:sdr key sdr amarisoft:sdr
    raw gnb_template ${gnb.jinja2.cfg:target} raw gnb_template ${gnb.jinja2.cfg:target}
    raw drb_nr_template ${drb_nr.jinja2.cfg:target}
    raw amarisoft_stats_template ${amarisoft-stats.jinja2.py:target} raw amarisoft_stats_template ${amarisoft-stats.jinja2.py:target}
    raw amarisoft_rf_info_template ${amarisoft-rf-info.jinja2.py:target} raw amarisoft_rf_info_template ${amarisoft-rf-info.jinja2.py:target}
    raw openssl_location ${openssl:location} raw openssl_location ${openssl:location}
    ......
    software/ors-amarisoft/software-base.cfg
    View file @ 695518f2
    ...@@ -30,6 +30,7 @@ parts += ...@@ -30,6 +30,7 @@ parts +=
    ue-lte.jinja2.cfg ue-lte.jinja2.cfg
    ue-nr.jinja2.cfg ue-nr.jinja2.cfg
    drb_lte.jinja2.cfg drb_lte.jinja2.cfg
    drb_nr.jinja2.cfg
    sib23.jinja2.asn sib23.jinja2.asn
    monitor-httpd-extra-conf monitor-httpd-extra-conf
    # copy all gadget file # copy all gadget file
    ...@@ -117,6 +118,8 @@ destination = ${buildout:directory}/gadget/${:_buildout_section_name_} ...@@ -117,6 +118,8 @@ destination = ${buildout:directory}/gadget/${:_buildout_section_name_}
    filename = enb.jinja2.cfg filename = enb.jinja2.cfg
    [drb_lte.jinja2.cfg] [drb_lte.jinja2.cfg]
    <= copy-config-to-instance <= copy-config-to-instance
    [drb_nr.jinja2.cfg]
    <= copy-config-to-instance
    [sib23.jinja2.asn] [sib23.jinja2.asn]
    <= copy-config-to-instance <= copy-config-to-instance
    filename = sib23.jinja2.asn filename = sib23.jinja2.asn
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7