.

software/ors-amarisoft/buildout.hash.cfg

@@ -20,15 +20,15 @@ md5sum = 8932bd346bc2e25d84af1834976a4b54
 
 [template-ors]
 filename = instance-ors.cfg
-md5sum = 678dd3a3dc307e5791bb81a6a560fc6f
+md5sum = 3d823aa93bb8e8999d63f54d5f5541d1
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = e36db4e025d102c48ab77a13b6394c4e
+md5sum = 257600bc3a92b1424df7a5d538d7b93e
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 08f83f950b54a1049bc337bad534bacd
+md5sum = a34124efe1d98d66a4645492cc8c1bed
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = e71b1d10676e5ffa5dc96db88d6f5bae
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 7ea501414d75d11489a339ad78f80058
+md5sum = 4b8886e734301e13ace21396785fd652
 
 [template-ors-gnb]
 _update_hash_filename_ = instance-ors-gnb.jinja2.cfg

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

-# predefine ru/cell from ORS-specific schema, not from shared instances.
-{%- set ors_iru_dict = {
-  'RU': {
-    'slave_title':      '%s. RU' % 'XXX',
-    'slave_reference':  'XXX',
+{#- XXX automatically load this from schema #}
+{%- set ors_defaults = {
+  "bandwidth": "20MHz",
+  "n_antenna_dl": 2,
+  "n_antenna_ul": 2,
+  "rf_mode": "tdd",
+  "pci": 1,
+  "cell_id": "0x01",
+  "tac": "0x0001",
+  "root_sequence_index": 204,
+  "enb_id": "0x1A2D0",
+  "gtp_addr": "127.0.1.1",
+  "lte_handover_a3_offset": 6,
+  "lte_handover_a3_time_to_trigger": 480,
+  "inactivity_timer": 10000,
+  "disable_sdr": false
+} %}
+
+{# 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', [])  %}
+{%- for ishared in ishared_list %}
+{%-   set _ = json_module.loads(ishared['_']) %}
+{%-   if 'ru_type' in _  or  'cell_type' in _ %}
+{%-     do ishared.update({'_': {'REJECT': 1}|tojson})  %}
+{%-   endif %}
+{%- endfor  %}
+
+{%- do ishared_list.append({
+    'slave_title':    '%s_RU' % 'XXX',
     '_': {
       'ru_type':      'sdr',
       'ru_link_type': 'sdr',
-      'n_antenna_dl': slapparameter_dict.get('n_antenna_dl', defaults.n_antenna_dl),
-      'n_antenna_ul': slapparameter_dict.get('n_antenna_ul', defaults.n_antenna_ul),
+      '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),
       'tx_gain':      ors_version['current-tx-gain'],
       'rx_gain':      ors_version['current-rx-gain'],
       'txrx_active':  'XXX',
+    } |tojson
+  })
+%}
 
-      'sdr_dev_list': [0],
-      '_rf_port':     0,
-      '_rf_chan_tx':  0,
-      '_rf_chan_rx':  0,
-    }
-  }
-} %}
-
-{%- set ors_icell_dict = {
-  'CELL': {
-    'slave_title':      '%s. CELL' % 'XXX',
-    'slave_reference':  'XXX',
+{%- do ishared_list.append({
+    'slave_title':  '%s_CELL' % 'XXX',
     '_': {
       'cell_type':  'lte',
       'rf_mode':    'XXX',
@@ -39,9 +58,9 @@
       'bandwidth':  'XXX',
       'dl_earfcn':  'XXX',
       'tac':        'XXX',
-    }
-  }
-} %}
+    } |tojson
+  })
+%}
 
 {%- include 'instance-enb-base.jinja2.cfg' %}
 

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

@@ -5,7 +5,7 @@
     importing, use buildout() macro to emit instance-level code to
     handle configured RUs and cells.
 
-    NOTE: before importing package slaplte.jinja2 needs to already loaded as
+    NOTE: before importing package slaplte.jinja2 needs to be already loaded as
 
       {%- import 'slaplte.jinja2'  as slaplte     with context %}
 

software/ors-amarisoft/slaplte.jinja2

@@ -138,7 +138,6 @@
 {#- XXX error(ishared, msg)  vvv is debug stub -#}
 {%- macro error(ishared, msg)   %}
 {%-   set msg = 'E: %s: %s\n' % (J(jref_of_shared(ishared)), msg)   %}
-{%-   do print('\n%s' % msg)                                        %}
 {%-   do assert(False, msg)                                         %}
 {%- endmacro  %}