.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 8932bd346bc2e25d84af1834976a4b54
+md5sum = f5ee9dcf510ade641eae97902cd6436b
 
 [template-ors]
 filename = instance-ors.cfg
@@ -24,7 +24,7 @@ md5sum = 3d823aa93bb8e8999d63f54d5f5541d1
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = 257600bc3a92b1424df7a5d538d7b93e
+md5sum = 1a89f00de7c46c8158f13954c95338e3
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = e71b1d10676e5ffa5dc96db88d6f5bae
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 0b72942cae324da8dc813f9eae8b9625
+md5sum = ff6193ebedb761f2a7802e33be2933b0
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg

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

@@ -445,6 +445,7 @@
           root_sequence_index: {{ cell.get('root_sequence_index',
                                     slapparameter_dict.get('root_sequence_index',
                                       1 + i)) }},
+          inactivity_timer: {{ cell.inactivity_timer }},
 
           // Handover
 {{- handover_config(cell_ref) }}
@@ -957,7 +958,6 @@
     },
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
-    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', defaults.nr_inactivity_timer) }},
 
     meas_config_desc: {
       a1_report_type: "rsrp",

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

@@ -72,11 +72,12 @@
 {%- include 'instance-enb-base.jinja2.cfg' %}
 
 
+[enb-config]
+extra-context +=
+  json ors {{ ors_version | tojson }}
+
 # XXX config-base +=
 # XXX reenable/rethink
-# XXX ors = ors_version |tojson
-{# raw one_watt {{ ors_version['one-watt'] }}               #}
-{# raw earfcn  {{ ors_version['current-earfcn'] }}          #}
 # raw nr_arfcn {{ ors_version['current-nr-arfcn'] }}
 # raw nr_band {{ ors_version['current-nr-band'] }}
 

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

@@ -362,8 +362,6 @@ def do_enb():
         "slap_configuration": {
             "tap-name": "slaptap9",
             "slap-computer-partition-id": "slappart9",
-            "configuration.default_lte_inactivity_timer": 10000,
-            "configuration.default_nr_inactivity_timer": 10000,
             "configuration.com_ws_port": 9001,
             "configuration.com_addr": "127.0.1.2",
             "configuration.mme_addr": "127.0.1.100",