ors-amarisoft: add support for NR inter gNB handover

software/ors-amarisoft/buildout.hash.cfg

@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 0b2a37e6902fd5ad3d6b37e11eebec69
+md5sum = 1333ef2400f2088221ed879f1b03e777
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = cbbbdeda9ddaaf5957d91ef31afe6051
+md5sum = f24666fb64bbfdb5f2e51756b37bb4a4
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

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

@@ -23,6 +23,9 @@
   rf_driver: {
       name: "sdr",
       args: "dev0=/dev/sdr0",
+{% if slapparameter_dict.get('gps_sync', False) %}
+        sync: "gps",
+{% endif %}
       rx_antenna:"tx_rx",
   },
   tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_lte_tx_gain']) }},

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

+{% set dl_nr_arfcn = slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) %}
+{% set band = slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) %}
+{% set gnb_id_bits = slapparameter_dict.get('gnb_id_bits', 28) %}
+
 #define FR2                  0  // Values: 0 (FR1), 1 (FR2)
 #define NR_TDD_CONFIG        2  // Values: FR1: 1, 2, 3, 4 (compatible with LTE TDD config 2) FR2: 10
 #define N_ANTENNA_DL         {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }}  // Values: 1 (SISO), 2 (MIMO 2x2), 4 (MIMO 4x4)
@@ -29,10 +33,10 @@
 {% else %}
   rf_driver: {
         name: "sdr",
-
         args: "dev0=/dev/sdr0",
-
-        // sync: "gps",
+{% if slapparameter_dict.get('gps_sync', False) %}
+        sync: "gps",
+{% endif %}
         rx_antenna: "tx_rx",
   },
   tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
@@ -68,7 +72,7 @@
   gtp_addr: "127.0.1.1",
 {% endif %}
 
-  gnb_id_bits: {{ slapparameter_dict.get('gnb_id_bits', 28) }},
+  gnb_id_bits: {{ gnb_id_bits }},
   gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},
 
   nr_support: true,
@@ -92,11 +96,38 @@
   nr_cell_list: [
   {
     rf_port: 0,
-    cell_id: 0x01,
-    band: {{ slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) }},
-    dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) }},
+    cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }},
+    band: {{ band }},
+    dl_nr_arfcn: {{ dl_nr_arfcn }},
     subcarrier_spacing: 30,
     ssb_pos_bitmap: "{{ slapparameter_dict.get('ssb_pos_bitmap', slap_configuration['configuration.default_nr_ssb_pos_bitmap']) }}",
+
+{%- if slapparameter_dict.get('ncell_list', '') %}
+    ncell_list: [
+{%- for i, k in enumerate(slapparameter_dict['ncell_list']) %}
+{%- if i == 0 -%}
+      {
+{%- else -%}
+      , {
+{%- endif %}
+        rat: "nr",
+        ssb_nr_arfcn: {{ dl_nr_arfcn }},
+        dl_nr_arfcn: {{ dl_nr_arfcn }},
+        ul_nr_arfcn: {{ dl_nr_arfcn }},
+        n_id_cell: 500,
+        gnb_id_bits: {{ gnb_id_bits }},
+        nr_cell_id: {{ slapparameter_dict['ncell_list'][k].get('nr_cell_id', '') }},
+        tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }},
+        band: {{ band }},
+        ssb_subcarrier_spacing: 30,
+        ssb_period: 20,
+        ssb_offset: 0,
+        ssb_duration: 1,
+      }
+{%- endfor -%}
+    ],
+{% endif %}
+
   },
   ],
 

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

@@ -25,6 +25,12 @@
       "type": "number",
       "default": {{ default_lte_rx_gain }}
     },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",

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

@@ -25,6 +25,24 @@
       "type": "number",
       "default": {{ default_nr_rx_gain }}
     },
+    "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 }}
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
     "dl_nr_arfcn": {
       "title": "DL NR ARFCN",
       "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
@@ -61,6 +79,31 @@
       "type": "object",
       "default": {}
     },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "nr_cell_id": {
+              "title": "NR Cell ID",
+              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
+              "type": "string",
+              "default": "0x1234501"
+            },
+            "tac": {
+              "default": 100,
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
     "gnb_id": {
       "title": "gNB ID",
       "description": "gNB ID",
@@ -73,6 +116,12 @@
       "type": "number",
       "default": 28
     },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string",
+      "default": "0x01"
+    },
     "pci": {
       "title": "Physical Cell ID",
       "description": "Physical Cell ID",
@@ -199,18 +248,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-tdd1900-enb-input-schema.json

@@ -25,6 +25,12 @@
       "type": "number",
       "default": 45
     },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",

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

@@ -211,6 +211,43 @@
       "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
-    }
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string",
+      "default": "0x01"
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "nr_cell_id": {
+              "title": "NR Cell ID",
+              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
+              "type": "string",
+              "default": "0x1234501"
+            },
+            "tac": {
+              "default": 100,
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
   }
 }

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

@@ -25,6 +25,12 @@
       "type": "number",
       "default": 45
     },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",

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

@@ -211,6 +211,43 @@
       "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
-    }
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string",
+      "default": "0x01"
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "nr_cell_id": {
+              "title": "NR Cell ID",
+              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
+              "type": "string",
+              "default": "0x1234501"
+            },
+            "tac": {
+              "default": 100,
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
   }
 }

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

@@ -25,6 +25,12 @@
       "type": "number",
       "default": 45
     },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",

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

@@ -211,6 +211,43 @@
       "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
-    }
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string",
+      "default": "0x01"
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "nr_cell_id": {
+              "title": "NR Cell ID",
+              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
+              "type": "string",
+              "default": "0x1234501"
+            },
+            "tac": {
+              "default": 100,
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
   }
 }

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

@@ -25,6 +25,12 @@
       "type": "number",
       "default": 45
     },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
     "dl_earfcn": {
       "title": "DL EARFCN",
       "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",

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

@@ -211,6 +211,43 @@
       "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
-    }
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string",
+      "default": "0x01"
+    },
+    "gps_sync": {
+      "default": false,
+      "title": "GPS synchronisation",
+      "description": "True if GPS should be used for synchronisation",
+      "type": "boolean"
+    },
+    "ncell_list": {
+      "title": "Neighbour Cell Info",
+      "description": "Neighbour Cell Info",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "nr_cell_id": {
+              "title": "NR Cell ID",
+              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
+              "type": "string",
+              "default": "0x1234501"
+            },
+            "tac": {
+              "default": 100,
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
   }
 }