ors-amarisoft: fix json schema tests

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -3,7 +3,7 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-{% if rf_mode == 'tdd' %}
+{%- if rf_mode == 'tdd' %}
     "rrh": {
       "title": "RRH",
       "description": "RRH",
@@ -34,7 +34,7 @@
         "INACTIVE"
       ]
     },
-{% endif %}
+{%- endif %}
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",

software/ors-amarisoft/instance-gnb-input-schema.json.jinja2

@@ -3,7 +3,7 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-{% if rf_mode == 'tdd' %}
+{%- if rf_mode == 'tdd' %}
     "rrh": {
       "title": "RRH",
       "description": "RRH",
@@ -14,7 +14,7 @@
         "M2RU Sunwave"
       ]
     },
-{% endif %}
+{%- endif %}
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -25,7 +25,7 @@
       "title": "A3 offset for NR handover",
       "description": "RSRP gain offset between gNBs which will trigger handover",
       "type": "number",
-      "default": 6,
+      "default": 6
     },
     "nr_handover_time_to_trigger": {
       "title": "Time to Trigger for NR handover",
@@ -57,7 +57,7 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10",
+        "2.5ms 1UL 3DL 2/10"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd-enb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "rrh": {
       "title": "RRH",
       "description": "RRH",
@@ -34,7 +33,6 @@
         "INACTIVE"
       ]
     },
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -45,13 +43,13 @@
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 60
     },
     "rx_gain": {
       "title": "Rx gain",
       "description": "Rx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 45
     },
     "gps_sync": {
       "default": false,
@@ -63,13 +61,13 @@
       "title": "Number of DL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "n_antenna_ul": {
       "title": "Number of UL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "dl_earfcn": {
       "title": "DL EARFCN",
@@ -81,7 +79,7 @@
       "title": "DL RB",
       "description": "number of DL resource blocks",
       "type": "number",
-      "default": 
+      "default": 100
     },
     "mme_list": {
       "title": "MME list",
@@ -148,7 +146,7 @@
       "title": "Inactivity Timer",
       "description": "Send RRC connection release after this time (in ms) of network inactivity.",
       "type": "number",
-      "default": 
+      "default": 10000
     },
     "use_ipv4": {
       "default": false,

software/ors-amarisoft/instance-tdd-gnb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "rrh": {
       "title": "RRH",
       "description": "RRH",
@@ -14,7 +13,6 @@
         "M2RU Sunwave"
       ]
     },
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -25,7 +23,7 @@
       "title": "A3 offset for NR handover",
       "description": "RSRP gain offset between gNBs which will trigger handover",
       "type": "number",
