software/ors: fix tests for UE mode

software/ors-amarisoft/buildout.hash.cfg

@@ -24,7 +24,7 @@ md5sum = 71255edd8b9bfc7460b32b723da01cf8
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = 070b523a15c0ce70dffc907e9215b225
+md5sum = 8d6eb90fc1191c3a1b24200df2ebf4fa
 
 [ru_amarisoft-stats.jinja2.py]
 _update_hash_filename_ = ru/amarisoft-stats.jinja2.py
@@ -124,7 +124,7 @@ md5sum = f07c85916bcb7e4002c8edc3d087c1be
 
 [ue.jinja2.cfg]
 filename = config/ue.jinja2.cfg
-md5sum = 490c0b91c1bfa7b1c2a1f592dd766ab9
+md5sum = 4b0f08b2d8efa506d6165f8b4e0d9578
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

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

@@ -26,8 +26,11 @@
 {%- endif %}
 
 {# instantiate radio units #}
+{%- if ors %}
 {{ slaplte.ru_config(iru_dict, slapparameter_dict, False) }}
-
+{%- else %}
+{{ slaplte.ru_config(iru_dict, slapparameter_dict, True) }}
+{%- endif %}
 
   cell_groups: [{
     // LTE cells
@@ -116,7 +119,11 @@
 {%-   else                              %}
 {%-     do bug('unreachable')   %}
 {%-   endif                             %}
+{%-   if ors %}
       tun_setup_script: "{{ ue_ifup }}",
+{%-   else %}
+      tun_setup_script: "ue_ifup",
+{%-   endif %}
       apn: "internet",
     },
 {%- endfor %}

software/ors-amarisoft/slaplte.jinja2

@@ -411,11 +411,8 @@
 {%-   for ishared in qshared_instance_list  %}
 {%-     set ref = J(jref_of_shared(ishared))  %}
 {%-     set _ = ishared['_']  %}
-{%-     if   'ue_type'   in _ or (ors and 'imsi' in _) %}
+{%-     if   'ue_type'   in _ %}
 {%-       set iue = ishared %}
-{%-       if   ors %}
-{%-         do _.update({'ue_type': 'lte'}) %}
-{%-       endif %}
 {%-       for k, v in defaults['ue'].items()  %}
 {%-         do _.setdefault(k, v) %}
 {%-       endfor  %}