.

software/ors-amarisoft/buildout.hash.cfg

@@ -88,7 +88,7 @@ md5sum = e71b1d10676e5ffa5dc96db88d6f5bae
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 14f7c57a82e79f8e8ea7e545707e173c
+md5sum = 0b72942cae324da8dc813f9eae8b9625
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg
@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = d3bcfb537e246ac241898a6da2fcad5e
+md5sum = bc3ec5c4ff7fe336d855b69ebd282586
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

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

-{#- XXX ORS -> provide defaults for: slave_instance_list #}
-
 {%- import 'slaplte.jinja2' as slaplte  with context %}
 {%- set J               = slaplte.J %}
 {%- set jcell_ru_ref    = slaplte.jcell_ru_ref %}
@@ -202,6 +200,8 @@
           root_sequence_index: {{ cell.get('root_sequence_index',
                                     slapparameter_dict.get('root_sequence_index',
                                       204 + i)) }},
+          inactivity_timer: {{ cell.inactivity_timer }},
+
 
           // Handover
 {{- handover_config(cell_ref) }}
@@ -298,8 +298,7 @@
             srs_hopping_bandwidth: 0,
           },
 
-{#- XXX do we want to differentiate whether it is ORS or Amarisoft SDR board ? #}
-{%-       if ru.ru_type == 'sdr'   %}
+{%-       if ors   %}
           manual_ref_signal_power: true,
 {%-       endif %}
 
@@ -384,9 +383,6 @@
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
 
-    // XXX -> cell ?
-    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', defaults.lte_inactivity_timer) }},
-
     srb_config: [
       {
         id: 1,
@@ -468,7 +464,7 @@
           {#- NOTE: NR + LTE Dual Connectivity is setup via EN-DC only - via en_dc_scg_cell_list.
                     nr_dc_scg_cell_list sets up NR+NR Dual Connectivity #}
 
-          // tune NR parameters for the cell  XXX -> sdr/ors ? (see lte ^^^)
+          // tune NR parameters for the cell
         {%- if ors %}
             manual_ref_signal_power: true,
         {%- if ors['one-watt'] %}

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

 {#- XXX automatically load this from schema #}
 {%- set ors_lte_defaults = {
-  "bandwidth": "20MHz",
+  "bandwidth": "20 MHz",
   "n_antenna_dl": 2,
   "n_antenna_ul": 2,
   "rf_mode": "tdd",
@@ -64,6 +64,7 @@
       'bandwidth':  slapparameter_dict.bandwidth,
       'dl_earfcn':  ors_version['current-earfcn'],
       'tac':        slapparameter_dict.tac,
+      'inactivity_timer': slapparameter_dict.inactivity_timer,
     } |tojson
   })
 %}

software/ors-amarisoft/instance.cfg

@@ -210,10 +210,8 @@ context =
 
 # XXX temp hack  -> either cell configuration, or other conf(?)
 [defaults]
-lte_inactivity_timer = 10000
 lte-imsi = 001010123456789
 lte-k = 00112233445566778899aabbccddeeff
 
-nr_inactivity_timer = 10000
 nr-imsi = 001010123456789
 nr-k = 00112233445566778899aabbccddeeff

software/ors-amarisoft/slaplte.jinja2

@@ -16,6 +16,7 @@
 {#- XXX opc='milenage' is not meaningful ?  #}
 {#- XXX txrx_active=ACTIVE for sdr - needed ? (bwcompat for ORS) - if yes -> update ru/sdr/input-schema.json #}
 {#- XXX pci/tac -> move defaults to ORS (cell/* + peercell/*) #}
+{#- XXX add inactivity timer to cell schemas #}
 {%- set defaults = {
       'enb_id': '0x1A2D0',
       'gnb_id': '0x12345',
@@ -31,6 +32,7 @@
       'cell/lte': {
         'pci':  1,
         'tac':  '0x0001',
+        'inactivity_timer': 10000,
       },
 
       'cell/lte/fdd': {
@@ -41,6 +43,7 @@
 
       'cell/nr': {
         'pci':  500,
+        'inactivity_timer': 10000,
       },
       'cell/nr/fdd': {
         'ssb_pos_bitmap':   '1000',