-      "default": 6,
+      "default": 6
     },
     "nr_handover_time_to_trigger": {
       "title": "Time to Trigger for NR handover",
@@ -57,7 +55,7 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10",
+        "2.5ms 1UL 3DL 2/10"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },
@@ -65,25 +63,25 @@
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 60
     },
     "rx_gain": {
       "title": "Rx gain",
       "description": "Rx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 45
     },
     "n_antenna_dl": {
       "title": "Number of DL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "n_antenna_ul": {
       "title": "Number of UL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "gps_sync": {
       "default": false,
@@ -107,7 +105,7 @@
       "title": "Bandwidth",
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
-      "default": 
+      "default": 40
     },
     "amf_list": {
       "title": "AMF list",
@@ -288,7 +286,7 @@
       "title": "Inactivity Timer",
       "description": "Send RRC connection release after this time (in ms) of network inactivity.",
       "type": "number",
-      "default": 
+      "default": 10000
     },
     "use_ipv4": {
       "default": false,

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

@@ -13,13 +13,13 @@
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 60
     },
     "rx_gain": {
       "title": "Rx gain",
       "description": "Rx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 45
     },
     "dl_earfcn": {
       "title": "DL EARFCN",
@@ -31,31 +31,31 @@
       "title": "DL RB",
       "description": "number of DL resource blocks",
       "type": "number",
-      "default": 
+      "default": 100
     },
     "n_antenna_dl": {
       "title": "Number of DL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "n_antenna_ul": {
       "title": "Number of UL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "imsi": {
       "title": "IMSI",
       "description": "IMSI",
       "type": "string",
-      "default": ""
+      "default": "001010123456789"
     },
     "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": "00112233445566778899aabbccddeeff"
     },
     "sim_algo": {
       "title": "sim_algo",

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

@@ -13,13 +13,13 @@
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 60
     },
     "rx_gain": {
       "title": "Rx gain",
       "description": "Rx gain (in dB)",
       "type": "number",
-      "default": 
+      "default": 45
     },
     "dl_nr_arfcn": {
       "title": "DL NR ARFCN",
@@ -37,7 +37,7 @@
       "title": "Bandwidth",
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
-      "default": 
+      "default": 40
     },
     "ssb_nr_arfcn": {
       "title": "SSB NR ARFCN",
@@ -49,25 +49,25 @@
       "title": "Number of DL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "n_antenna_ul": {
       "title": "Number of UL antennas",
       "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
       "type": "number",
-      "default": 
+      "default": 2
     },
     "imsi": {
       "title": "IMSI",
       "description": "IMSI",
       "type": "string",
-      "default": ""
+      "default": "001010123456789"
     },
     "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": "00112233445566778899aabbccddeeff"
     },
     "sim_algo": {
       "title": "sim_algo",

software/ors-amarisoft/instance-tdd1900-enb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -14,7 +13,7 @@
       "title": "A3 offset for NR handover",
       "description": "RSRP gain offset between gNBs which will trigger handover",
       "type": "number",
-      "default": 6,
+      "default": 6
     },
     "nr_handover_time_to_trigger": {
       "title": "Time to Trigger for NR handover",
@@ -46,7 +45,7 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10",
+        "2.5ms 1UL 3DL 2/10"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd2600-enb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -14,7 +13,7 @@
       "title": "A3 offset for NR handover",
       "description": "RSRP gain offset between gNBs which will trigger handover",
       "type": "number",
-      "default": 6,
+      "default": 6
     },
     "nr_handover_time_to_trigger": {
       "title": "Time to Trigger for NR handover",
@@ -46,7 +45,7 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10",
+        "2.5ms 1UL 3DL 2/10"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd3500-enb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -14,7 +13,7 @@
       "title": "A3 offset for NR handover",
       "description": "RSRP gain offset between gNBs which will trigger handover",
       "type": "number",
-      "default": 6,
+      "default": 6
     },
     "nr_handover_time_to_trigger": {
       "title": "Time to Trigger for NR handover",
@@ -46,7 +45,7 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10",
+        "2.5ms 1UL 3DL 2/10"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/instance-tdd3700-enb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -3,7 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-
     "log_phy_debug": {
       "title": "Physical layer log debug",
       "description": "Enable debug mode for physical layer logs",
@@ -14,7 +13,7 @@
       "title": "A3 offset for NR handover",
       "description": "RSRP gain offset between gNBs which will trigger handover",
       "type": "number",
-      "default": 6,
+      "default": 6
     },
     "nr_handover_time_to_trigger": {
       "title": "Time to Trigger for NR handover",
@@ -46,7 +45,7 @@
       "type": "string",
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
-        "2.5ms 1UL 3DL 2/10",
+        "2.5ms 1UL 3DL 2/10"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },

software/ors-amarisoft/render-templates

@@ -87,7 +87,7 @@ rf_mode_context_list = [
         }
 ]
 
-for i in range (4):
+for i in range (len(rf_mode_context_list)):
     rf_mode_context_list[i].update({
             'default_lte_n_rb_dl'          : 100,
             'default_lte_tx_gain'          : 60,

software/ors-amarisoft/software-tdd.cfg

@@ -7,26 +7,26 @@ extends =
 default-dl-earfcn = 0
 default-lte-dl-freq = 0.0
 default-lte-band = 0
-default-lte-n-rb-dl = 
-default-lte-tx-gain = 
-default-lte-rx-gain = 
-default-lte-inactivity-timer = 
-default-lte-imsi = 
-default-lte-k = 
+default-lte-n-rb-dl = 100
+default-lte-tx-gain = 60
+default-lte-rx-gain = 45
+default-lte-inactivity-timer = 10000
+default-lte-imsi = 001010123456789
+default-lte-k = 00112233445566778899aabbccddeeff
 
 default-dl-nr-arfcn = 0
 default-nr-band = 0
 default-nr-dl-freq = 0.0
-default-nr-bandwidth = 
-default-nr-tx-gain = 
-default-nr-rx-gain = 
+default-nr-bandwidth = 40
+default-nr-tx-gain = 60
+default-nr-rx-gain = 45
 default-nr-ssb-pos-bitmap = 10000000
 default-ssb-nr-arfcn = 0
-default-nr-inactivity-timer = 
-default-nr-imsi = 
-default-nr-k = 
+default-nr-inactivity-timer = 10000
+default-nr-imsi = 001010123456789
+default-nr-k = 00112233445566778899aabbccddeeff
 
 min-frequency = 0
 max-frequency = 0
-default-n-antenna-dl =
-default-n-antenna-ul =
+default-n-antenna-dl =2
+default-n-antenna-ul =2