.

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

@@ -131,17 +131,16 @@
   ],
 {%- endif %}
 
-{#- X2/Xn TODO:  add info about peers as shared instances - one instance per peer *ENB*.
+{#- X2/Xn peers
+    TODO: add info about peers as shared instances - one instance per peer *ENB*.
           then query SlapOS Master about cells configured on that peer ENB and
           depending on whether LTE and/or NR cells are there add X2 and/or Xn peers #}
-{# XXX move ^^^ ? #}
-{% if slapparameter_dict.get('xn_peers', '') %}
-  xn_peers: [
-{%- for k in slapparameter_dict['xn_peers'] -%}
-    "{{ slapparameter_dict['xn_peers'][k]['xn_addr'] }}",
-{%- endfor -%}
-  ],
-{% endif %}
+  x2_peers: {{ slapparameter_dict.get('x2_peers', {}) | dictsort
+               | map(attribute='1.x2_addr')
+               | list | tojson }},
+  xn_peers: {{ slapparameter_dict.get('xn_peers', {}) | dictsort
+               | map(attribute='1.xn_addr')
+               | list | tojson }},
 
 
 {% if slapparameter_dict.get('mme_list', '')  or  slapparameter_dict.get('afm_list', '') %}

software/ors-amarisoft/config/out/enb.cfg

@@ -38,7 +38,8 @@
       afm_addr: "127.0.1.100",
     },
   ],
-
+  x2_peers: ["2_abc", "2_def"],
+  xn_peers: ["n_abc", "n_def"],
 
 
 

software/ors-amarisoft/slapos-render-config.py

@@ -325,6 +325,8 @@ def do_enb():
             "var": "var"
         },
         "slapparameter_dict": {
+          "x2_peers": {"1": {"x2_addr": "2_abc"}, "2": {"x2_addr": "2_def"}},
+          "xn_peers": {"1": {"xn_addr": "n_abc"}, "2": {"xn_addr": "n_def"}}
         }
     }""" % locals()