.

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

@@ -61,19 +61,19 @@
 
 {#- inject ru+cell synthesized from ORS-specific parameters #}
 {%- do ishared_list.append({
-    'slave_title':      '%s_RU' % slap_configuration['slap-computer-partition-id'],
-    'slave_reference':  'XXX',
-    '_': {
-      'ru_type':      'sdr',
-      'ru_link_type': 'sdr',
-      'sdr_dev_list': [0],
-      'n_antenna_dl': slapparameter_dict.n_antenna_dl,
-      'n_antenna_ul': slapparameter_dict.n_antenna_ul,
-      'tx_gain':      ors_version['current-tx-gain'],
-      'rx_gain':      ors_version['current-rx-gain'],
-      'txrx_active':  'ACTIVE',
-    } |tojson
-  })
+      'slave_title':      '%s.RU' % slap_configuration['slap-computer-partition-id'],
+      'slave_reference':  'XXX',
+      '_': {
+        'ru_type':      'sdr',
+        'ru_link_type': 'sdr',
+        'sdr_dev_list': [0],
+        'n_antenna_dl': slapparameter_dict.n_antenna_dl,
+        'n_antenna_ul': slapparameter_dict.n_antenna_ul,
+        'tx_gain':      ors_version['current-tx-gain'],
+        'rx_gain':      ors_version['current-rx-gain'],
+        'txrx_active':  'ACTIVE',
+      } |tojson
+    })
 %}
 
 {%- if enb_mode == 'enb' %}
@@ -109,10 +109,10 @@
 %}
 
 {%- do ishared_list.append({
-    'slave_title':      '%s_CELL' % slap_configuration['slap-computer-partition-id'],
-    'slave_reference':  'XXX',
-    '_': cell | tojson
-  })
+      'slave_title':      '%s.CELL' % slap_configuration['slap-computer-partition-id'],
+      'slave_reference':  'XXX',
+      '_': cell | tojson
+    })
 %}
 
 
@@ -147,16 +147,38 @@
 {%-     do _('nr_band') %}
 {%-   endif %}
 {%-   do ishared_list.append({
-      'slave_title':      '%s_PEERCELL%s' % (slap_configuration['slap-computer-partition-id'], k),
-      'slave_reference':  'XXX',
-      '_': peercell | tojson
+        'slave_title':      '%s.PEERCELL%s' % (slap_configuration['slap-computer-partition-id'], k),
+        'slave_reference':  'XXX',
+        '_': peercell | tojson
       })
 %}
 {%- endfor %}
 
 
 {#- inject synthesized peers #}
-{%- for k, peer in slapparameter_dict.xn_peers|dictsort %}
+{%- if enb_mode == 'lte' %}
+{%-   for k, peer in slapparameter_dict.x2_peers|dictsort %}
+{%-     do ishared_list.append({
+          'slave_title':      '%s.X2_PEER%s' % (slap_configuration['slap-computer-partition-id'], k),
+          'slave_reference':  'XXX',
+          '_': {
+            'peer_type':  'nr',
+            'x2_addr':    peer.x2_addr,
+          } | tojson
+        })
+%}
+{%- elif enb_mode == 'nr' %}
+{%-   for k, peer in slapparameter_dict.xn_peers|dictsort %}
+{%-     do ishared_list.append({
+          'slave_title':      '%s.XN_PEER%s' % (slap_configuration['slap-computer-partition-id'], k),
+          'slave_reference':  'XXX',
+          '_': {
+            'peer_type':  'nr',
+            'xn_addr':    peer.xn_addr
+          } | tojson
+        })
+%}
+{%- endif %}
 {%- endfor  %}