ors-amarisoft: fix intra gNB handover

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = f1f1167970ae465cdcece47b722caf20
+md5sum = 60945a3c51ad6704c1f02b2e43018bba
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 2618a2af4eb5b21856e023dcd10c5c24
+md5sum = 678ba2f81ca43eca611e4a41c122073d
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

software/ors-amarisoft/changelog.rst

@@ -20,7 +20,7 @@ Version 1.0.316 (2023-04-14)
     - gnb
     - core-network (replaces epc software type)
 
-Version 1.0.318 (2023-04-20)
+Version 1.0.320 (2023-04-26)
 -------------
 
 * Add support for inter gNB XnAP and NGAP NR handover

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

@@ -118,7 +118,7 @@
         dl_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }},
         ssb_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('ssb_nr_arfcn', '') }},
         ul_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }},
-        n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('n_id_cell', '') }},
+        n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('pci', '') }},
         gnb_id_bits: {{ slapparameter_dict['ncell_list'][k].get('gnb_id_bits', '') }},
         nr_cell_id: {{ slapparameter_dict['ncell_list'][k].get('nr_cell_id', '') }},
         tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }},
@@ -1078,6 +1078,27 @@
   },
 ],
 
+    /* measurement configuration */
+    meas_config_desc: {
+      a1_report_type: "rsrp",
+      a1_rsrp: -60,
+      a1_hysteresis: 10,
+      a1_time_to_trigger: 100,
+      a2_report_type: "rsrp",
+      a2_rsrp: -70,
+      a2_hysteresis: 0,
+      a2_time_to_trigger: 100,
+      a3_report_type: "rsrp",
+      a3_offset: 6,
+      a3_hysteresis: 0,
+      a3_time_to_trigger: 100,
+      ssb_rsrq_filter_coeff: 3,
+      ssb_sinr_filter_coeff: 5
+    },
+    meas_gap_config: {
+      pattern_id: 0
+    },
+
   },
 }
 

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

@@ -88,41 +88,34 @@
 	          "dl_nr_arfcn": {
 	            "title": "DL NR ARFCN",
 	            "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": {{ default_dl_nr_arfcn }}
+	            "type": "number"
 	          },
 	          "ssb_nr_arfcn": {
 	            "title": "SSB NR ARFCN",
 	            "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": ""
+	            "type": "number"
 	          },
             "pci": {
               "title": "Physical Cell ID",
               "description": "Physical Cell ID of the neighbour cell",
-              "type": "number",
-              "default": 500
+              "type": "number"
             },
             "nr_cell_id": {
               "title": "NR Cell ID",
               "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
-              "type": "string",
-              "default": "0x1234501"
+              "type": "string"
             },
 	          "gnb_id_bits": {
 	            "title": "gNB ID bits",
 	            "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
-	            "type": "number",
-	            "default": 28
+	            "type": "number"
 	          },
 	          "nr_band": {
 	            "title": "NR band",
 	            "description": "NR band number",
-	            "type": "number",
-	            "default": {{ default_nr_band }}
+	            "type": "number"
 	          },
             "tac": {
-              "default": 100,
               "title": "Tracking Area Code",
               "description": "Integer (range 0 to 16777215)",
               "type": "number"

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

@@ -88,41 +88,34 @@
 	          "dl_nr_arfcn": {
 	            "title": "DL NR ARFCN",
 	            "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": 378000
+	            "type": "number"
 	          },
 	          "ssb_nr_arfcn": {
 	            "title": "SSB NR ARFCN",
 	            "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": ""
+	            "type": "number"
 	          },
             "pci": {
               "title": "Physical Cell ID",
               "description": "Physical Cell ID of the neighbour cell",
-              "type": "number",
-              "default": 500
+              "type": "number"
             },
             "nr_cell_id": {
               "title": "NR Cell ID",
               "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
-              "type": "string",
-              "default": "0x1234501"
+              "type": "string"
             },
 	          "gnb_id_bits": {
 	            "title": "gNB ID bits",
 	            "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
-	            "type": "number",
-	            "default": 28
+	            "type": "number"
 	          },
 	          "nr_band": {
 	            "title": "NR band",
 	            "description": "NR band number",
-	            "type": "number",
-	            "default": 39
+	            "type": "number"
 	          },
             "tac": {
-              "default": 100,
               "title": "Tracking Area Code",
               "description": "Integer (range 0 to 16777215)",
               "type": "number"

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

@@ -88,41 +88,34 @@
 	          "dl_nr_arfcn": {
 	            "title": "DL NR ARFCN",
 	            "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": 520000
+	            "type": "number"
 	          },
 	          "ssb_nr_arfcn": {
 	            "title": "SSB NR ARFCN",
 	            "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": ""
+	            "type": "number"
 	          },
             "pci": {
               "title": "Physical Cell ID",
               "description": "Physical Cell ID of the neighbour cell",
-              "type": "number",
-              "default": 500
+              "type": "number"
             },
             "nr_cell_id": {
               "title": "NR Cell ID",
               "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
-              "type": "string",
-              "default": "0x1234501"
+              "type": "string"
             },
 	          "gnb_id_bits": {
 	            "title": "gNB ID bits",
 	            "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
-	            "type": "number",
-	            "default": 28
+	            "type": "number"
 	          },
 	          "nr_band": {
 	            "title": "NR band",
 	            "description": "NR band number",
-	            "type": "number",
-	            "default": 38
+	            "type": "number"
 	          },
             "tac": {
-              "default": 100,
               "title": "Tracking Area Code",
               "description": "Integer (range 0 to 16777215)",
               "type": "number"

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

@@ -88,41 +88,34 @@
 	          "dl_nr_arfcn": {
 	            "title": "DL NR ARFCN",
 	            "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": 632628
+	            "type": "number"
 	          },
 	          "ssb_nr_arfcn": {
 	            "title": "SSB NR ARFCN",
 	            "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": ""
+	            "type": "number"
 	          },
             "pci": {
               "title": "Physical Cell ID",
               "description": "Physical Cell ID of the neighbour cell",
-              "type": "number",
-              "default": 500
+              "type": "number"
             },
             "nr_cell_id": {
               "title": "NR Cell ID",
               "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
-              "type": "string",
-              "default": "0x1234501"
+              "type": "string"
             },
 	          "gnb_id_bits": {
 	            "title": "gNB ID bits",
 	            "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
-	            "type": "number",
-	            "default": 28
+	            "type": "number"
 	          },
 	          "nr_band": {
 	            "title": "NR band",
 	            "description": "NR band number",
-	            "type": "number",
-	            "default": 78
+	            "type": "number"
 	          },
             "tac": {
-              "default": 100,
               "title": "Tracking Area Code",
               "description": "Integer (range 0 to 16777215)",
               "type": "number"

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

@@ -88,41 +88,34 @@
 	          "dl_nr_arfcn": {
 	            "title": "DL NR ARFCN",
 	            "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": 646666
+	            "type": "number"
 	          },
 	          "ssb_nr_arfcn": {
 	            "title": "SSB NR ARFCN",
 	            "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
-	            "type": "number",
-	            "default": ""
+	            "type": "number"
 	          },
             "pci": {
               "title": "Physical Cell ID",
               "description": "Physical Cell ID of the neighbour cell",
-              "type": "number",
-              "default": 500
+              "type": "number"
             },
             "nr_cell_id": {
               "title": "NR Cell ID",
               "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
-              "type": "string",
-              "default": "0x1234501"
+              "type": "string"
             },
 	          "gnb_id_bits": {
 	            "title": "gNB ID bits",
 	            "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
-	            "type": "number",
-	            "default": 28
+	            "type": "number"
 	          },
 	          "nr_band": {
 	            "title": "NR band",
 	            "description": "NR band number",
-	            "type": "number",
-	            "default": 78
+	            "type": "number"
 	          },
             "tac": {
-              "default": 100,
               "title": "Tracking Area Code",
               "description": "Integer (range 0 to 16777215)",
               "type": "number"

software/ors-amarisoft/instance.cfg

@@ -50,7 +50,7 @@ recipe = slapos.recipe.build
 init =
   import netifaces
   for i in netifaces.interfaces():
-      if not (i.startswith("slaptun") or i.startswith("re6stnet") or i == "lo"):
+      if not (i.startswith("slaptun") or i.startswith("slaptap") or i.startswith("re6stnet") or i == "lo"):
           a = netifaces.ifaddresses(i)
           if netifaces.AF_INET in a:
               try: