.

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

@@ -61,21 +61,6 @@
               allowed_meas_bandwidth: 6,  // (minimum possible bw)
               antenna_port_1: false,      // (conservative stub)
             },
-            {
-              rat:          "nr",
-              nr_cell_id:   0x77712, // -> PEERCELL2
-              gnb_id_bits:  22,
-              n_id_cell:    75,
-              dl_nr_arfcn:  520000,
-              band:         38,
-              ssb_nr_arfcn: 520090,
-              ul_nr_arfcn:  520000,
-              tac:          321,
-              ssb_subcarrier_spacing: 30,
-              ssb_period: 20,
-              ssb_offset: 0,
-              ssb_duration: 1,
-            },
           ],
 
         // Carrier Aggregation: LTE + LTE

software/ors-amarisoft/config/out/ors/gnb/enb.cfg

@@ -64,15 +64,6 @@
             // Intra-ENB HO
 
             // Inter-ENB HO
-            {
-              rat:          "eutra",
-              cell_id:      0x12345,  // -> PEERCELL1
-              n_id_cell:    35,
-              dl_earfcn:    700,
-              tac:          123,
-              allowed_meas_bandwidth: 6,  // (minimum possible bw)
-              antenna_port_1: false,      // (conservative stub)
-            },
             {
               rat:          "nr",
               nr_cell_id:   0x77712, // -> PEERCELL2

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

@@ -395,7 +395,7 @@ def ORS_enb(ienb):
             'ru_ref':  'RU',
         },
     })
-    return {'out': 'ors/enb', 'jextra': ORS_json}
+    return {'out': 'ors/enb', 'jextra': ORS_json, 'want_nr': False}
 
 def ORS_gnb(ienb):
     ienb.ishared('RU', ORS_ru)
@@ -417,7 +417,7 @@ def ORS_gnb(ienb):
             'ru_ref':  'RU',
         },
     })
-    return {'out': 'ors/gnb', 'jextra': ORS_json}
+    return {'out': 'ors/gnb', 'jextra': ORS_json, 'want_lte': False}
 
 def do_enb():
     for f in (iRU1_SDR_tLTE2_tNR,
@@ -431,11 +431,13 @@ def do_enb():
 
 def _do_enb_with(iru_icell_func):
     ienb = Instance('enb')
-    x = iru_icell_func(ienb)  or  {}
-    out = x.get('out', 'enb/%s' % iru_icell_func.__name__)
+    opt = iru_icell_func(ienb)  or  {}
+    out = opt.get('out', 'enb/%s' % iru_icell_func.__name__)
+    want_lte = opt.get('want_lte', True)
+    want_nr  = opt.get('want_nr',  True)
 
     # add 4 peer nodes
-    if 1:
+    if want_lte:
         ienb.ishared('PEER11', {
             'peer_type':    'lte',
             'x2_addr':      '44.1.1.1',
@@ -444,6 +446,7 @@ def _do_enb_with(iru_icell_func):
             'peer_type':    'lte',
             'x2_addr':      '44.1.1.2',
         })
+    if want_nr:
         ienb.ishared('PEER21', {
             'peer_type':    'nr',
             'xn_addr':      '55.1.1.1',
@@ -454,7 +457,7 @@ def _do_enb_with(iru_icell_func):
         })
 
     # add 2 peer cells
-    if 1:
+    if want_lte:
         ienb.ishared('PEERCELL1', {
             'cell_type':        'lte',
             'cell_kind':        'enb_peer',
@@ -463,6 +466,7 @@ def _do_enb_with(iru_icell_func):
             'dl_earfcn':        700,
             'tac':              123,
         })
+    if want_nr:
         ienb.ishared('PEERCELL2', {
             'cell_type':        'nr',
             'cell_kind':        'enb_peer',
@@ -475,7 +479,7 @@ def _do_enb_with(iru_icell_func):
         })
 
     jshared_instance_list = json.dumps(ienb.shared_instance_list)
-    jextra = x.get('jextra', '')
+    jextra = opt.get('jextra', '')
     json_params = """{
         %(jextra)s
         "sib23_file": "sib2_3.asn",