ors-amarisoft: update gNB conf and add new parameters

software/ors-amarisoft/buildout.hash.cfg

@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 1333ef2400f2088221ed879f1b03e777
+md5sum = 879c015828ba33edf751358f163a45ba
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 53669190f81b7cdae8982ec74081a4d1
+md5sum = 8e9cdf44578c7a4f5de2d7828b9d6aa7
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

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

@@ -3,7 +3,11 @@
 #define N_ANTENNA_UL        {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }}
 
 {
+{% if slapparameter_dict.get('log_phy_debug', False) %}
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=debug,file.rotate=1G,file.path=/dev/null",
+{% else %}
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
+{% endif %}
   log_filename: "{{ directory['log'] }}/enb.log",
 
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}

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

@@ -35,6 +35,12 @@
       ]
     },
 {% endif %}
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
@@ -53,6 +59,18 @@
       "description": "True if GPS should be used for synchronisation",
       "type": "boolean"
     },
+    "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_n_antenna_dl }}
+    },
+    "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_n_antenna_ul }}
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
@@ -185,18 +203,6 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
-    },
-    "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_n_antenna_dl }}
-    },
-    "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_n_antenna_ul }}
     }
   }
 }

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

@@ -15,6 +15,34 @@
       ]
     },
 {% endif %}
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6,
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd if A3 offset is reached",
+      "type": "number",
+      "default": 100,
+    },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -35,6 +35,12 @@
       ]
     },
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
@@ -53,6 +59,18 @@
       "description": "True if GPS should be used for synchronisation",
       "type": "boolean"
     },
+    "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": 
+    },
+    "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": 
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
@@ -179,18 +197,6 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
-    },
-    "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": 
-    },
-    "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": 
     }
   }
 }

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

@@ -15,6 +15,34 @@
       ]
     },
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6,
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd if A3 offset is reached",
+      "type": "number",
+      "default": 100,
+    },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -4,6 +4,12 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
@@ -22,6 +28,18 @@
       "description": "True if GPS should be used for synchronisation",
       "type": "boolean"
     },
+    "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": 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": 2
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
@@ -154,18 +172,6 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
-    },
-    "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": 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": 2
     }
   }
 }

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

@@ -4,6 +4,34 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6,
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd if A3 offset is reached",
+      "type": "number",
+      "default": 100,
+    },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
@@ -164,7 +192,7 @@
       "title": "SSB Position Bitmap",
       "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
       "type": "string",
-      "default": 1000
+      "default": 10000000
     },
     "plmn_list": {
       "title": "PLMN list",

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

@@ -4,6 +4,12 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
@@ -22,6 +28,18 @@
       "description": "True if GPS should be used for synchronisation",
       "type": "boolean"
     },
+    "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": 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": 2
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
@@ -154,18 +172,6 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
-    },
-    "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": 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": 2
     }
   }
 }

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

@@ -4,6 +4,34 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6,
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd if A3 offset is reached",
+      "type": "number",
+      "default": 100,
+    },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -4,6 +4,12 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
@@ -22,6 +28,18 @@
       "description": "True if GPS should be used for synchronisation",
       "type": "boolean"
     },
+    "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": 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": 2
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
@@ -154,18 +172,6 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
-    },
-    "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": 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": 2
     }
   }
 }

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

@@ -4,6 +4,34 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6,
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd if A3 offset is reached",
+      "type": "number",
+      "default": 100,
+    },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -4,6 +4,12 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",
@@ -22,6 +28,18 @@
       "description": "True if GPS should be used for synchronisation",
       "type": "boolean"
     },
+    "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": 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": 2
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
@@ -154,18 +172,6 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
-    },
-    "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": 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": 2
     }
   }
 }

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

