.

software/ors-amarisoft/buildout.hash.cfg

@@ -92,7 +92,7 @@ md5sum = 29b5a5a61b0498681d480726be9e56bf
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 8edc4511be7204d1096e0c1cc00802e4
+md5sum = 0c7f21fab83a3310bf83663ac3fa49c7
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 43ae4e7f94f2c84cef07a273f6b2e668
+md5sum = f13d4b8acd065dc4e71e7c7a47b1eb5c
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

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

@@ -181,6 +181,7 @@
   en_dc_support: true,
 {%- endif %}
 
+{%- if do_lte %}
   // LTE cells
   cell_list: [
 {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
@@ -409,7 +410,9 @@
   meas_gap_config: "gp0",
   ho_from_meas: true,
   },
+{%- endif %}
 
+{%- if do_nr  %}
   // NR cells
   nr_cell_list: [
 {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
@@ -926,4 +929,5 @@
       pattern_id: 0
     },
   },
+{%- endif %}
 }

software/ors-amarisoft/test/test.sh

@@ -3,7 +3,7 @@
 (cd .. && /usr/bin/python3 ../../update-hash)
 
 export SLAPOS_TEST_DEBUG=1
-export SLAPOS_TEST_VERBOSE=0
+export SLAPOS_TEST_VERBOSE=1
 export SLAPOS_TEST_SKIP_SOFTWARE_CHECK=1 
 export SLAPOS_TEST_SKIP_SOFTWARE_REBUILD=0
 
@@ -12,8 +12,8 @@ mkdir snapshot
 export SLAPOS_TEST_LOG_DIRECTORY=`pwd`/snapshot
 
 #time ../k/kpython_for_test -m unittest discover -v
-time ../k/kpython_for_test -m unittest discover -vf
-#time ../k/kpython_for_test -m unittest discover -vf -k TestENBParameters
+#time ../k/kpython_for_test -m unittest discover -vf
+time ../k/kpython_for_test -m unittest discover -vf -k TestENBParameters
 #time ../k/kpython_for_test -m unittest discover -vf -k NBParameters
 #time ../k/kpython_for_test -m unittest discover -vf -k CoreNetwork
 #time ../k/kpython_for_test -m unittest discover -vf -k MonitorGadget

software/ors-amarisoft/test/test_ors.py

@@ -146,7 +146,8 @@ def test_enb_conf(self):
       self.assertEqual(conf['tx_gain'], [enb_param_dict['tx_gain']] * enb_param_dict['n_antenna_dl'])
       self.assertEqual(conf['rx_gain'], [enb_param_dict['rx_gain']] * enb_param_dict['n_antenna_ul'])
     self.assertEqual(len(conf['cell_list']), 1)
-    self.assertEqual(len(conf['nr_cell_list']), 0)
+    self.assertNotIn('nr_cell_list', conf)
+    self.assertNotIn('nr_cell_default', conf)
     cell = conf['cell_list'][0]
     self.assertEqual(cell['inactivity_timer'], enb_param_dict['inactivity_timer'])
     self.assertEqual(cell['uldl_config'], 6)
@@ -182,7 +183,8 @@ def test_gnb_conf1(self):
         conf = yamlpp_load(conf_file)
         self.assertEqual(conf['tx_gain'], [gnb_param_dict1['tx_gain']] * gnb_param_dict1['n_antenna_dl'])
         self.assertEqual(conf['rx_gain'], [gnb_param_dict1['rx_gain']] * gnb_param_dict1['n_antenna_ul'])
-        self.assertEqual(len(conf['cell_list']), 0)
+        self.assertNotIn('cell_list', conf)
+        self.assertNotIn('cell_default', conf)
         self.assertEqual(len(conf['nr_cell_list']), 1)
         nr_cell = conf['nr_cell_list'][0]
         self.assertEqual(nr_cell['inactivity_timer'], gnb_param_dict1['inactivity_timer'])