.

software/ors-amarisoft/buildout.hash.cfg

@@ -88,7 +88,7 @@ md5sum = 99e66586605c675fee015c293abf61b0
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 5c1e80ba030683169f598946eab89bda
+md5sum = 944099492d5fd853d57e77696362f643
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg

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

-{#- TODO automatically load ORS/enb defaults from instance-ors-enb-input-schema.json #}
+{#- TODO automatically load ORS/enb and ORS/gnb defaults from JSON schema #}
 {%- set ors_enb_defaults = {
   "bandwidth": "20 MHz",
   "n_antenna_dl": 2,
@@ -17,9 +17,20 @@
   "disable_sdr": false
 } %}
 
-{#- TODO automatically load ORS/gnb defaults from instance-ors-gnb-input-schema.json #}
-{#- XXX #}
 {%- set ors_gnb_defaults = {
+  "nr_bandwidth": 40,
+  "n_antenna_dl": 2,
+  "n_antenna_ul": 2,
+  "rf_mode": "tdd",
+  "tdd_ul_dl_config": "5ms 2UL 7DL 4/6 (default)",
+  "pci": 500,
+  "cell_id": "0x01",
+  "gnb_id": "0x12345",
+  "gnb_id_bits": 28,
+  "nr_handover_a3_offset": 6,
+  "nr_handover_time_to_trigger": 100,
+  "inactivity_timer": 10000,
+  "disable_sdr": false
 } %}
 
 {#- enb_mode indicates with which mode ors' enb is instantiated with - enb | gnb #}
@@ -61,7 +72,7 @@
 {%-   set cell = {
       'cell_type':  'lte',
       'dl_earfcn':  ors_version['current-earfcn'],
-
+      'bandwidth':  slapparameter_dict.bandwidth,
     }
 %}
 {%- elif enb_mode == 'gnb' %}
@@ -69,6 +80,7 @@
       'cell_type':  'nr',
       'dl_nr_arfcn':  ors_version['current-nr-arfcn'],
       'nr_band':      ors_version['current-nr-band'],
+      'bandwidth':    slapparameter_dict.nr_bandwidth,
     }
 %}
 {%- endif %}
@@ -79,7 +91,6 @@
       'cell_id':    slapparameter_dict.cell_id,
       'root_sequence_index':  slapparameter_dict.root_sequence_index,
       'tdd_ul_dl_config': slapparameter_dict.tdd_ul_dl_config,
-      'bandwidth':  slapparameter_dict.bandwidth,
       'tac':        slapparameter_dict.tac,
       'inactivity_timer': slapparameter_dict.inactivity_timer,