.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 754ab90c8e62ba30ae6c5bae3969c1bb
+md5sum = 07cbf34cd32019ba2d945fc39da89529
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py

software/ors-amarisoft/instance.cfg

@@ -257,10 +257,10 @@ extra-context =
     raw CreateProcessingEle_template   ${CreateProcessingEle.jinja2.xml:target}
     raw cu_config_template   ${cu_config.jinja2.xml:target}
     raw openssl_location ${openssl:location}
-    raw default_lte_bandwidth ${default-params:default-lte-bandwidth}
+#   raw default_lte_bandwidth ${default-params:default-lte-bandwidth}
     raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
-    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
-    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
+#   raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+#   raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
     raw dnsmasq_template   ${dnsmasq.jinja2.cfg:target}
     raw dnsmasq_location ${dnsmasq:location}
     key dnsmasq_config_path dnsmasq-config:output
@@ -284,11 +284,11 @@ extra-context =
     raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
     raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}
     raw openssl_location ${openssl:location}
-    raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
-    raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}
+#   raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
+#   raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}
     raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
-    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
-    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
+#   raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+#   raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
     raw python_path ${python3:location}
     raw fluent_bit_location ${fluent-bit:location}
 
@@ -324,9 +324,14 @@ extra-context =
     raw ue_lte_template   ${ue-lte.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
-    raw default_lte_bandwidth ${default-params:default-lte-bandwidth}
-    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
-    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
+# XXX ue -> multicell/multiru combining both LTE and NR
+#   raw default_lte_bandwidth ${default-params:default-lte-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_bandwidth "20 MHz"
+    raw default_n_antenna_dl 2
+    raw default_n_antenna_ul 2
+#
     raw default_lte_imsi ${default-params:default-lte-imsi}
     raw default_lte_k ${default-params:default-lte-k}
 
@@ -342,9 +347,14 @@ extra-context =
     raw ue_nr_template   ${ue-nr.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw openssl_location ${openssl:location}
-    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}
+# XXX see ^^^ about UE wrt multicell/multiru
+#   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_nr_bandwidth 40
+    raw default_n_antenna_dl 2
+    raw default_n_antenna_ul 2
+#
     raw default_nr_imsi ${default-params:default-nr-imsi}
     raw default_nr_k ${default-params:default-nr-k}
 

software/ors-amarisoft/render-templates

@@ -65,16 +65,16 @@ software_list = [
 
 for i in range (len(software_list)):
     software_list[i].update({
-            'default_lte_bandwidth'        : "20 MHz",
+            #'default_lte_bandwidth'        : "20 MHz",
             'default_lte_imsi'             : "001010123456789",
             'default_lte_k'                : "00112233445566778899aabbccddeeff",
             'default_lte_inactivity_timer' : 10000,
-            'default_nr_bandwidth'         : 40,
+            #'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_ssb_pos_bitmap'    : "10000000",
+            #'default_n_antenna_dl'         : 2,
+            #'default_n_antenna_ul'         : 2,
             'default_nr_inactivity_timer' : 10000,
     })
 

software/ors-amarisoft/software.cfg

 [buildout]
 extends =
   software-base.cfg
+
+# XXX temp hack  -> either cell configuration, or other conf(?)
+[default-params]
+default-lte-inactivity-timer = 10000
+default-lte-imsi = 001010123456789
+default-lte-k = 00112233445566778899aabbccddeeff
+
+default-nr-inactivity-timer = 10000
+default-nr-imsi = 001010123456789
+default-nr-k = 00112233445566778899aabbccddeeff

software/ors-amarisoft/software.jinja2.cfg

@@ -4,23 +4,23 @@ extends =
   software-base.cfg
 
 [default-params]
-default-lte-bandwidth = {{ default_lte_bandwidth }}
+#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-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-n-antenna-dl = {{ default_n_antenna_dl }}
-default-n-antenna-ul = {{ default_n_antenna_ul }}
+#default-n-antenna-dl = {{ default_n_antenna_dl }}
+#default-n-antenna-ul = {{ default_n_antenna_ul }}
 
-[rf-mode]
-software-name = {{ software_name }}
-rf-mode = {{ rf_mode }}
-trx = {{ trx }}
-bbu = {{ bbu }}
-ru = {{ ru }}
+#[rf-mode]
+#software-name = {{ software_name }}
+#rf-mode = {{ rf_mode }}
+#trx = {{ trx }}
+#bbu = {{ bbu }}
+#ru = {{ ru }}