.

software/ors-amarisoft/config/enb.cfg

 {
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "log/enb.log",
 
 
@@ -22,12 +22,22 @@
   rx_gain: 50,
   com_addr: "127.0.1.2:9001",
 
+  // XXX only if slapparameter_dict.get('mme_list') || has LTE cell ?
   mme_list: [
     {
       mme_addr: "127.0.1.100",
     },
   ],
 
+  // XXX only if slapparameter_dict.get('afm_list') || has NR cell ?
+  afm_list: [
+    {
+      afm_addr: "127.0.1.100",
+    },
+  ],
+
+
+
   gtp_addr: "127.0.1.1",
 
 

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

@@ -152,7 +152,7 @@
 {#- start of the config -#}
 
 {
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,
 {%- if slapparameter_dict.get('log_phy_debug', False) -%}
     phy.level=debug
 {%- else -%}
@@ -246,16 +246,38 @@
   com_addr: "127.0.1.2:9001",
   {%- endif %}
 
+  // XXX only if slapparameter_dict.get('mme_list') || has LTE cell ?
   mme_list: [
-{%- for _, mme in slapparameter_dict.get('mme_list',
-                                         {'1':{'mme_addr': '127.0.1.100'}})
+{%- for _, mme in slapparameter_dict.get('mme_list', {'1':{'mme_addr': '127.0.1.100'}})
                                         | dictsort %}
     {
       mme_addr: "{{ mme['mme_addr'] }}",
     },
 {%- endfor %}
   ],
-{% if slapparameter_dict.get('mme_list', '') %}
+
+  // XXX only if slapparameter_dict.get('afm_list') || has NR cell ?
+  afm_list: [
+{%- for _, afm in slapparameter_dict.get('afm_list', {'1':{'afm_addr': '127.0.1.100'}})
+                                        | dictsort %}
+    {
+      afm_addr: "{{ afm['afm_addr'] }}",
+    },
+{%- endfor %}
+  ],
+
+{#- X2/Xn TODO:  add info about neighbours as shared instances - one instance per neigh *ENB*.
+          then query SlapOS Master about cells configured on that neigh ENB and
+          depending on whether LTE and/or NR cells are there add X2 and/or Xn peers #}
+{% if slapparameter_dict.get('xn_peers', '') %}
+  xn_peers: [
+{%- for k in slapparameter_dict['xn_peers'] -%}
+    "{{ slapparameter_dict['xn_peers'][k]['xn_addr'] }}",
+{%- endfor -%}
+  ],
+{% endif %}
+
+{% if slapparameter_dict.get('mme_list', '')  or  slapparameter_dict.get('afm_list', '') %}
 {%   if slapparameter_dict.get('use_ipv4', False) %}
   gtp_addr: "{{ gtp_addr_v4 }}",
 {%   else %}