@@ -4,6 +4,34 @@
   "title": "Input Parameters",
   "properties": {
 
+    "log_phy_debug": {
+      "title": "Physical layer log debug",
+      "description": "Enable debug mode for physical layer logs",
+      "type": "boolean",
+      "default": false
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6,
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd if A3 offset is reached",
+      "type": "number",
+      "default": 100,
+    },
+    "tdd_ul_dl_config": {
+      "title": "TDD",
+      "description": "TDD",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)"
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

software/ors-amarisoft/render-templates

@@ -32,7 +32,7 @@ rf_mode_context_list = [
             'default_dl_nr_arfcn'          : 378000,
             'default_nr_band'              : 39,
             'default_nr_dl_freq'           : 1890.0,
-            'default_nr_ssb_pos_bitmap'    : "1000",
+            'default_nr_ssb_pos_bitmap'    : "10000000",
             'default_ssb_nr_arfcn'         : 377790,
             'min_frequency'                : 1880.0,
             'max_frequency'                : 1920,

software/ors-amarisoft/software-tdd1900.cfg

@@ -20,7 +20,7 @@ default-nr-dl-freq = 1890.0
 default-nr-bandwidth = 40
 default-nr-tx-gain = 60
 default-nr-rx-gain = 45
-default-nr-ssb-pos-bitmap = 1000
+default-nr-ssb-pos-bitmap = 10000000
 default-ssb-nr-arfcn = 377790
 default-nr-inactivity-timer = 10000
 default-nr-imsi = 001010123456789

software/ors-amarisoft/test/test.jinja2.py

@@ -39,19 +39,19 @@ setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
 
 param_dict = {
     'testing': True,
-    "sim_algo": "milenage",
-    "imsi": "001010000000331",
-    "opc": "000102030405060708090A0B0C0D0E0F",
-    "amf": "0x9001",
-    "sqn": "000000000000",
-    "k": "00112233445566778899AABBCCDDEEFF",
-    "impu": "impu331",
-    "impi": "impi331@amarisoft.com",
+    'sim_algo': 'milenage',
+    'imsi': '001010000000331',
+    'opc': '000102030405060708090A0B0C0D0E0F',
+    'amf': '0x9001',
+    'sqn': '000000000000',
+    'k': '00112233445566778899AABBCCDDEEFF',
+    'impu': 'impu331',
+    'impi': 'impi331@amarisoft.com',
     'tx_gain': 17,
     'rx_gain': 17,
     'dl_earfcn': 325320,
     'n_rb_dl': 50,
-    'enb_id': "0x17",
+    'enb_id': '0x17',
     'pci': 250,
     'mme_list': {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
@@ -62,17 +62,48 @@ param_dict = {
     'nr_band': 99,
     'nr_bandwidth': 50,
     'ssb_nr_arfcn': 377790,
-    'rue_addr': "192.168.99.88",
+    'rue_addr': '192.168.99.88',
     'n_antenna_dl': 2,
     'n_antenna_ul': 2,
     'inactivity_timer': 17,
-    'gnb_id': "0x17",
+    'gnb_id': '0x17',
     'gnb_id_bits': 30,
-    'ssb_pos_bitmap': "10",
+    'ssb_pos_bitmap': '10',
     'amf_list': {
         '10.0.0.1': {'amf_addr': '10.0.0.1'},
         '2001:db8::1': {'amf_addr': '2001:db8::1'},
     },
+    'nr_handover_time_to_trigger': 50,
+    'nr_handover_a3_offset': 10,
+    'ncell_list': {
+        'ORS1': {
+            'dl_nr_arfcn': 100000,
+            'ssb_nr_arfcn': 100000,
+            'pci': 1,
+            'nr_cell_id': '0x0000001',
+            'gnb_id_bits': 28,
+            'nr_band': 1,
+            'tac': 1
+        },
+        'ORS2': {
+            'dl_nr_arfcn': 200000,
+            'ssb_nr_arfcn': 200000,
+            'pci': 2,
+            'nr_cell_id': '0x0000002',
+            'gnb_id_bits': 30,
+            'nr_band': 2,
+            'tac': 2
+        },
+    },
+    'xn_peers': {
+        '2001:db8::1': {
+            'xn_addr': '2001:db8::1',
+        },
+        '2001:db8::2': {
+            'xn_addr': '2001:db8::2',
+        },
+    },
+    'tdd_ul_dl_config': '2.5ms 1UL 3DL 2/10',
 }
 enb_param_dict = {
     'plmn_list': {
@@ -141,6 +172,27 @@ def test_gnb_conf1(self):
               self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n])
         for p in conf['amf_list']:
           self.assertEqual(p['amf_addr'], gnb_param_dict1['amf_list'][p['amf_addr']]['amf_addr'])
+        for p in conf['xn_peers']:
+          self.assertEqual(p, gnb_param_dict1['xn_peers'][p]['xn_addr'])
+        for p in conf['nr_cell_list'][0]['ncell_list']:
+          for k in gnb_param_dict1['ncell_list']:
+            if p['dl_nr_arfcn'] == gnb_param_dict1['ncell_list'][k]['dl_nr_arfcn']:
+              break
+          conf_ncell = gnb_param_dict1['ncell_list'][k]
+          self.assertEqual(p['dl_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['ssb_nr_arfcn'], conf_ncell['ssb_nr_arfcn'])
+          self.assertEqual(p['ul_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['n_id_cell'],    conf_ncell['pci'])
+          self.assertEqual(p['gnb_id_bits'],  conf_ncell['gnb_id_bits'])
+          self.assertEqual(p['nr_cell_id'],   int(conf_ncell['nr_cell_id'], 16))
+          self.assertEqual(p['tac'],          conf_ncell['tac'])
+          self.assertEqual(p['band'],         conf_ncell['nr_band'])
+        tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
+        self.assertEqual(float(tdd_config['period']), 2.5)
+        self.assertEqual(int(tdd_config['dl_slots']), 3)
+        self.assertEqual(int(tdd_config['dl_symbols']), 10)
+        self.assertEqual(int(tdd_config['ul_slots']), 1)
+        self.assertEqual(int(tdd_config['ul_symbols']), 2)
 
         with open(conf_file, 'r') as f:
             for l in f:

software/ors-amarisoft/test/testTDD.py

@@ -39,19 +39,19 @@ setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
 
 param_dict = {
     'testing': True,
-    "sim_algo": "milenage",
-    "imsi": "001010000000331",
-    "opc": "000102030405060708090A0B0C0D0E0F",
-    "amf": "0x9001",
-    "sqn": "000000000000",
-    "k": "00112233445566778899AABBCCDDEEFF",
-    "impu": "impu331",
-    "impi": "impi331@amarisoft.com",
+    'sim_algo': 'milenage',
+    'imsi': '001010000000331',
+    'opc': '000102030405060708090A0B0C0D0E0F',
+    'amf': '0x9001',
+    'sqn': '000000000000',
+    'k': '00112233445566778899AABBCCDDEEFF',
+    'impu': 'impu331',
+    'impi': 'impi331@amarisoft.com',
     'tx_gain': 17,
     'rx_gain': 17,
     'dl_earfcn': 325320,
     'n_rb_dl': 50,
-    'enb_id': "0x17",
+    'enb_id': '0x17',
     'pci': 250,
     'mme_list': {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
@@ -62,17 +62,48 @@ param_dict = {
     'nr_band': 99,
     'nr_bandwidth': 50,
     'ssb_nr_arfcn': 377790,
-    'rue_addr': "192.168.99.88",
+    'rue_addr': '192.168.99.88',
     'n_antenna_dl': 2,
     'n_antenna_ul': 2,
     'inactivity_timer': 17,
-    'gnb_id': "0x17",
+    'gnb_id': '0x17',
     'gnb_id_bits': 30,
-    'ssb_pos_bitmap': "10",
+    'ssb_pos_bitmap': '10',
     'amf_list': {
         '10.0.0.1': {'amf_addr': '10.0.0.1'},
         '2001:db8::1': {'amf_addr': '2001:db8::1'},
     },
+    'nr_handover_time_to_trigger': 50,
+    'nr_handover_a3_offset': 10,
+    'ncell_list': {
+        'ORS1': {
+            'dl_nr_arfcn': 100000,
+            'ssb_nr_arfcn': 100000,
+            'pci': 1,
+            'nr_cell_id': '0x0000001',
+            'gnb_id_bits': 28,
+            'nr_band': 1,
+            'tac': 1
+        },
+        'ORS2': {
+            'dl_nr_arfcn': 200000,
+            'ssb_nr_arfcn': 200000,
+            'pci': 2,
+            'nr_cell_id': '0x0000002',
+            'gnb_id_bits': 30,
+            'nr_band': 2,
+            'tac': 2
+        },
+    },
+    'xn_peers': {
+        '2001:db8::1': {
+            'xn_addr': '2001:db8::1',
+        },
+        '2001:db8::2': {
+            'xn_addr': '2001:db8::2',
+        },
+    },
+    'tdd_ul_dl_config': '2.5ms 1UL 3DL 2/10',
 }
 enb_param_dict = {
     'plmn_list': {
@@ -141,6 +172,27 @@ def test_gnb_conf1(self):
               self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n])
         for p in conf['amf_list']:
           self.assertEqual(p['amf_addr'], gnb_param_dict1['amf_list'][p['amf_addr']]['amf_addr'])
+        for p in conf['xn_peers']:
+          self.assertEqual(p, gnb_param_dict1['xn_peers'][p]['xn_addr'])
+        for p in conf['nr_cell_list'][0]['ncell_list']:
+          for k in gnb_param_dict1['ncell_list']:
+            if p['dl_nr_arfcn'] == gnb_param_dict1['ncell_list'][k]['dl_nr_arfcn']:
+              break
+          conf_ncell = gnb_param_dict1['ncell_list'][k]
+          self.assertEqual(p['dl_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['ssb_nr_arfcn'], conf_ncell['ssb_nr_arfcn'])
+          self.assertEqual(p['ul_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['n_id_cell'],    conf_ncell['pci'])
+          self.assertEqual(p['gnb_id_bits'],  conf_ncell['gnb_id_bits'])
+          self.assertEqual(p['nr_cell_id'],   int(conf_ncell['nr_cell_id'], 16))
+          self.assertEqual(p['tac'],          conf_ncell['tac'])
+          self.assertEqual(p['band'],         conf_ncell['nr_band'])
+        tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
+        self.assertEqual(float(tdd_config['period']), 2.5)
+        self.assertEqual(int(tdd_config['dl_slots']), 3)
+        self.assertEqual(int(tdd_config['dl_symbols']), 10)
+        self.assertEqual(int(tdd_config['ul_slots']), 1)
+        self.assertEqual(int(tdd_config['ul_symbols']), 2)
 
         with open(conf_file, 'r') as f:
             for l in f:

software/ors-amarisoft/test/testTDD1900.py

@@ -39,19 +39,19 @@ setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
 
 param_dict = {
     'testing': True,
-    "sim_algo": "milenage",
-    "imsi": "001010000000331",
-    "opc": "000102030405060708090A0B0C0D0E0F",
-    "amf": "0x9001",
-    "sqn": "000000000000",
-    "k": "00112233445566778899AABBCCDDEEFF",
-    "impu": "impu331",
-    "impi": "impi331@amarisoft.com",
+    'sim_algo': 'milenage',
+    'imsi': '001010000000331',
+    'opc': '000102030405060708090A0B0C0D0E0F',
+    'amf': '0x9001',
+    'sqn': '000000000000',
+    'k': '00112233445566778899AABBCCDDEEFF',
+    'impu': 'impu331',
+    'impi': 'impi331@amarisoft.com',
     'tx_gain': 17,
     'rx_gain': 17,
     'dl_earfcn': 325320,
     'n_rb_dl': 50,
-    'enb_id': "0x17",
+    'enb_id': '0x17',
     'pci': 250,
     'mme_list': {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
@@ -62,17 +62,48 @@ param_dict = {
     'nr_band': 99,
     'nr_bandwidth': 50,
     'ssb_nr_arfcn': 377790,
-    'rue_addr': "192.168.99.88",
+    'rue_addr': '192.168.99.88',
     'n_antenna_dl': 2,
     'n_antenna_ul': 2,
     'inactivity_timer': 17,
-    'gnb_id': "0x17",
+    'gnb_id': '0x17',
     'gnb_id_bits': 30,
-    'ssb_pos_bitmap': "10",
+    'ssb_pos_bitmap': '10',
     'amf_list': {
         '10.0.0.1': {'amf_addr': '10.0.0.1'},
         '2001:db8::1': {'amf_addr': '2001:db8::1'},
     },
+    'nr_handover_time_to_trigger': 50,
+    'nr_handover_a3_offset': 10,
+    'ncell_list': {
+        'ORS1': {
+            'dl_nr_arfcn': 100000,
+            'ssb_nr_arfcn': 100000,
+            'pci': 1,
+            'nr_cell_id': '0x0000001',
+            'gnb_id_bits': 28,
+            'nr_band': 1,
+            'tac': 1
+        },
+        'ORS2': {
+            'dl_nr_arfcn': 200000,
+            'ssb_nr_arfcn': 200000,
+            'pci': 2,
+            'nr_cell_id': '0x0000002',
+            'gnb_id_bits': 30,
+            'nr_band': 2,
+            'tac': 2
+        },
+    },
+    'xn_peers': {
+        '2001:db8::1': {
+            'xn_addr': '2001:db8::1',
+        },
+        '2001:db8::2': {
+            'xn_addr': '2001:db8::2',
+        },
+    },
+    'tdd_ul_dl_config': '2.5ms 1UL 3DL 2/10',
 }
 enb_param_dict = {
     'plmn_list': {
@@ -141,6 +172,27 @@ def test_gnb_conf1(self):
               self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n])
         for p in conf['amf_list']:
           self.assertEqual(p['amf_addr'], gnb_param_dict1['amf_list'][p['amf_addr']]['amf_addr'])
+        for p in conf['xn_peers']:
+          self.assertEqual(p, gnb_param_dict1['xn_peers'][p]['xn_addr'])
+        for p in conf['nr_cell_list'][0]['ncell_list']:
+          for k in gnb_param_dict1['ncell_list']:
+            if p['dl_nr_arfcn'] == gnb_param_dict1['ncell_list'][k]['dl_nr_arfcn']:
+              break
+          conf_ncell = gnb_param_dict1['ncell_list'][k]
+          self.assertEqual(p['dl_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['ssb_nr_arfcn'], conf_ncell['ssb_nr_arfcn'])
+          self.assertEqual(p['ul_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['n_id_cell'],    conf_ncell['pci'])
+          self.assertEqual(p['gnb_id_bits'],  conf_ncell['gnb_id_bits'])
+          self.assertEqual(p['nr_cell_id'],   int(conf_ncell['nr_cell_id'], 16))
+          self.assertEqual(p['tac'],          conf_ncell['tac'])
+          self.assertEqual(p['band'],         conf_ncell['nr_band'])
+        tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
+        self.assertEqual(float(tdd_config['period']), 2.5)
+        self.assertEqual(int(tdd_config['dl_slots']), 3)
+        self.assertEqual(int(tdd_config['dl_symbols']), 10)
+        self.assertEqual(int(tdd_config['ul_slots']), 1)
+        self.assertEqual(int(tdd_config['ul_symbols']), 2)
 
         with open(conf_file, 'r') as f:
             for l in f:

software/ors-amarisoft/test/testTDD2600.py

@@ -39,19 +39,19 @@ setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
 
 param_dict = {
     'testing': True,
-    "sim_algo": "milenage",
-    "imsi": "001010000000331",
-    "opc": "000102030405060708090A0B0C0D0E0F",
-    "amf": "0x9001",
-    "sqn": "000000000000",
-    "k": "00112233445566778899AABBCCDDEEFF",
-    "impu": "impu331",
-    "impi": "impi331@amarisoft.com",
+    'sim_algo': 'milenage',
+    'imsi': '001010000000331',
+    'opc': '000102030405060708090A0B0C0D0E0F',
+    'amf': '0x9001',
+    'sqn': '000000000000',
+    'k': '00112233445566778899AABBCCDDEEFF',
+    'impu': 'impu331',
+    'impi': 'impi331@amarisoft.com',
     'tx_gain': 17,
     'rx_gain': 17,
     'dl_earfcn': 325320,
     'n_rb_dl': 50,
-    'enb_id': "0x17",
+    'enb_id': '0x17',
     'pci': 250,
     'mme_list': {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
@@ -62,17 +62,48 @@ param_dict = {
     'nr_band': 99,
     'nr_bandwidth': 50,
     'ssb_nr_arfcn': 377790,
-    'rue_addr': "192.168.99.88",
+    'rue_addr': '192.168.99.88',
     'n_antenna_dl': 2,
     'n_antenna_ul': 2,
     'inactivity_timer': 17,
-    'gnb_id': "0x17",
+    'gnb_id': '0x17',
     'gnb_id_bits': 30,
-    'ssb_pos_bitmap': "10",
+    'ssb_pos_bitmap': '10',
     'amf_list': {
         '10.0.0.1': {'amf_addr': '10.0.0.1'},
         '2001:db8::1': {'amf_addr': '2001:db8::1'},
     },
+    'nr_handover_time_to_trigger': 50,
+    'nr_handover_a3_offset': 10,
+    'ncell_list': {
+        'ORS1': {
+            'dl_nr_arfcn': 100000,
+            'ssb_nr_arfcn': 100000,
+            'pci': 1,
+            'nr_cell_id': '0x0000001',
+            'gnb_id_bits': 28,
+            'nr_band': 1,
+            'tac': 1
+        },
+        'ORS2': {
+            'dl_nr_arfcn': 200000,
+            'ssb_nr_arfcn': 200000,
+            'pci': 2,
+            'nr_cell_id': '0x0000002',
+            'gnb_id_bits': 30,
+            'nr_band': 2,
+            'tac': 2
+        },
+    },
+    'xn_peers': {
+        '2001:db8::1': {
+            'xn_addr': '2001:db8::1',
+        },
+        '2001:db8::2': {
+            'xn_addr': '2001:db8::2',
+        },
+    },
+    'tdd_ul_dl_config': '2.5ms 1UL 3DL 2/10',
 }
 enb_param_dict = {
     'plmn_list': {
@@ -141,6 +172,27 @@ def test_gnb_conf1(self):
               self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n])
         for p in conf['amf_list']:
           self.assertEqual(p['amf_addr'], gnb_param_dict1['amf_list'][p['amf_addr']]['amf_addr'])
+        for p in conf['xn_peers']:
+          self.assertEqual(p, gnb_param_dict1['xn_peers'][p]['xn_addr'])
+        for p in conf['nr_cell_list'][0]['ncell_list']:
+          for k in gnb_param_dict1['ncell_list']:
+            if p['dl_nr_arfcn'] == gnb_param_dict1['ncell_list'][k]['dl_nr_arfcn']:
+              break
+          conf_ncell = gnb_param_dict1['ncell_list'][k]
+          self.assertEqual(p['dl_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['ssb_nr_arfcn'], conf_ncell['ssb_nr_arfcn'])
+          self.assertEqual(p['ul_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['n_id_cell'],    conf_ncell['pci'])
+          self.assertEqual(p['gnb_id_bits'],  conf_ncell['gnb_id_bits'])
+          self.assertEqual(p['nr_cell_id'],   int(conf_ncell['nr_cell_id'], 16))
+          self.assertEqual(p['tac'],          conf_ncell['tac'])
+          self.assertEqual(p['band'],         conf_ncell['nr_band'])
+        tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
+        self.assertEqual(float(tdd_config['period']), 2.5)
+        self.assertEqual(int(tdd_config['dl_slots']), 3)
+        self.assertEqual(int(tdd_config['dl_symbols']), 10)
+        self.assertEqual(int(tdd_config['ul_slots']), 1)
+        self.assertEqual(int(tdd_config['ul_symbols']), 2)
 
         with open(conf_file, 'r') as f:
             for l in f:

software/ors-amarisoft/test/testTDD3500.py

@@ -39,19 +39,19 @@ setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
 
 param_dict = {
     'testing': True,
-    "sim_algo": "milenage",
-    "imsi": "001010000000331",
-    "opc": "000102030405060708090A0B0C0D0E0F",
-    "amf": "0x9001",
-    "sqn": "000000000000",
-    "k": "00112233445566778899AABBCCDDEEFF",
-    "impu": "impu331",
-    "impi": "impi331@amarisoft.com",
+    'sim_algo': 'milenage',
+    'imsi': '001010000000331',
+    'opc': '000102030405060708090A0B0C0D0E0F',
+    'amf': '0x9001',
+    'sqn': '000000000000',
+    'k': '00112233445566778899AABBCCDDEEFF',
+    'impu': 'impu331',
+    'impi': 'impi331@amarisoft.com',
     'tx_gain': 17,
     'rx_gain': 17,
     'dl_earfcn': 325320,
     'n_rb_dl': 50,
-    'enb_id': "0x17",
+    'enb_id': '0x17',
     'pci': 250,
     'mme_list': {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
@@ -62,17 +62,48 @@ param_dict = {
     'nr_band': 99,
     'nr_bandwidth': 50,
     'ssb_nr_arfcn': 377790,
-    'rue_addr': "192.168.99.88",
+    'rue_addr': '192.168.99.88',
     'n_antenna_dl': 2,
     'n_antenna_ul': 2,
     'inactivity_timer': 17,
-    'gnb_id': "0x17",
+    'gnb_id': '0x17',
     'gnb_id_bits': 30,
-    'ssb_pos_bitmap': "10",
+    'ssb_pos_bitmap': '10',
     'amf_list': {
         '10.0.0.1': {'amf_addr': '10.0.0.1'},
         '2001:db8::1': {'amf_addr': '2001:db8::1'},
     },
+    'nr_handover_time_to_trigger': 50,
+    'nr_handover_a3_offset': 10,
+    'ncell_list': {
+        'ORS1': {
+            'dl_nr_arfcn': 100000,
+            'ssb_nr_arfcn': 100000,
+            'pci': 1,
+            'nr_cell_id': '0x0000001',
+            'gnb_id_bits': 28,
+            'nr_band': 1,
+            'tac': 1
+        },
+        'ORS2': {
+            'dl_nr_arfcn': 200000,
+            'ssb_nr_arfcn': 200000,
+            'pci': 2,
+            'nr_cell_id': '0x0000002',
+            'gnb_id_bits': 30,
+            'nr_band': 2,
+            'tac': 2
+        },
+    },
+    'xn_peers': {
+        '2001:db8::1': {
+            'xn_addr': '2001:db8::1',
+        },
+        '2001:db8::2': {
+            'xn_addr': '2001:db8::2',
+        },
+    },
+    'tdd_ul_dl_config': '2.5ms 1UL 3DL 2/10',
 }
 enb_param_dict = {
     'plmn_list': {
@@ -141,6 +172,27 @@ def test_gnb_conf1(self):
               self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n])
         for p in conf['amf_list']:
           self.assertEqual(p['amf_addr'], gnb_param_dict1['amf_list'][p['amf_addr']]['amf_addr'])
+        for p in conf['xn_peers']:
+          self.assertEqual(p, gnb_param_dict1['xn_peers'][p]['xn_addr'])
+        for p in conf['nr_cell_list'][0]['ncell_list']:
+          for k in gnb_param_dict1['ncell_list']:
+            if p['dl_nr_arfcn'] == gnb_param_dict1['ncell_list'][k]['dl_nr_arfcn']:
+              break
+          conf_ncell = gnb_param_dict1['ncell_list'][k]
+          self.assertEqual(p['dl_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['ssb_nr_arfcn'], conf_ncell['ssb_nr_arfcn'])
+          self.assertEqual(p['ul_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['n_id_cell'],    conf_ncell['pci'])
+          self.assertEqual(p['gnb_id_bits'],  conf_ncell['gnb_id_bits'])
+          self.assertEqual(p['nr_cell_id'],   int(conf_ncell['nr_cell_id'], 16))
+          self.assertEqual(p['tac'],          conf_ncell['tac'])
+          self.assertEqual(p['band'],         conf_ncell['nr_band'])
+        tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
+        self.assertEqual(float(tdd_config['period']), 2.5)
+        self.assertEqual(int(tdd_config['dl_slots']), 3)
+        self.assertEqual(int(tdd_config['dl_symbols']), 10)
+        self.assertEqual(int(tdd_config['ul_slots']), 1)
+        self.assertEqual(int(tdd_config['ul_symbols']), 2)
 
         with open(conf_file, 'r') as f:
             for l in f:

software/ors-amarisoft/test/testTDD3700.py

@@ -39,19 +39,19 @@ setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
 
 param_dict = {
     'testing': True,
-    "sim_algo": "milenage",
-    "imsi": "001010000000331",
-    "opc": "000102030405060708090A0B0C0D0E0F",
-    "amf": "0x9001",
-    "sqn": "000000000000",
-    "k": "00112233445566778899AABBCCDDEEFF",
-    "impu": "impu331",
-    "impi": "impi331@amarisoft.com",
+    'sim_algo': 'milenage',
+    'imsi': '001010000000331',
+    'opc': '000102030405060708090A0B0C0D0E0F',
+    'amf': '0x9001',
+    'sqn': '000000000000',
+    'k': '00112233445566778899AABBCCDDEEFF',
+    'impu': 'impu331',
+    'impi': 'impi331@amarisoft.com',
     'tx_gain': 17,
     'rx_gain': 17,
     'dl_earfcn': 325320,
     'n_rb_dl': 50,
-    'enb_id': "0x17",
+    'enb_id': '0x17',
     'pci': 250,
     'mme_list': {
         '10.0.0.1': {'mme_addr': '10.0.0.1'},
@@ -62,17 +62,48 @@ param_dict = {
     'nr_band': 99,
     'nr_bandwidth': 50,
     'ssb_nr_arfcn': 377790,
-    'rue_addr': "192.168.99.88",
+    'rue_addr': '192.168.99.88',
     'n_antenna_dl': 2,
     'n_antenna_ul': 2,
     'inactivity_timer': 17,
-    'gnb_id': "0x17",
+    'gnb_id': '0x17',
     'gnb_id_bits': 30,
-    'ssb_pos_bitmap': "10",
+    'ssb_pos_bitmap': '10',
     'amf_list': {
         '10.0.0.1': {'amf_addr': '10.0.0.1'},
         '2001:db8::1': {'amf_addr': '2001:db8::1'},
     },
+    'nr_handover_time_to_trigger': 50,
+    'nr_handover_a3_offset': 10,
+    'ncell_list': {
+        'ORS1': {
+            'dl_nr_arfcn': 100000,
+            'ssb_nr_arfcn': 100000,
+            'pci': 1,
+            'nr_cell_id': '0x0000001',
+            'gnb_id_bits': 28,
+            'nr_band': 1,
+            'tac': 1
+        },
+        'ORS2': {
+            'dl_nr_arfcn': 200000,
+            'ssb_nr_arfcn': 200000,
+            'pci': 2,
+            'nr_cell_id': '0x0000002',
+            'gnb_id_bits': 30,
+            'nr_band': 2,
+            'tac': 2
+        },
+    },
+    'xn_peers': {
+        '2001:db8::1': {
+            'xn_addr': '2001:db8::1',
+        },
+        '2001:db8::2': {
+            'xn_addr': '2001:db8::2',
+        },
+    },
+    'tdd_ul_dl_config': '2.5ms 1UL 3DL 2/10',
 }
 enb_param_dict = {
     'plmn_list': {
@@ -141,6 +172,27 @@ def test_gnb_conf1(self):
               self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n])
         for p in conf['amf_list']:
           self.assertEqual(p['amf_addr'], gnb_param_dict1['amf_list'][p['amf_addr']]['amf_addr'])
+        for p in conf['xn_peers']:
+          self.assertEqual(p, gnb_param_dict1['xn_peers'][p]['xn_addr'])
+        for p in conf['nr_cell_list'][0]['ncell_list']:
+          for k in gnb_param_dict1['ncell_list']:
+            if p['dl_nr_arfcn'] == gnb_param_dict1['ncell_list'][k]['dl_nr_arfcn']:
+              break
+          conf_ncell = gnb_param_dict1['ncell_list'][k]
+          self.assertEqual(p['dl_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['ssb_nr_arfcn'], conf_ncell['ssb_nr_arfcn'])
+          self.assertEqual(p['ul_nr_arfcn'],  conf_ncell['dl_nr_arfcn'])
+          self.assertEqual(p['n_id_cell'],    conf_ncell['pci'])
+          self.assertEqual(p['gnb_id_bits'],  conf_ncell['gnb_id_bits'])
+          self.assertEqual(p['nr_cell_id'],   int(conf_ncell['nr_cell_id'], 16))
+          self.assertEqual(p['tac'],          conf_ncell['tac'])
+          self.assertEqual(p['band'],         conf_ncell['nr_band'])
+        tdd_config = conf['nr_cell_default']['tdd_ul_dl_config']['pattern1']
+        self.assertEqual(float(tdd_config['period']), 2.5)
+        self.assertEqual(int(tdd_config['dl_slots']), 3)
+        self.assertEqual(int(tdd_config['dl_symbols']), 10)
+        self.assertEqual(int(tdd_config['ul_slots']), 1)
+        self.assertEqual(int(tdd_config['ul_symbols']), 2)
 
         with open(conf_file, 'r') as f:
             for l in f: