.

software/ors-amarisoft/buildout.hash.cfg

@@ -20,7 +20,7 @@ md5sum = f5ee9dcf510ade641eae97902cd6436b
 
 [template-ors]
 filename = instance-ors.cfg
-md5sum = 3d823aa93bb8e8999d63f54d5f5541d1
+md5sum = f6921905edd8294e2c2c9920d17f4c5b
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
@@ -88,7 +88,7 @@ md5sum = 99e66586605c675fee015c293abf61b0
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 2998167a517dcdda3833c0fc6482cf97
+md5sum = 49531f7f4721db1bbad237f1aae1f906
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg
@@ -125,7 +125,7 @@ md5sum = 328c4760ef188c1cccc2ef3c7b68b7f3
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
-md5sum = 6bca6fc2c79b6dde48178f6f6b3ace54
+md5sum = cbb893a0dd9de6b8f54bcfc21928bad2
 
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg

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

-{#- TODO automatically load ORS/lte defaults from instance-ors-enb-input-schema.json #}
-{%- set ors_lte_defaults = {
+{#- TODO automatically load ORS/enb defaults from instance-ors-enb-input-schema.json #}
+{%- set ors_enb_defaults = {
   "bandwidth": "20 MHz",
   "n_antenna_dl": 2,
   "n_antenna_ul": 2,
@@ -17,7 +17,17 @@
   "disable_sdr": false
 } %}
 
-{%- for k,v in ors_lte_defaults|dictsort %}
+{#- TODO automatically load ORS/gnb defaults from instance-ors-gnb-input-schema.json #}
+{#- XXX #}
+{%- set ors_gnb_defaults = {
+} %}
+
+{#- enb_mode indicates with which mode ors is instantiated with - enb | gnb #}
+{%- set enb_mode = slap_configuration['slap-software-type'] %}
+{%- do assert(enb_mode in ('enb', 'gnb'), enb_mode) %}
+
+{%- set ors_defaults = {'enb': ors_enb_defaults, 'gnb': ors_gnb_defaults} [enb_mode]  %}
+{%- for k,v in ors_defaults|dictsort %}
 {%-   do slapparameter_dict.setdefault(k, v) %}
 {%- endfor %}
 
@@ -47,10 +57,8 @@
   })
 %}
 
-{%- do ishared_list.append({
-    'slave_title':      '%s_CELL' % slap_configuration['slap-computer-partition-id'],
-    'slave_reference':  'XXX',
-    '_': {
+{%- if enb_mode == 'enb' %}
+{%-   set cell = {
       'cell_type':  'lte',
       'rf_mode':    slapparameter_dict.rf_mode,
       'pci':        slapparameter_dict.pci,
@@ -65,7 +73,16 @@
       'dl_earfcn':  ors_version['current-earfcn'],
       'tac':        slapparameter_dict.tac,
       'inactivity_timer': slapparameter_dict.inactivity_timer,
-    } |tojson
+    }
+%}
+{%- elif enb_mode == 'gnb' %}
+{% do assert(False, "zzz")  %}
+{%- endif %}
+
+{%- do ishared_list.append({
+    'slave_title':      '%s_CELL' % slap_configuration['slap-computer-partition-id'],
+    'slave_reference':  'XXX',
+    '_': cell | tojson
   })
 %}
 

software/ors-amarisoft/instance-ors.cfg

@@ -23,8 +23,6 @@ extra-context =
 
 # ORS-specific enb and gnb
 # they translate ORS schema to generic enb with only one RU and CELL
-#[dynamic-template-enb]
-#filename = instance-enb-base.cfg
 [dynamic-template-ors-enb]
 < = dynamic-template-enb
 url = ${template-ors-enb:target}