.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,11 +16,11 @@
 
 [template]
 filename = instance.cfg
-md5sum = e962fa9684572bc5fed3346593b386a1
+md5sum = 8932bd346bc2e25d84af1834976a4b54
 
 [template-ors]
 filename = instance-ors.cfg
-md5sum = 3d823aa93bb8e8999d63f54d5f5541d1
+md5sum = 678dd3a3dc307e5791bb81a6a560fc6f
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
@@ -84,11 +84,11 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 27e765b00d7ed13a75f87101922a53ea
+md5sum = e71b1d10676e5ffa5dc96db88d6f5bae
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 995ece7f3e487bd3fd5d8ebf52e09a71
+md5sum = 7ea501414d75d11489a339ad78f80058
 
 [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 = 83d131e3b5368ad4707a1a713f5cb1cc
+md5sum = d3bcfb537e246ac241898a6da2fcad5e
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

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

@@ -385,7 +385,7 @@
     integ_algo_pref: [2, 1],
 
     // XXX -> cell ?
-    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_lte_inactivity_timer']) }},
+    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', defaults.lte_inactivity_timer) }},
 
     srb_config: [
       {
@@ -961,7 +961,7 @@
     },
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
-    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
+    inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', defaults.nr_inactivity_timer) }},
 
     meas_config_desc: {
       a1_report_type: "rsrp",

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

@@ -67,9 +67,6 @@ configuration.com_addr = 127.0.1.2
 configuration.mme_addr = 127.0.1.100
 configuration.amf_addr = 127.0.1.100
 configuration.gtp_addr = 127.0.1.1
-# XXX -> ru ?
-configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
-configuration.default_nr_inactivity_timer  = {{ default_nr_inactivity_timer }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

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

@@ -6,12 +6,16 @@
     '_': {
       'ru_type':      'sdr',
       'ru_link_type': 'sdr',
-      'sdr_dev_list': [0],
-      'n_antenna_dl': 'XXX',
-      'n_antenna_ul': 'XXX',
+      'n_antenna_dl': slapparameter_dict.get('n_antenna_dl', defaults.n_antenna_dl),
+      'n_antenna_ul': slapparameter_dict.get('n_antenna_ul', defaults.n_antenna_ul),
       'tx_gain':      ors_version['current-tx-gain'],
       'rx_gain':      ors_version['current-rx-gain'],
       'txrx_active':  'XXX',
+
+      'sdr_dev_list': [0],
+      '_rf_port':     0,
+      '_rf_chan_tx':  0,
+      '_rf_chan_rx':  0,
     }
   }
 } %}

software/ors-amarisoft/instance-ors.cfg

@@ -172,3 +172,11 @@ init =
       power_estimate_s = "{:0.2f} mW".format(power_estimate_mw)
     power_estimate = "{:0.2f} dBm ({})".format(power_estimate_dbm, power_estimate_s)
   options['power-estimate'] = power_estimate
+
+
+# ----------------------------------------
+
+# XXX move to instance-ors.cfg.defaults + autosync from json schemas ?
+[defaults]
+n_antenna_dl = 2
+n_antenna_ul = 2

software/ors-amarisoft/instance.cfg

@@ -133,6 +133,7 @@ extra-context =
     raw monitor_template ${monitor2-template:output}
     section comp_id comp-id
     section slap_configuration slap-configuration
+    section defaults defaults
     key lte_version amarisoft:lte-version
     key lte_expiration amarisoft:lte-expiration
     key enb amarisoft:enb
@@ -156,8 +157,6 @@ extra-context =
     raw ru_tapsplit ${ru_tapsplit:target}
     raw netcapdo ${netcapdo:exe}
     raw openssl_location ${openssl:location}
-    raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
-    raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
     raw ru_dnsmasq_template   ${ru_dnsmasq.jinja2.cfg:target}
     raw dnsmasq_location ${dnsmasq:location}
     raw fluent_bit_location ${fluent-bit:location}
@@ -205,3 +204,16 @@ output = $${directory:etc}/$${:filename}
 context =
     import json_module json
     key slave_instance_list slap-configuration:slave-instance-list
+
+
+# ----------------------------------------
+
+# 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/software-ors.cfg

@@ -24,9 +24,3 @@ output = ${buildout:directory}/template.cfg
 <= download-base
 [template-ors-gnb]
 <= download-base
-
-# XXX set [default-params] ?
-# default_n_antenna_dl = 2
-# default_n_antenna_ul = 2
-# default_lte_bandwidth = 20MHz
-# default_lte_inactivity_timer = 10000

software/ors-amarisoft/software.cfg

@@ -2,13 +2,3 @@
 [buildout]
 extends =
   software-base.cfg
-
-# XXX temp hack  -> either cell configuration, or other conf(?)
-[default-params]
-default-lte-inactivity-timer = 10000
-default-lte-imsi = 001010123456789
-default-lte-k = 00112233445566778899aabbccddeeff
-
-default-nr-inactivity-timer = 10000
-default-nr-imsi = 001010123456789
-default-nr-k = 00112233445566778899aabbccddeeff