Skip to content

slapos
slapos
Commit 825a5522 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

software/ors-amarisoft: enb.jinja2.cfg: nr: Move tunable parameters from... 

software/ors-amarisoft: enb.jinja2.cfg: nr: Move tunable parameters from nr_cell_default to nr_cell_list

This patch is similar and has the same rationale as the previous patch
(software/ors-amarisoft: enb.jinja2.cfg: lte: Move tunable parameters
from cell_default to cell_list). Please see its description for context
and details.

Like with previous patch I've made sure via json_util that effective gnb
configuration stays exactly the same. Also, since for NR case we move
more code, and also use enb merging feature(*) I tested that the
effective gnb configuration stays exactly the same with both

  * tdd_config = 3  (5ms 8UL 1DL 2/10 (maximum uplink)),	and
  * tdd_config = 1  (5ms 2UL 7DL 4/6 (default))

In all the cases effective gnb configuration stayed exactly the same
before and after this patch which proves that effective configuration
for single cell case remains unchanged.

(*) enb implements merging process for cell/cell_default and
nr_cell/nr_cell_default as demonstrated below:

  cell={a: 10, d:15}  cell_default={a:1, b:2, c:3}       ->  cell={a:10, b:2, c: 3, d: 15}
  cell={x: [{}, 2]}   cell_default={x: [{a:1}]}          ->  cell={x: [{a:1}, 2]}
  cell={x: [{c:11}]}  cell_default={x: [{a:1}, {b:2}]    ->  cell={x: [{a:1, c:11}, {b:2}]}

/cc @lu.xu, @tomo, @xavier_thompson, @Daetalus
/reviewed-by @jhuge
/reviewed-on !1515
parent 4f2d9791
Pipeline #32363 failed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 223 additions and 183 deletions
    software/ors-amarisoft/buildout.hash.cfg
    View file @ 825a5522
    ......@@ -108,7 +108,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
    [enb.jinja2.cfg]
    filename = config/enb.jinja2.cfg
    md5sum = 118ec404449cbe471d7d89f8867a5187
    md5sum = df74334b9713ccadac1d8242e186bf69
    [drb_lte.jinja2.cfg]
    filename = config/drb_lte.jinja2.cfg
    ......
    software/ors-amarisoft/test/test.jinja2.py
    View file @ 825a5522
    ......@@ -184,11 +184,11 @@ def test_gnb_conf1(self):
    if 'tx_gain' in conf and 'rx_gain' in conf:
    self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
    self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
    self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
    self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
    self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
    self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['nr_cell_list'][0]['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16))
    self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits'])
    for p in conf['nr_cell_default']['plmn_list']:
    ......@@ -211,7 +211,7 @@ def test_gnb_conf1(self):
    self.assertEqual(p['nr_cell_id'], int(conf_ncell['nr_cell_id'], 16))
    self.assertEqual(p['tac'], conf_ncell['tac'])
    self.assertEqual(p['band'], conf_ncell['nr_band'])
    tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
    tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
    self.assertEqual(float(tdd_config['period']), 2.5)
    self.assertEqual(int(tdd_config['dl_slots']), 3)
    self.assertEqual(int(tdd_config['dl_symbols']), 10)
    ......
    software/ors-amarisoft/test/testFDD-LOPCOMM.py
    View file @ 825a5522
    ......@@ -184,11 +184,11 @@ def test_gnb_conf1(self):
    if 'tx_gain' in conf and 'rx_gain' in conf:
    self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
    self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
    self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
    self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
    self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
    self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['nr_cell_list'][0]['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16))
    self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits'])
    for p in conf['nr_cell_default']['plmn_list']:
    ......@@ -211,7 +211,7 @@ def test_gnb_conf1(self):
    self.assertEqual(p['nr_cell_id'], int(conf_ncell['nr_cell_id'], 16))
    self.assertEqual(p['tac'], conf_ncell['tac'])
    self.assertEqual(p['band'], conf_ncell['nr_band'])
    tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
    tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
    self.assertEqual(float(tdd_config['period']), 2.5)
    self.assertEqual(int(tdd_config['dl_slots']), 3)
    self.assertEqual(int(tdd_config['dl_symbols']), 10)
    ......
    software/ors-amarisoft/test/testFDD-ORS.py
    View file @ 825a5522
    ......@@ -184,11 +184,11 @@ def test_gnb_conf1(self):
    if 'tx_gain' in conf and 'rx_gain' in conf:
    self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
    self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
    self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
    self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
    self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
    self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['nr_cell_list'][0]['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16))
    self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits'])
    for p in conf['nr_cell_default']['plmn_list']:
    ......@@ -211,7 +211,7 @@ def test_gnb_conf1(self):
    self.assertEqual(p['nr_cell_id'], int(conf_ncell['nr_cell_id'], 16))
    self.assertEqual(p['tac'], conf_ncell['tac'])
    self.assertEqual(p['band'], conf_ncell['nr_band'])
    tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
    tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
    self.assertEqual(float(tdd_config['period']), 2.5)
    self.assertEqual(int(tdd_config['dl_slots']), 3)
    self.assertEqual(int(tdd_config['dl_symbols']), 10)
    ......
    software/ors-amarisoft/test/testFDD.py
    View file @ 825a5522
    ......@@ -184,11 +184,11 @@ def test_gnb_conf1(self):
    if 'tx_gain' in conf and 'rx_gain' in conf:
    self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
    self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
    self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
    self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
    self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
    self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['nr_cell_list'][0]['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16))
    self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits'])
    for p in conf['nr_cell_default']['plmn_list']:
    ......@@ -211,7 +211,7 @@ def test_gnb_conf1(self):
    self.assertEqual(p['nr_cell_id'], int(conf_ncell['nr_cell_id'], 16))
    self.assertEqual(p['tac'], conf_ncell['tac'])
    self.assertEqual(p['band'], conf_ncell['nr_band'])
    tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
    tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
    self.assertEqual(float(tdd_config['period']), 2.5)
    self.assertEqual(int(tdd_config['dl_slots']), 3)
    self.assertEqual(int(tdd_config['dl_symbols']), 10)
    ......
    software/ors-amarisoft/test/testTDD-M2RU.py
    View file @ 825a5522
    ......@@ -184,11 +184,11 @@ def test_gnb_conf1(self):
    if 'tx_gain' in conf and 'rx_gain' in conf:
    self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
    self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
    self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
    self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
    self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
    self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['nr_cell_list'][0]['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16))
    self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits'])
    for p in conf['nr_cell_default']['plmn_list']:
    ......@@ -211,7 +211,7 @@ def test_gnb_conf1(self):
    self.assertEqual(p['nr_cell_id'], int(conf_ncell['nr_cell_id'], 16))
    self.assertEqual(p['tac'], conf_ncell['tac'])
    self.assertEqual(p['band'], conf_ncell['nr_band'])
    tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
    tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
    self.assertEqual(float(tdd_config['period']), 2.5)
    self.assertEqual(int(tdd_config['dl_slots']), 3)
    self.assertEqual(int(tdd_config['dl_symbols']), 10)
    ......
    software/ors-amarisoft/test/testTDD-ORS.py
    View file @ 825a5522
    ......@@ -184,11 +184,11 @@ def test_gnb_conf1(self):
    if 'tx_gain' in conf and 'rx_gain' in conf:
    self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
    self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
    self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
    self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
    self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
    self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['nr_cell_list'][0]['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16))
    self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits'])
    for p in conf['nr_cell_default']['plmn_list']:
    ......@@ -211,7 +211,7 @@ def test_gnb_conf1(self):
    self.assertEqual(p['nr_cell_id'], int(conf_ncell['nr_cell_id'], 16))
    self.assertEqual(p['tac'], conf_ncell['tac'])
    self.assertEqual(p['band'], conf_ncell['nr_band'])
    tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
    tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
    self.assertEqual(float(tdd_config['period']), 2.5)
    self.assertEqual(int(tdd_config['dl_slots']), 3)
    self.assertEqual(int(tdd_config['dl_symbols']), 10)
    ......
    software/ors-amarisoft/test/testTDD.py
    View file @ 825a5522
    ......@@ -184,11 +184,11 @@ def test_gnb_conf1(self):
    if 'tx_gain' in conf and 'rx_gain' in conf:
    self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
    self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
    self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
    self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
    self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
    self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
    self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['nr_cell_list'][0]['n_id_cell'], gnb_param_dict1['pci'])
    self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16))
    self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits'])
    for p in conf['nr_cell_default']['plmn_list']:
    ......@@ -211,7 +211,7 @@ def test_gnb_conf1(self):
    self.assertEqual(p['nr_cell_id'], int(conf_ncell['nr_cell_id'], 16))
    self.assertEqual(p['tac'], conf_ncell['tac'])
    self.assertEqual(p['band'], conf_ncell['nr_band'])
    tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
    tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
    self.assertEqual(float(tdd_config['period']), 2.5)
    self.assertEqual(int(tdd_config['dl_slots']), 3)
    self.assertEqual(int(tdd_config['dl_symbols']), 10)
    ......
    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