.

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

-{
-  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",
-
-  rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}",
-  com_addr: "{{ pub_info['com_addr'] }}",
-
-rf_driver: {
-    name: "sdr",
-    args: "dev0=/dev/sdr0",
-    rx_antenna:"tx_rx",
-    },
-    tx_gain: {{ slapparameter_dict.get('tx_gain', 60) }},
-    rx_gain: {{ slapparameter_dict.get('rx_gain', 40) }},
-
-    cell_groups: [{
-      group_type: "nr",
-      multi_ue: false,
-      cells: [{
-        rf_port: 0,
-        bandwidth: {{ slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }},
-        band: {{ slapparameter_dict.get('nr_band', 0) }},
-        dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', 0) }},
-        ssb_nr_arfcn: {{ slapparameter_dict.get('ssb_nr_arfcn', 0) }},
-        subcarrier_spacing: 30,
-        n_antenna_dl: {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }},
-        n_antenna_ul: {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }},
-        }
-      ],
-    }],
-
-    ue_list: [
-      {
-      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_nr_imsi']) }}",
-      K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_nr_k']) }}",
-      rue_addr: "{{ slapparameter_dict.get('rue_addr', '') }}",
-      as_release: 15,
-      ue_category: "nr",
-      tun_setup_script: "ue-ifup",
-      apn: "internet",
-      }
-    ]
-}

software/ors-amarisoft/render-templates

@@ -36,30 +36,6 @@ software_list = [
             'trx'                          : 'sdr',
             'bbu'                          : 'ors',
             'ru'                           : 'ors',
-        }, {
-            'software_name'                : 'tdd-m2ru',
-            'rf_mode'                      : 'tdd',
-            'trx'                          : 'cpri',
-            'bbu'                          : 'server',
-            'ru'                           : 'm2ru',
-        }, {
-            'software_name'                : 'fdd-lopcomm',
-            'rf_mode'                      : 'fdd',
-            'trx'                          : 'cpri',
-            'bbu'                          : 'server',
-            'ru'                           : 'lopcomm',
-        }, {
-            'software_name'                : 'fdd',
-            'rf_mode'                      : 'fdd',
-            'trx'                          : 'sdr',
-            'bbu'                          : 'server',
-            'ru'                           : 'any',
-        }, {
-            'software_name'                : 'tdd',
-            'rf_mode'                      : 'tdd',
-            'trx'                          : 'sdr',
-            'bbu'                          : 'server',
-            'ru'                           : 'any',
         }
 ]
 
@@ -82,7 +58,7 @@ with open('software.cfg.json.jinja2', 'r') as f:
     software_json_template = Template(f.read())
 
 instance_json_template_map = {}
-for software_type in ['enb', 'gnb', 'ue-lte', 'ue-nr']:
+for software_type in ['enb', 'gnb']:
     with open('instance-{}-input-schema.json.jinja2'.format(software_type), 'r') as f:
         instance_json_template_map[software_type] = Template(f.read())
 
@@ -101,7 +77,7 @@ for software in software_list:
     with open('software-{}.cfg'.format(software['software_name']),
               'w+') as f:
         f.write(software_template.render(**software, **global_context) + '\n')
-    for software_type in ['enb', 'gnb', 'ue-lte', 'ue-nr']:
+    for software_type in ['enb', 'gnb']:
         with open('instance-{}-{}-input-schema.json'.format(
                     software['software_name'],
                     software_type),

software/ors-amarisoft/software.cfg.json.jinja2

@@ -4,12 +4,12 @@
   "serialisation": "json-in-xml",
   "software-type": {
 {% if bbu != 'ors' %}
-    "ue-lte": {
+    "ue": {
       "title": "UE-LTE",
       "description": "UE LTE Configuration",
-      "software-type": "ue-lte",
-      "request": "instance-{{ software_name }}-ue-lte-input-schema.json",
-      "response": "instance-{{ software_name }}-ue-lte-schema.json",
+      "software-type": "ue",
+      "request": "instance-{{ software_name }}-ue-input-schema.json",
+      "response": "instance-{{ software_name }}-ue-schema.json",
       "index": 4
     },
     "ue-nr": {
@@ -54,5 +54,6 @@
       "shared": true,
       "index": 3
     }
+    // XXX enb-slave, ue-slave
   }
 }