.

software/ors-amarisoft/config/lte.jinja2

@@ -2,7 +2,8 @@
 
 {#- XXX -> nr ? #}
 {%- macro default_ssb_nr_arfcn(dl_nr_arfcn) %}
-{%-   set f = nr.get_frequency(nrarfcn=632628)  %}
+{#- NOTE: rechecked computations wrt https://tech-academy.amarisoft.com/OutOfBox_UEsim_SA.html#Tips_SSB_Frequency #}
+{%-   set f = nr.get_frequency(nrarfcn=dl_nr_arfcn)  %}
 {%-   set gscn = nr.get_gscn_by_frequency(f)-1  %}{# nrarfcn round up, amari down #}
 {%-   set fg = nr.get_frequency_by_gscn(gscn)   %}
 {%-   set fg_arfcn = nr.get_nrarfcn(fg)         %}

software/ors-amarisoft/config/ue-lte.jinja2.cfg

-{%- if   slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '1.4 MHz' %}
-#define N_RB_DL             6
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '3 MHz' %}
-#define N_RB_DL             15
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '5 MHz' %}
-#define N_RB_DL             25
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '10 MHz' %}
-#define N_RB_DL             50
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '15 MHz' %}
-#define N_RB_DL             75
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '20 MHz' %}
-#define N_RB_DL             100
-{%- endif %}
+{#- defaults provide default values for parameters.
+    it should be kept in sync with "default" in json schemas  #}
+{#- XXX opc='milenage' is not meaningful ?  #}
+{%- set defaults = {
+      'ue': {
+        'sim_algo': 'milenage',
+        'opc':      'milenage',
+        'amf':      '0x9001',
+        'sqn':      '000000000000',
+        'impu':     '',
+        'impi':     '',
+        'imsi':     slap_configuration['configuration.default_lte_imsi'],
+        'k':        slap_configuration['configuration.default_lte_k'],
+      }
+    }
+%}
+
+{#- iue_dict keeps ue slave instances:  reference -> iue
+    in the kept instances _ is automatically json-decoded
+#}
+{%- set iue_dict = {}   %}
+{%- for slave in slap_configuration.get('slave-instance-list', [])    %}
+{%-   set ref = J(jref_of_shared(slave))                              %}
+{%-   set _ = J(slave['_'])                                           %}
+{%-   do slave.update({'_': _})                                       %}
+{%-   if   'ue_type'   in _                                           %}
+{%-     set iue = slave                                               %}
+{%-     for k, v in defaults['ue'].items()                            %}
+{%-       do _.setdefault(k, v)                                       %}
+{%-     endfor                                                        %}
+{%-     do iue_dict.update({ref: iue})                                %}
+{%-   else                                                            %}
+{%-     do error(slave, "unknown shared instance type")               %}
+{%-   endif                                                           %}
+{%- endfor                                                            %}
+
+{#- XXX verify ue.ue_type in lte|nr  #}
+
+{#- start of the config -#}
+
 {
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/ue.log",
@@ -18,6 +45,7 @@
   rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}",
   com_addr: "{{ pub_info['com_addr'] }}",
 
+# XXX instantiate RU
 rf_driver: {
     name: "sdr",
     args: "dev0=/dev/sdr0",
@@ -25,6 +53,8 @@ rf_driver: {
 },
   tx_gain: {{ slapparameter_dict.get('tx_gain', 60) }},
   rx_gain: {{ slapparameter_dict.get('rx_gain', 40) }},
+
+
   cell_groups: [{
     multi_ue: true,
     cells: [
@@ -39,20 +69,31 @@ rf_driver: {
     pdcch_decode_opt: false,
     pdcch_decode_opt_threshold: 0.1,
   }],
+
   ue_list: [
+{%- for ue_ref, iue in iue_dict|dictsort  %}
+{%-   set ue = iue['_']                   %}
     {
-    sim_algo: "{{ slapparameter_dict.get('sim_algo', 'milenage') }}",
-    opc: "{{ slapparameter_dict.get('opc', '') }}",
-    amf: {{ slapparameter_dict.get('amf', '0x9001') }},
-    sqn: "{{ slapparameter_dict.get('sqn', '000000000000') }}",
-    impu: "{{ slapparameter_dict.get('impu', '') }}",
-    impi: "{{ slapparameter_dict.get('impi', '') }}",
-    imsi: "{{ slapparameter_dict.get('imsi', slap_configuration['configuration.default_lte_imsi']) }}",
-    K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_lte_k']) }}",
-    rue_addr: "{{ slapparameter_dict.get('rue_addr', '') }}",
-    ue_category: 12,
-    tun_setup_script: "ue-ifup",
-    apn: "internet",
+      sim_algo: "{{ ue.sim_algo }}",
+      opc: "{{ ue.opc }}",
+      amf: {{ ue.amf }},
+      sqn: "{{ ue.sqn }}",
+      impu: "{{ ue.impu }}",
+      impi: "{{ ue.impi }}",
+      imsi: "{{ ue.imsi }}",
+      K: "{{ ue.k }}",
+      rue_addr: "{{ ue.rue_addr }}",
+{%-   if ue.ue_type == 'lte'            %}
+      ue_category: 12,
+{%-   elif ue.ur_type == 'nr'           %}
+      as_release: 15,
+      ue_category: "nr",
+{%-   else                              %}
+{%-     do bug('unreachable')   %}
+{%-   endif                             %}
+      tun_setup_script: "ue-ifup",
+      apn: "internet",
     }
+{%- endfor %}
   ],
 }