.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,11 +16,11 @@
 
 [template]
 filename = instance.cfg
-md5sum = e8a155d8cbae5b31b9821b986cf0068d
+md5sum = e962fa9684572bc5fed3346593b386a1
 
 [template-ors]
 filename = instance-ors.cfg
-md5sum = 0547ba3414e0a8f2cf98e64b295caa07
+md5sum = 3e9fb689a4fa1663f5abe55a67c35241
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
@@ -28,7 +28,7 @@ md5sum = e36db4e025d102c48ab77a13b6394c4e
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 1558116f58f4a0613f6c73527d78b239
+md5sum = 08f83f950b54a1049bc337bad534bacd
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = 27e765b00d7ed13a75f87101922a53ea
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 549dca9fa126876281d2f47b92570609
+md5sum = 9f8ed13fc0ba0cfaa821c45c12ec2ac2
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg

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

-[buildout]
-extends =
-  {{ dynamic_template_enb_base_output }}
+# predefine ru/cell from ORS-specific schema, not from shared instances.
+{%- set ors_iru_dict = {
+  'RU': {
+    'ru_type':      'sdr',
+    'ru_link_type': 'sdr',
+    'sdr_dev_list': [0],
+    'n_antenna_dl': 'XXX',
+    'n_antenna_ul': 'XXX',
+    'tx_gain':      {{ ors_version['current-tx-gain'] }},
+    'rx_gain':      {{ ors_version['current-rx-gain'] }},
+    'txrx_active':  'XXX',
+  }
+%}
+
+{%- set ors_icell_dict = {
+  'CELL': {
+    cell_type = lte
+    rf_mode = ...
+    pci = ...
+    cell_id = ...
+    root_sequence_index = ...
+    ru = ...
+
+    tdd_ul_dl_config = ...
+    bandwidth = ...
+    dl_earfcn = ...
+    tac = ...
+  }
+%}
+
+{%- include 'instance-enb-base.jinja2.cfg' %}
+
 
 # XXX config-base +=
 # XXX reenable/rethink
 # XXX ors = ors_version |tojson
 {# raw one_watt {{ ors_version['one-watt'] }}               #}
-{# raw tx_gain {{ ors_version['current-tx-gain'] }}         #}
-{# raw rx_gain {{ ors_version['current-rx-gain'] }}         #}
 {# raw earfcn  {{ ors_version['current-earfcn'] }}          #}
 # raw nr_arfcn {{ ors_version['current-nr-arfcn'] }}
 # raw nr_band {{ ors_version['current-nr-band'] }}

software/ors-amarisoft/instance-ors.cfg

@@ -31,7 +31,6 @@ url = ${template-ors-enb:target}
 filename = instance-enb.cfg
 extensions = jinja2.ext.do
 extra-context =
-    raw dynamic_template_enb_base_output $${dynamic-template-enb:output}
     section ors_version ors-version
 
 [ors-version]

software/ors-amarisoft/instance.cfg

@@ -131,7 +131,6 @@ extensions = jinja2.ext.do
 # XXX move RU-specific bits from extra context to ru/...
 extra-context =
     raw monitor_template ${monitor2-template:output}
-#   section ors_version ors-version
     section comp_id comp-id
     section slap_configuration slap-configuration
     key lte_version amarisoft:lte-version

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -16,9 +16,16 @@
     iru_dict:    reference -> iru
     icell_dict:  reference -> icell
 #}
+{%- if not ors  %}
 {%-   set iru_dict   = {}                                              %}
 {%-   set icell_dict = {}                                              %}
 {%-   do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind)  %}
+{%- else  %}
+{#    ORS predefines its RU and CELL and does not allow to configure the via
+      shared instances  #}
+{%-   set iru_dict   = ors_iru_dict %}
+{%-   set icell_dict = ors_icell_dict %}
+{%- endif %}
 
 
 {%- macro buildout()  %}

software/ors-amarisoft/software-ors.cfg

@@ -10,7 +10,6 @@ extends =
 parts +=
   template-ors
 
-# XXX move ors-specific code here
 
 # switch instance.cfg to be installed from instance-ors.cfg instead of template.cfg
 # remember original template.cfg as template-base.cfg
@@ -23,12 +22,9 @@ output = ${buildout:directory}/template.cfg
 
 [template-ors-enb]
 <= download-base
-
 [template-ors-gnb]
 <= download-base
 
-# XXX predefine ru/cells from ORS-specific schema, not from shared instances.
-
 # XXX set [default-params] ?
 # default_n_antenna_dl = 2
 # default_n_antenna_ul = 2