.

software/ors-amarisoft/buildout.hash.cfg

@@ -88,7 +88,7 @@ md5sum = 99e66586605c675fee015c293abf61b0
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 49531f7f4721db1bbad237f1aae1f906
+md5sum = 4679f40aed09c32701c29e4a9b1dc9f5
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg

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

@@ -22,7 +22,7 @@
 {%- set ors_gnb_defaults = {
 } %}
 
-{#- enb_mode indicates with which mode ors is instantiated with - enb | gnb #}
+{#- enb_mode indicates with which mode ors' enb is instantiated with - enb | gnb #}
 {%- set enb_mode = slap_configuration['slap-software-type'] %}
 {%- do assert(enb_mode in ('enb', 'gnb'), enb_mode) %}
 
@@ -31,8 +31,8 @@
 {%-   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 #}
+{# inject ru+cell synthesized from ORS-specific parameters
+   make real ru/cell shared instances to be rejected in ORS mode #}
 {%- set ishared_list = slap_configuration.setdefault('slave-instance-list', [])  %}
 {%- for ishared in ishared_list %}
 {%-   set _ = json_module.loads(ishared['_']) %}
@@ -60,24 +60,33 @@
 {%- if enb_mode == 'enb' %}
 {%-   set cell = {
       'cell_type':  'lte',
+      'dl_earfcn':  ors_version['current-earfcn'],
+
+    }
+%}
+{%- elif enb_mode == 'gnb' %}
+{%-   set cell = {
+      'cell_type':  'nr',
+      'dl_nr_arfcn':  ors_version['current-nr-arfcn'],
+      'nr_band':      ors_version['current-nr-band'],
+    }
+%}
+{%- endif %}
+
+{%- do cell.update({
       '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,
       'bandwidth':  slapparameter_dict.bandwidth,
-      'dl_earfcn':  ors_version['current-earfcn'],
       'tac':        slapparameter_dict.tac,
       'inactivity_timer': slapparameter_dict.inactivity_timer,
-    }
+
+      'ru': { 'ru_type':  'ru_ref',
+              'ru_ref':   'RU' }
+    })
 %}
-{%- elif enb_mode == 'gnb' %}
-{% do assert(False, "zzz")  %}
-{%- endif %}
 
 {%- do ishared_list.append({
     'slave_title':      '%s_CELL' % slap_configuration['slap-computer-partition-id'],
@@ -96,9 +105,6 @@ context -=
 context +=
    json ors {{ ors_version | tojson }}
 
-# raw nr_arfcn {{ ors_version['current-nr-arfcn'] }}
-# raw nr_band {{ ors_version['current-nr-band'] }}
-
 
 # add ORS-specific bits to published information
 [publish-connection-information]