.

software/ors-amarisoft/buildout.hash.cfg

@@ -24,11 +24,11 @@ md5sum = 8bd6d5390f33cf1d56502b49cf9da52f
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = ac61569bcdfec494e92181e9fc465bc4
+md5sum = dc3bff7742d78a7831748a51659f63a4
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 7df061e692f506912f249b034ccc53af
+md5sum = e8eeeb424932cb189f84756a34b65e36
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = 6434819165cefda0ed9f9ecd46f39e46
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = 6b8337ec25389be572c10ea512c97adc
+md5sum = 155a5df1a0ba6c133bced5b674c88400
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg

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

@@ -60,8 +60,11 @@
 
 
 {#- inject ru+cell synthesized from ORS-specific parameters #}
+{%- macro iref(name)  %}
+{{-   '%s.%s' % (slap_configuration['instance-title'], name)  -}}
+{%- endmacro  %}
 {%- do ishared_list.append({
-      'slave_title':      '_%s_RU' % slap_configuration['slap-computer-partition-id'],
+      'slave_title':      iref('RU'),
       'slave_reference':  'XXX',
       '_': {
         'ru_type':      'sdr',
@@ -105,12 +108,12 @@
       'inactivity_timer': slapparameter_dict.inactivity_timer,
 
       'ru': { 'ru_type':  'ru_ref',
-              'ru_ref':   '_%s_RU' % slap_configuration['slap-computer-partition-id']}
+              'ru_ref':   iref('RU') }
     })
 %}
 
 {%- do ishared_list.append({
-      'slave_title':      '_%s_CELL' % slap_configuration['slap-computer-partition-id'],
+      'slave_title':      iref('CELL'),
       'slave_reference':  'XXX',
       '_': cell | tojson
     })
@@ -148,7 +151,7 @@
 {%-     do _('nr_band') %}
 {%-   endif %}
 {%-   do ishared_list.append({
-        'slave_title':      '%s.PEERCELL%s' % (slap_configuration['slap-computer-partition-id'], k),
+        'slave_title':      '%s%s' % (iref('PEERCELL'), k),
         'slave_reference':  'XXX',
         '_': peercell | tojson
       })
@@ -160,7 +163,7 @@
 {%- 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_title':      '%s%s' % (iref('X2_PEER'), k),
           'slave_reference':  'XXX',
           '_': {
             'peer_type':  'nr',
@@ -172,7 +175,7 @@
 {%- 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_title':      '%s%s' % (iref('XN_PEER'), k),
           'slave_reference':  'XXX',
           '_': {
             'peer_type':  'nr',