.

software/ors-amarisoft/buildout.hash.cfg

@@ -88,7 +88,7 @@ md5sum = e71b1d10676e5ffa5dc96db88d6f5bae
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 8b8ef94c35e99a0754fa8b8635bc5221
+md5sum = bf3e7f0301c1422b596a83c2cc031390
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg

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

 {#- XXX automatically load this from schema #}
-{%- set ors_defaults = {
+{%- set ors_lte_defaults = {
   "bandwidth": "20MHz",
   "n_antenna_dl": 2,
   "n_antenna_ul": 2,
@@ -17,6 +17,10 @@
   "disable_sdr": false
 } %}
 
+{%- for k,v in ors_lte_defaults|dictsort %}
+{%-   do slapparameter_dict.setdefault(k, v) %}
+{%- endfor %}
+
 {# inject ru/cell shared instances synthesized from ORS-specific parameters
    make real ru/cell shared instances to be rejected #}
 {%- set ishared_list = slap_configuration.setdefault('slave-instance-list', [])  %}
@@ -33,8 +37,8 @@
       'ru_type':      'sdr',
       'ru_link_type': 'sdr',
       'sdr_dev_list': [0],
-      'n_antenna_dl': slapparameter_dict.get('n_antenna_dl', ors_defaults.n_antenna_dl),
-      'n_antenna_ul': slapparameter_dict.get('n_antenna_ul', ors_defaults.n_antenna_ul),
+      'n_antenna_dl': slapparameter_dict.n_antenna_dl,
+      'n_antenna_ul': slapparameter_dict.n_antenna_ul,
       'tx_gain':      ors_version['current-tx-gain'],
       'rx_gain':      ors_version['current-rx-gain'],
       'txrx_active':  'XXX',
@@ -46,19 +50,19 @@
     'slave_title':  '%s_CELL' % 'XXX',
     '_': {
       'cell_type':  'lte',
-      'rf_mode':    slapparameter_dict.get('rf_mode', ors_defaults.rf_mode),
-      'pci':        slapparameter_dict.get('pci',     ors_defaults.pci),
-      'cell_id':    slapparameter_dict.get('cell_id', ors_defaults.cell_id),
-      'root_sequence_index':  slapparameter_dict.get('root_sequence_index', ors_defaults.root_sequence_index),
+      'rf_mode':    slapparameter_dict.rf_mode,
+      'pci':        slapparameter_dict.pci,
+      'cell_id':    slapparameter_dict.cell_id,
+      'root_sequence_index':  slapparameter_dict.root_sequence_index,
       'ru': {
         'ru_type':  'ru_ref',
         'ru_ref':   'RU',
       },
 
-      'tdd_ul_dl_config': slapparameter_dict('tdd_ul_dl_config', ors_defaults.tdd_ul_dl_config),
-      'bandwidth':  slapparameter_dict.get('bandwidth', ors_defaults.bandwidth),
-      'dl_earfcn':  slapparameter_dict.get('dl_earfcn', ors_defaults.dl_earfcn),
-      'tac':        slapparameter_dict.get('tac',       ors_defaults.tac)
+      'tdd_ul_dl_config': slapparameter_dict.tdd_ul_dl_config,
+      'bandwidth':  slapparameter_dict.bandwidth,
+      'dl_earfcn':  ors_version['current-earfcn'],
+      'tac':        slapparameter_dict.tac,
     } |tojson
   })
 %}