ors-amarisoft: clean-up

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 8b275dc35fdb169eca6b087bc32a9286
+md5sum = e72c0abf26cb451cef9e30d9fbfe9327
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = a904db3ba9518ae0edf0ddcccfa57485
 
 [sdr-busy-promise]
 _update_hash_filename_ = promise/check_sdr_busy.py
-md5sum = e5853b4fecae68debcb7b32d3c13368c
+md5sum = a9d7a06c43410e02070b9ddae7b46b38
 
 [interface-up-promise]
 _update_hash_filename_ = promise/check_interface_up.py

software/ors-amarisoft/instance.cfg

@@ -106,14 +106,14 @@ extra-context =
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
-    raw default_dl_earfcn ${enb:default-dl-earfcn}
-    raw default_lte_dl_freq ${enb:default-lte-dl-freq}
-    raw default_lte_band ${enb:default-lte-band}
-    raw default_lte_n_rb_dl ${enb:default-lte-n-rb-dl}
-    raw default_lte_tx_gain ${enb:default-lte-tx-gain}
-    raw default_lte_rx_gain ${enb:default-lte-rx-gain}
-    raw min_frequency ${enb:min-frequency}
-    raw max_frequency ${enb:max-frequency}
+    raw default_dl_earfcn ${default-params:default-dl-earfcn}
+    raw default_lte_dl_freq ${default-params:default-lte-dl-freq}
+    raw default_lte_band ${default-params:default-lte-band}
+    raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl}
+    raw default_lte_tx_gain ${default-params:default-lte-tx-gain}
+    raw default_lte_rx_gain ${default-params:default-lte-rx-gain}
+    raw min_frequency ${default-params:min-frequency}
+    raw max_frequency ${default-params:max-frequency}
 
 [dynamic-template-lte-gnb]
 < = jinja2-template-base
@@ -127,15 +127,15 @@ extra-context =
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
-    raw default_dl_nr_arfcn ${enb:default-dl-nr-arfcn}
-    raw default_nr_band ${enb:default-nr-band}
-    raw default_nr_dl_freq ${enb:default-nr-dl-freq}
-    raw default_nr_bandwidth ${enb:default-nr-bandwidth}
-    raw default_nr_tx_gain ${enb:default-nr-tx-gain}
-    raw default_nr_rx_gain ${enb:default-nr-rx-gain}
-    raw default_nr_ssb_pos_bitmap ${enb:default-nr-ssb-pos-bitmap}
-    raw min_frequency ${enb:min-frequency}
-    raw max_frequency ${enb:max-frequency}
+    raw default_dl_nr_arfcn ${default-params:default-dl-nr-arfcn}
+    raw default_nr_band ${default-params:default-nr-band}
+    raw default_nr_dl_freq ${default-params:default-nr-dl-freq}
+    raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
+    raw default_nr_tx_gain ${default-params:default-nr-tx-gain}
+    raw default_nr_rx_gain ${default-params:default-nr-rx-gain}
+    raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}
+    raw min_frequency ${default-params:min-frequency}
+    raw max_frequency ${default-params:max-frequency}
 
 [dynamic-template-lte-mme]
 < = jinja2-template-base
@@ -167,15 +167,15 @@ extra-context =
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
-    raw default_dl_earfcn ${enb:default-dl-earfcn}
-    raw default_lte_dl_freq ${enb:default-lte-dl-freq}
-    raw default_lte_n_rb_dl ${enb:default-lte-n-rb-dl}
-    raw default_lte_tx_gain ${enb:default-lte-tx-gain}
-    raw default_lte_rx_gain ${enb:default-lte-rx-gain}
-    raw default_n_antenna_dl ${enb:default-n-antenna-dl}
-    raw default_n_antenna_ul ${enb:default-n-antenna-ul}
-    raw default_lte_imsi ${enb:default-lte-imsi}
-    raw default_lte_k ${enb:default-lte-k}
+    raw default_dl_earfcn ${default-params:default-dl-earfcn}
+    raw default_lte_dl_freq ${default-params:default-lte-dl-freq}
+    raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl}
+    raw default_lte_tx_gain ${default-params:default-lte-tx-gain}
+    raw default_lte_rx_gain ${default-params:default-lte-rx-gain}
+    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_lte_k ${default-params:default-lte-k}
 
 [dynamic-template-lte-ue-nr]
 < = jinja2-template-base
@@ -190,16 +190,16 @@ extra-context =
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
     raw openssl_location ${openssl:location}
