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 nexedi/slapos!1515

software/ors-amarisoft/buildout.hash.cfg

@@ -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/config/enb.jinja2.cfg

@@ -501,11 +501,20 @@
   nr_cell_list: [
   {
     rf_port: 0,
+    n_antenna_dl: N_ANTENNA_DL,
+    n_antenna_ul: N_ANTENNA_UL,
+
     cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }},
+    n_id_cell: {{ slapparameter_dict.get('pci', 500) }},
     band: {{ nr_band }},
     dl_nr_arfcn: {{ nr_arfcn }},
+    bandwidth: {{ slapparameter_dict.get('nr_bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }},
+
     subcarrier_spacing: 30,
     ssb_pos_bitmap: "{{ slapparameter_dict.get('ssb_pos_bitmap', slap_configuration['configuration.default_nr_ssb_pos_bitmap']) }}",
+
+    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
+
 {%- if slapparameter_dict.get('ncell_list', '') %}
     ncell_list: [
 {%- for i, k in enumerate(slapparameter_dict['ncell_list']) %}
@@ -531,12 +540,6 @@
 {%- endfor -%}
     ],
 {% endif %}
-  },
-  ],
-  nr_cell_default: {
-    bandwidth: {{ slapparameter_dict.get('nr_bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }},
-    n_antenna_dl: N_ANTENNA_DL,
-    n_antenna_ul: N_ANTENNA_UL,
 {%- if bbu == "ors" %}
     manual_ref_signal_power: true,
 {%- if one_watt == "True" %}
@@ -545,6 +548,7 @@
     ss_pbch_block_power: {{ (tx_gain | int) - 35 }},
 {%- endif -%}
 {%- endif %}
+
 {% if tdd_config == 1 %}
     tdd_ul_dl_config: {
       pattern1: {
@@ -576,120 +580,23 @@
       },
     },
 {% endif %}
-    ssb_period: 20,
-    n_id_cell: {{ slapparameter_dict.get('pci', 500) }},
-  plmn_list: [
-{%- if slapparameter_dict.get('plmn_list', '') %}
-{%- for i, k in enumerate(slapparameter_dict['plmn_list']) %}
-{%- if i == 0 -%}
-      {
-{%- else -%}
-      , {
-{%- endif %}
-      plmn: "{{ slapparameter_dict['plmn_list'][k]['plmn'] }}",
-      tac: {{ slapparameter_dict['plmn_list'][k].get('tac', 100) }},
-{%- if slapparameter_dict['plmn_list'][k].get('ranac', '') %}
-      ranac: {{ slapparameter_dict['plmn_list'][k]['ranac'] }},
-{%- endif %}
-      reserved: {{ str(slapparameter_dict['plmn_list'][k].get('reserved', false)).lower() }},
-      nssai: [
-{%- if slapparameter_dict.get('nssai', '') %}
-{%- for j, k in enumerate(slapparameter_dict['nssai']) %}
-{%- if j == 0 %}
-        {
-{%- else -%}
-        , {
-{%- endif %}
-         sst: {{ slapparameter_dict['nssai'][k]['sst'] }},
-{%- if slapparameter_dict['nssai'][k].get('sd', '') %}
-         sd: {{ slapparameter_dict['nssai'][k]['sd'] }},
-{%- endif %}
-        }
-{%- endfor -%}
-{% else %}
-        {
-         sst: 1,
-        },
-{% endif %}
-      ],
-      }
-{%- endfor -%}
-{% else %}
-      {
-      plmn: "00101",
-      tac: 100,
-      reserved: false,
-      nssai: [
-{%- if slapparameter_dict.get('nssai', '') %}
-{%- for j, k in enumerate(slapparameter_dict['nssai']) %}
-{%- if j == 0 %}
-        {
-{%- else -%}
-        , {
-{%- endif %}
-         sst: {{ slapparameter_dict['nssai'][k]['sst'] }},
-{%- if slapparameter_dict['nssai'][k].get('sd', '') %}
-         sd: {{ slapparameter_dict['nssai'][k]['sd'] }},
-{%- endif %}
-        }
-{%- endfor -%}
-{% else %}
-        {
-         sst: 1,
-        },
-{% endif %}
-       ],
-      },
-{%- endif %}
-    ],
-    si_window_length: 40,
-    cell_barred: false,
-    intra_freq_reselection: true,
-    q_rx_lev_min: -70,
-    q_qual_min: -20,
-    root_sequence_index: 1,
-    sr_period: 40,
-    dmrs_type_a_pos: 2,
+
     prach: {
-      prach_config_index: 160,
-      msg1_subcarrier_spacing: 30,
-      msg1_fdm: 1,
 {% if ru == "m2ru" %}
       msg1_frequency_start: 0,
-{% else %}
-      msg1_frequency_start: -1,
 {% endif %}
-      zero_correlation_zone_config: 15,
-      preamble_received_target_power: -110,
-      preamble_trans_max: 7,
-      power_ramping_step: 4,
-      ra_response_window: 20,
-      restricted_set_config: "unrestricted_set",
-      ra_contention_resolution_timer: 64,
-      ssb_per_prach_occasion: 1,
-      cb_preambles_per_ssb: 8,
     },
+
     pdcch: {
 {% if ru == "m2ru" %}
       n_rb_coreset0: 48,
       n_symb_coreset0: 1,
-{% endif %}
-      search_space0_index: 0,
       dedicated_coreset: {
-        rb_start: -1,
-        l_crb: -1,
 {% if ru == "m2ru" %}
         duration: 1,
-{% else %}
-        duration: 0,
 {% endif %}
-        precoder_granularity: "sameAsREG_bundle",
       },
-      css: {
-        n_candidates: [ 0, 0, 4, 0, 0 ],
-      },
-      rar_al_index: 2,
-      si_al_index: 2,
+{% endif %}
 {% if tdd_config == 3 %}
       uss: {
        n_candidates: [ 0, 8, 1, 0, 0 ],
@@ -701,27 +608,30 @@
         dci_0_1_and_1_1: true,
       },
 {% endif %}
-      al_index: 1,
     },
+
     pdsch: {
-      mapping_type: "typeA",
-      dmrs_add_pos: 1,
-      dmrs_type: 1,
-      dmrs_max_len: 1,
 {% if ru == "m2ru" %}
       k0: 0,
       k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
 {% elif tdd_config == 3 %}
       k1: [4, 11], 
 {% endif %}
-      mcs_table: "qam256",
-      rar_mcs: 2,
-      si_mcs: 6,
     },
+
+    pusch: {
+{% if ru == "m2ru" %}
+      k2: 4,
+      msg3_k2: 7,
+{% elif tdd_config == 3 %}
+      k2: [11, 12, 4, 5, 6, 7, 7, 8], 
+      msg3_k2: 7,
+{% endif %}
+    },
+
     csi_rs: {
       nzp_csi_rs_resource: [
         {
-          csi_rs_id: 0,
 #if N_ANTENNA_DL == 1
           n_ports: 1,
           frequency_domain_allocation: "row2",
@@ -745,15 +655,6 @@
 #else
 #error unsupported number of DL antennas
 #endif
-          density: 1,
-          first_symb: 4,
-          rb_start: 0,
-          l_crb: -1,
-          power_control_offset: 0,
-          power_control_offset_ss: 0,
-          period: 80,
-          offset: 1,
-          qcl_info_periodic_csi_rs: 0,
         },
 {% if tdd_config != 3 %}
         {
@@ -822,12 +723,9 @@
         },
 {% endif %}
       ],
+
       nzp_csi_rs_resource_set: [
-        {
-          csi_rs_set_id: 0,
-          nzp_csi_rs_resources: [ 0 ],
-          repetition: false,
-        },
+        {},
 {% if tdd_config != 3 %}
         {
           csi_rs_set_id: 1,
@@ -837,6 +735,179 @@
         },
 {% endif %}
       ],
+
+      csi_resource_config: [
+        {},
+        {},
+{% if tdd_config != 3 %}
+        {
+          csi_rsc_config_id: 2,
+          nzp_csi_rs_resource_set_list: [ 1 ],
+          resource_type: "periodic",
+        },
+{% endif %}
+      ],
+
+      csi_report_config: [
+        {
+#if N_ANTENNA_DL > 1
+          codebook_config: {
+            codebook_type: "type1",
+            sub_type: "typeI_SinglePanel",
+#if N_ANTENNA_DL == 2
+#elif N_ANTENNA_DL == 4
+            n1: 2,
+            n2: 1,
+            codebook_mode: 1,
+#elif N_ANTENNA_DL == 8
+            n1: 4,
+            n2: 1,
+            codebook_mode: 1,
+#endif
+          },
+#endif
+        },
+      ],
+    },
+
+    drb_config: "{{ drb_file }}",
+  },
+  ],
+  nr_cell_default: {
+    ssb_period: 20,
+  plmn_list: [
+{%- if slapparameter_dict.get('plmn_list', '') %}
+{%- for i, k in enumerate(slapparameter_dict['plmn_list']) %}
+{%- if i == 0 -%}
+      {
+{%- else -%}
+      , {
+{%- endif %}
+      plmn: "{{ slapparameter_dict['plmn_list'][k]['plmn'] }}",
+      tac: {{ slapparameter_dict['plmn_list'][k].get('tac', 100) }},
+{%- if slapparameter_dict['plmn_list'][k].get('ranac', '') %}
+      ranac: {{ slapparameter_dict['plmn_list'][k]['ranac'] }},
+{%- endif %}
+      reserved: {{ str(slapparameter_dict['plmn_list'][k].get('reserved', false)).lower() }},
+      nssai: [
+{%- if slapparameter_dict.get('nssai', '') %}
+{%- for j, k in enumerate(slapparameter_dict['nssai']) %}
+{%- if j == 0 %}
+        {
+{%- else -%}
+        , {
+{%- endif %}
+         sst: {{ slapparameter_dict['nssai'][k]['sst'] }},
+{%- if slapparameter_dict['nssai'][k].get('sd', '') %}
+         sd: {{ slapparameter_dict['nssai'][k]['sd'] }},
+{%- endif %}
+        }
+{%- endfor -%}
+{% else %}
+        {
+         sst: 1,
+        },
+{% endif %}
+      ],
+      }
+{%- endfor -%}
+{% else %}
+      {
+      plmn: "00101",
+      tac: 100,
+      reserved: false,
+      nssai: [
+{%- if slapparameter_dict.get('nssai', '') %}
+{%- for j, k in enumerate(slapparameter_dict['nssai']) %}
+{%- if j == 0 %}
+        {
+{%- else -%}
+        , {
+{%- endif %}
+         sst: {{ slapparameter_dict['nssai'][k]['sst'] }},
+{%- if slapparameter_dict['nssai'][k].get('sd', '') %}
+         sd: {{ slapparameter_dict['nssai'][k]['sd'] }},
+{%- endif %}
+        }
+{%- endfor -%}
+{% else %}
+        {
+         sst: 1,
+        },
+{% endif %}
+       ],
+      },
+{%- endif %}
+    ],
+    si_window_length: 40,
+    cell_barred: false,
+    intra_freq_reselection: true,
+    q_rx_lev_min: -70,
+    q_qual_min: -20,
+    root_sequence_index: 1,
+    sr_period: 40,
+    dmrs_type_a_pos: 2,
+    prach: {
+      prach_config_index: 160,
+      msg1_subcarrier_spacing: 30,
+      msg1_fdm: 1,
+      msg1_frequency_start: -1,
+      zero_correlation_zone_config: 15,
+      preamble_received_target_power: -110,
+      preamble_trans_max: 7,
+      power_ramping_step: 4,
+      ra_response_window: 20,
+      restricted_set_config: "unrestricted_set",
+      ra_contention_resolution_timer: 64,
+      ssb_per_prach_occasion: 1,
+      cb_preambles_per_ssb: 8,
+    },
+    pdcch: {
+      search_space0_index: 0,
+      dedicated_coreset: {
+        rb_start: -1,
+        l_crb: -1,
+        duration: 0,
+        precoder_granularity: "sameAsREG_bundle",
+      },
+      css: {
+        n_candidates: [ 0, 0, 4, 0, 0 ],
+      },
+      rar_al_index: 2,
+      si_al_index: 2,
+      al_index: 1,
+    },
+    pdsch: {
+      mapping_type: "typeA",
+      dmrs_add_pos: 1,
+      dmrs_type: 1,
+      dmrs_max_len: 1,
+      mcs_table: "qam256",
+      rar_mcs: 2,
+      si_mcs: 6,
+    },
+    csi_rs: {
+      nzp_csi_rs_resource: [
+        {
+          csi_rs_id: 0,
+          density: 1,
+          first_symb: 4,
+          rb_start: 0,
+          l_crb: -1,
+          power_control_offset: 0,
+          power_control_offset_ss: 0,
+          period: 80,
+          offset: 1,
+          qcl_info_periodic_csi_rs: 0,
+        },
+      ],
+      nzp_csi_rs_resource_set: [
+        {
+          csi_rs_set_id: 0,
+          nzp_csi_rs_resources: [ 0 ],
+          repetition: false,
+        },
+      ],
      csi_im_resource: [
         {
           csi_im_id: 0,
@@ -886,13 +957,6 @@
           csi_im_resource_set_list: [ 0 ],
           resource_type: "periodic",
         },
-{% if tdd_config != 3 %}
-        {
-          csi_rsc_config_id: 2,
-          nzp_csi_rs_resource_set_list: [ 1 ],
-          resource_type: "periodic",
-        },
-{% endif %}
       ],
       csi_report_config: [
         {
@@ -901,22 +965,6 @@
           report_config_type: "periodic",
           period: 80,
           report_quantity: "CRI_RI_PMI_CQI",
-#if N_ANTENNA_DL > 1
-          codebook_config: {
-            codebook_type: "type1",
-            sub_type: "typeI_SinglePanel",
-#if N_ANTENNA_DL == 2
-#elif N_ANTENNA_DL == 4
-            n1: 2,
-            n2: 1,
-            codebook_mode: 1,
-#elif N_ANTENNA_DL == 8
-            n1: 4,
-            n2: 1,
-            codebook_mode: 1,
-#endif
-          },
-#endif
           cqi_table: 2,
           subband_size: "value1",
         },
@@ -951,13 +999,6 @@
       mcs_table: "qam256",
       mcs_table_tp: "qam256",
       ldpc_max_its: 5,
-{% if ru == "m2ru" %}
-      k2: 4,
-      msg3_k2: 7,
-{% elif tdd_config == 3 %}
-      k2: [11, 12, 4, 5, 6, 7, 7, 8], 
-      msg3_k2: 7,
-{% endif %}
       p0_nominal_with_grant: -84,
       msg3_mcs: 4,
       msg3_delta_power: 0,
@@ -979,9 +1020,8 @@
     },
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
-    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
-    drb_config: "{{ drb_file }}",
 
+{#  TODO fully expose nr meas_config_desc in generic SR #}
   meas_config_desc: {
     a1_report_type: "rsrp",
     a1_rsrp: -60,

software/ors-amarisoft/test/test.jinja2.py

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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)