software/ors-amarisoft: ue: Make default K and IMSI to be common for LTE and NR

K and IMSI are orthogonal to RAT and, similarly to how we keep default
n_antenna_dl/ul independent of RAT we can do so with this default UE parameters.

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

@@ -61,14 +61,12 @@ rf_driver: {
     sqn: "{{ slapparameter_dict.get('sqn', '000000000000') }}",
     impu: "{{ slapparameter_dict.get('impu', '') }}",
     impi: "{{ slapparameter_dict.get('impi', '') }}",
+    imsi: "{{ slapparameter_dict.get('imsi', default_imsi) }}",
+    K: "{{ slapparameter_dict.get('k', default_k) }}",
 {%- if do_lte %}
-    imsi: "{{ slapparameter_dict.get('imsi', default_lte_imsi) }}",
-    K: "{{ slapparameter_dict.get('k', default_lte_k) }}",
     ue_category: 12,
 {%- endif %}
 {%- if do_nr  %}
-    imsi: "{{ slapparameter_dict.get('imsi', default_nr_imsi) }}",
-    K: "{{ slapparameter_dict.get('k', default_nr_k) }}",
     as_release: 15,
     ue_category: "nr",
 {%- endif %}

software/ors-amarisoft/instance-ue-lte-input-schema.json.jinja2

@@ -54,13 +54,13 @@
       "title": "IMSI",
       "description": "IMSI",
       "type": "string",
-      "default": "{{ default_lte_imsi }}"
+      "default": "{{ default_imsi }}"
     },
     "k": {
       "title": "K",
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
-      "default": "{{ default_lte_k }}"
+      "default": "{{ default_k }}"
     },
     "sim_algo": {
       "title": "sim_algo",

software/ors-amarisoft/instance-ue-nr-input-schema.json.jinja2

@@ -56,13 +56,13 @@
       "title": "IMSI",
       "description": "IMSI",
       "type": "string",
-      "default": "{{ default_nr_imsi }}"
+      "default": "{{ default_imsi }}"
     },
     "k": {
       "title": "K",
       "description": "Set the user secret key (as a 16 bytes hexadecimal string, or eventually 32 bytes hexadecimal string for TUAK).",
       "type": "string",
-      "default": "{{ default_nr_k }}"
+      "default": "{{ default_k }}"
     },
     "sim_algo": {
       "title": "sim_algo",

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

@@ -104,10 +104,8 @@ context =
   raw default_nr_bandwidth {{ default_nr_bandwidth }}
   raw default_n_antenna_dl {{ default_n_antenna_dl }}
   raw default_n_antenna_ul {{ default_n_antenna_ul }}
-  raw default_lte_imsi {{ default_lte_imsi }}
-  raw default_nr_imsi {{ default_nr_imsi }}
-  raw default_lte_k {{default_lte_k}}
-  raw default_nr_k {{ default_nr_k }}
+  raw default_imsi {{ default_imsi }}
+  raw default_k {{default_k}}
   json do_lte {{ do_lte | tojson }}
   json do_nr  {{ do_nr  | tojson }}
 

software/ors-amarisoft/instance.cfg

@@ -194,10 +194,8 @@ extra-context =
     raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
     raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
     raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
-    raw default_lte_imsi ${default-params:default-lte-imsi}
-    raw default_nr_imsi ${default-params:default-nr-imsi}
-    raw default_lte_k ${default-params:default-lte-k}
-    raw default_nr_k ${default-params:default-nr-k}
+    raw default_imsi ${default-params:default-imsi}
+    raw default_k ${default-params:default-k}
 
 [ue-db-config]
 recipe = slapos.recipe.template:jinja2

software/ors-amarisoft/render-templates

@@ -55,16 +55,14 @@ software_list = [
 for i in range (len(software_list)):
     software_list[i].update({
             'default_lte_bandwidth'        : "20 MHz",
-            'default_lte_imsi'             : "001010123456789",
-            'default_lte_k'                : "00112233445566778899aabbccddeeff",
             'default_lte_inactivity_timer' : 10000,
             'default_nr_bandwidth'         : 40,
-            'default_nr_imsi'              : "001010123456789",
-            'default_nr_k'                 : "00112233445566778899aabbccddeeff",
             'default_nr_ssb_pos_bitmap'    : "10000000",
             'default_n_antenna_dl'         : 2,
             'default_n_antenna_ul'         : 2,
             'default_nr_inactivity_timer' : 10000,
+            'default_imsi'                 : "001010123456789",
+            'default_k'                    : "00112233445566778899aabbccddeeff",
     })
 
 with open('software.cfg.json.jinja2', 'r') as f:

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

@@ -81,12 +81,10 @@ def do(src, out, rat, slapparameter_dict):
             "tap-name": "slaptap9"
         },
         "default_lte_bandwidth": "10 MHz",
-        "default_lte_imsi": "001010123456789",
-        "default_lte_k": "00112233445566778899aabbccddeeff",
+        "default_imsi": "001010123456789",
+        "default_k": "00112233445566778899aabbccddeeff",
         "default_lte_inactivity_timer": 10000,
         "default_nr_bandwidth": 40,
-        "default_nr_imsi": "001010123456789",
-        "default_nr_k": "00112233445566778899aabbccddeeff",
         "default_nr_ssb_pos_bitmap": "10000000",
         "default_n_antenna_dl": 2,
         "default_n_antenna_ul": 2,

software/ors-amarisoft/software-fdd-lopcomm.cfg

@@ -6,14 +6,13 @@ extends =
 [default-params]
 default-lte-bandwidth = 20 MHz
 default-lte-inactivity-timer = 10000
-default-lte-imsi = 001010123456789
-default-lte-k = 00112233445566778899aabbccddeeff
 
 default-nr-bandwidth = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-nr-inactivity-timer = 10000
-default-nr-imsi = 001010123456789
-default-nr-k = 00112233445566778899aabbccddeeff
+
+default-imsi = 001010123456789
+default-k = 00112233445566778899aabbccddeeff
 
 default-n-antenna-dl = 2
 default-n-antenna-ul = 2

software/ors-amarisoft/software-fdd-ors.cfg

@@ -6,14 +6,13 @@ extends =
 [default-params]
 default-lte-bandwidth = 20 MHz
 default-lte-inactivity-timer = 10000
-default-lte-imsi = 001010123456789
-default-lte-k = 00112233445566778899aabbccddeeff
 
 default-nr-bandwidth = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-nr-inactivity-timer = 10000
-default-nr-imsi = 001010123456789
-default-nr-k = 00112233445566778899aabbccddeeff
+
+default-imsi = 001010123456789
+default-k = 00112233445566778899aabbccddeeff
 
 default-n-antenna-dl = 2
 default-n-antenna-ul = 2

software/ors-amarisoft/software-fdd.cfg

@@ -6,14 +6,13 @@ extends =
 [default-params]
 default-lte-bandwidth = 20 MHz
 default-lte-inactivity-timer = 10000
-default-lte-imsi = 001010123456789
-default-lte-k = 00112233445566778899aabbccddeeff
 
 default-nr-bandwidth = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-nr-inactivity-timer = 10000
-default-nr-imsi = 001010123456789
-default-nr-k = 00112233445566778899aabbccddeeff
+
+default-imsi = 001010123456789
+default-k = 00112233445566778899aabbccddeeff
 
 default-n-antenna-dl = 2
 default-n-antenna-ul = 2

software/ors-amarisoft/software-tdd-m2ru.cfg

@@ -6,14 +6,13 @@ extends =
 [default-params]
 default-lte-bandwidth = 20 MHz
 default-lte-inactivity-timer = 10000
-default-lte-imsi = 001010123456789
-default-lte-k = 00112233445566778899aabbccddeeff
 
 default-nr-bandwidth = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-nr-inactivity-timer = 10000
-default-nr-imsi = 001010123456789
-default-nr-k = 00112233445566778899aabbccddeeff
+
+default-imsi = 001010123456789
+default-k = 00112233445566778899aabbccddeeff
 
 default-n-antenna-dl = 2
 default-n-antenna-ul = 2

software/ors-amarisoft/software-tdd-ors.cfg

@@ -6,14 +6,13 @@ extends =
 [default-params]
 default-lte-bandwidth = 20 MHz
 default-lte-inactivity-timer = 10000
-default-lte-imsi = 001010123456789
-default-lte-k = 00112233445566778899aabbccddeeff
 
 default-nr-bandwidth = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-nr-inactivity-timer = 10000
-default-nr-imsi = 001010123456789
-default-nr-k = 00112233445566778899aabbccddeeff
+
+default-imsi = 001010123456789
+default-k = 00112233445566778899aabbccddeeff
 
 default-n-antenna-dl = 2
 default-n-antenna-ul = 2

software/ors-amarisoft/software-tdd.cfg

@@ -6,14 +6,13 @@ extends =
 [default-params]
 default-lte-bandwidth = 20 MHz
 default-lte-inactivity-timer = 10000
-default-lte-imsi = 001010123456789
-default-lte-k = 00112233445566778899aabbccddeeff
 
 default-nr-bandwidth = 40
 default-nr-ssb-pos-bitmap = 10000000
 default-nr-inactivity-timer = 10000
-default-nr-imsi = 001010123456789
-default-nr-k = 00112233445566778899aabbccddeeff
+
+default-imsi = 001010123456789
+default-k = 00112233445566778899aabbccddeeff
 
 default-n-antenna-dl = 2
 default-n-antenna-ul = 2

software/ors-amarisoft/software.jinja2.cfg

@@ -10,14 +10,13 @@ extends =
 [default-params]
 default-lte-bandwidth = {{ default_lte_bandwidth }}
 default-lte-inactivity-timer = {{ default_lte_inactivity_timer }}
-default-lte-imsi = {{ default_lte_imsi }}
-default-lte-k = {{ default_lte_k }}
 
 default-nr-bandwidth = {{ default_nr_bandwidth }}
 default-nr-ssb-pos-bitmap = {{ default_nr_ssb_pos_bitmap }}
 default-nr-inactivity-timer = {{ default_nr_inactivity_timer }}
-default-nr-imsi = {{ default_nr_imsi }}
-default-nr-k = {{ default_nr_k }}
+
+default-imsi = {{ default_imsi }}
+default-k = {{ default_k }}
 
 default-n-antenna-dl = {{ default_n_antenna_dl }}
 default-n-antenna-ul = {{ default_n_antenna_ul }}