-    raw default_dl_nr_arfcn ${enb:default-dl-nr-arfcn}
-    raw default_nr_band ${enb:default-nr-band}
-    raw default_nr_bandwidth ${enb:default-nr-bandwidth}
-    raw default_nr_tx_gain ${enb:default-nr-tx-gain}
-    raw default_nr_rx_gain ${enb:default-nr-rx-gain}
-    raw default_n_antenna_dl ${enb:default-n-antenna-dl}
-    raw default_n_antenna_ul ${enb:default-n-antenna-ul}
-    raw default_nr_imsi ${enb:default-nr-imsi}
-    raw default_nr_k ${enb:default-nr-k}
-    raw default_ssb_nr_arfcn ${enb:default-ssb-nr-arfcn}
+    raw default_dl_nr_arfcn ${default-params:default-dl-nr-arfcn}
+    raw default_nr_band ${default-params:default-nr-band}
+    raw default_nr_bandwidth ${default-params:default-nr-bandwidth}
+    raw default_nr_tx_gain ${default-params:default-nr-tx-gain}
+    raw default_nr_rx_gain ${default-params:default-nr-rx-gain}
+    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_imsi ${default-params:default-nr-imsi}
+    raw default_nr_k ${default-params:default-nr-k}
+    raw default_ssb_nr_arfcn ${default-params:default-ssb-nr-arfcn}
 
 [ue-db-config]
 recipe = slapos.recipe.template:jinja2

software/ors-amarisoft/render-templates

@@ -3,138 +3,78 @@
 from jinja2 import Template
 import os
 
-# Values: 6 (1.4 MHz), 15 (3MHz), 25 (5MHz), 50 (10MHz), 75 (15MHz), 100 (20MHz)
-LTE_N_RB_DL=100
-LTE_TX_GAIN=78
-LTE_RX_GAIN=40
-LTE_IMSI="001010123456789"
-LTE_K="00112233445566778899aabbccddeeff"
-
-NR_BANDWIDTH=40
-NR_TX_GAIN=78
-NR_RX_GAIN=40
-NR_IMSI="001010123456789"
-NR_K="00112233445566778899aabbccddeeff"
-
-N_ANTENNA_DL=2
-N_ANTENNA_UL=2
-
 global_context = {
         'generated_file_message': "This file was generated using a jinja2 template and the render-templates script, don't modify directly."
 }
 
 rf_mode_context_list = [
         {
-            'rf_mode': 'tdd1900',
-
-            'default_dl_earfcn': 38350,
-            'default_lte_dl_freq': 1890.0,
-            'default_lte_band': 39,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 378000,
-            'default_nr_band': 39,
-            'default_nr_dl_freq': 1890.0,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "1000",
-            'default_ssb_nr_arfcn': 377790,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 1880.0,
-            'max_frequency': 1920,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                   : 'tdd1900',
+            'default_dl_earfcn'         : 38350,
+            'default_lte_dl_freq'       : 1890.0,
+            'default_lte_band'          : 39,
+            'default_dl_nr_arfcn'       : 378000,
+            'default_nr_band'           : 39,
+            'default_nr_dl_freq'        : 1890.0,
+            'default_nr_ssb_pos_bitmap' : "1000",
+            'default_ssb_nr_arfcn'      : 377790,
+            'min_frequency'             : 1880.0,
+            'max_frequency'             : 1920,
         }, {
-            'rf_mode': 'tdd2600',
-
-            'default_dl_earfcn': 38050,
-            'default_lte_dl_freq': 2600.0,
-            'default_lte_band': 38,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 520000,
-            'default_nr_band': 38,
-            'default_nr_dl_freq': 2600.0,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "10000000",
-            'default_ssb_nr_arfcn': 517930,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 2570,
-            'max_frequency': 2620,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                   : 'tdd2600',
+            'default_dl_earfcn'         : 38050,
+            'default_lte_dl_freq'       : 2600.0,
+            'default_lte_band'          : 38,
+            'default_dl_nr_arfcn'       : 520000,
+            'default_nr_band'           : 38,
+            'default_nr_dl_freq'        : 2600.0,
+            'default_nr_ssb_pos_bitmap' : "10000000",
+            'default_ssb_nr_arfcn'      : 517930,
+            'min_frequency'             : 2570,
+            'max_frequency'             : 2620,
         }, {
-            'rf_mode': 'tdd3500',
-
-            'default_dl_earfcn': 42590,
-            'default_lte_dl_freq': 3500.0,
-            'default_lte_band': 42,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 632628,
-            'default_nr_band': 78,
-            'default_nr_dl_freq': 3489.42,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "10000000",
-            'default_ssb_nr_arfcn': 632544,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 3400,
-            'max_frequency': 3600,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                   : 'tdd3500',
+            'default_dl_earfcn'         : 42590,
+            'default_lte_dl_freq'       : 3500.0,
+            'default_lte_band'          : 42,
+            'default_dl_nr_arfcn'       : 632628,
+            'default_nr_band'           : 78,
+            'default_nr_dl_freq'        : 3489.42,
+            'default_nr_ssb_pos_bitmap' : "10000000",
+            'default_ssb_nr_arfcn'      : 632544,
+            'min_frequency'             : 3400,
+            'max_frequency'             : 3600,
         }, {
-            'rf_mode': 'tdd3700',
-
-            'default_dl_earfcn': 44590,
-            'default_lte_dl_freq': 3700.0,
-            'default_lte_band': 43,
-            'default_lte_n_rb_dl': LTE_N_RB_DL,
-            'default_lte_tx_gain': LTE_TX_GAIN,
-            'default_lte_rx_gain': LTE_RX_GAIN,
-            'default_lte_imsi': LTE_IMSI,
-            'default_lte_k': LTE_K,
-
-            'default_dl_nr_arfcn': 646666,
-            'default_nr_band': 78,
-            'default_nr_dl_freq': 3699.99,
-            'default_nr_bandwidth': NR_BANDWIDTH,
-            'default_nr_tx_gain': NR_TX_GAIN,
-            'default_nr_rx_gain': NR_RX_GAIN,
-            'default_nr_ssb_pos_bitmap': "10000000",
-            'default_ssb_nr_arfcn': 646656,
-            'default_nr_imsi': NR_IMSI,
-            'default_nr_k': NR_K,
-
-            'min_frequency': 3600,
-            'max_frequency': 3800,
-            'default_n_antenna_dl': N_ANTENNA_DL,
-            'default_n_antenna_ul': N_ANTENNA_UL,
+            'rf_mode'                   : 'tdd3700',
+            'default_dl_earfcn'         : 44590,
+            'default_lte_dl_freq'       : 3700.0,
+            'default_lte_band'          : 43,
+            'default_dl_nr_arfcn'       : 646666,
+            'default_nr_band'           : 78,
+            'default_nr_dl_freq'        : 3699.99,
+            'default_nr_ssb_pos_bitmap' : "10000000",
+            'default_ssb_nr_arfcn'      : 646656,
+            'min_frequency'             : 3600,
+            'max_frequency'             : 3800,
         }
 ]
 
+for i in range (4):
+    rf_mode_context_list[i].update({
+            'default_lte_n_rb_dl'       : 100,
+            'default_lte_tx_gain'       : 78,
+            'default_lte_rx_gain'       : 40,
+            'default_lte_imsi'          : "001010123456789",
+            'default_lte_k'             : "00112233445566778899aabbccddeeff",
+            'default_nr_bandwidth'      : 40,
+            'default_nr_tx_gain'        : 78,
+            'default_nr_rx_gain'        : 40,
+            'default_nr_imsi'           : "001010123456789",
+            'default_nr_k'              : "00112233445566778899aabbccddeeff",
+            'default_n_antenna_dl'      : 2,
+            'default_n_antenna_ul'      : 2,
+    })
+
 with open('software.cfg.json.jinja2', 'r') as f:
     software_json_template = Template(f.read())
 with open('instance-enb-input-schema.json.jinja2', 'r') as f:

software/ors-amarisoft/software-tdd1900.cfg

@@ -3,7 +3,7 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 38350
 default-lte-dl-freq = 1890.0
 default-lte-band = 39

software/ors-amarisoft/software-tdd2600.cfg

@@ -3,7 +3,7 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 38050
 default-lte-dl-freq = 2600.0
 default-lte-band = 38

software/ors-amarisoft/software-tdd3500.cfg

@@ -3,7 +3,7 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 42590
 default-lte-dl-freq = 3500.0
 default-lte-band = 42

software/ors-amarisoft/software-tdd3700.cfg

@@ -3,7 +3,7 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = 44590
 default-lte-dl-freq = 3700.0
 default-lte-band = 43

software/ors-amarisoft/software.jinja2.cfg

@@ -3,7 +3,7 @@
 extends =
   software.cfg
 
-[enb]
+[default-params]
 default-dl-earfcn = {{ default_dl_earfcn }}
 default-lte-dl-freq = {{ default_lte_dl_freq }}
 default-lte-band = {{ default_lte_band }}