Merge branch 'x/lte-multiru' into xy/lte-multiru

Current draft state; should be more or less working with multiple Lopcomm radio units.

software/ors-amarisoft/README.md

@@ -9,29 +9,6 @@ How to deploy from scratch
   2. Install ors playbook
   3. Deploy this SR
 
-## Generated buildout configurations and json input schemas
-
-Since there are multiple ors-amarisoft softwares releases and software types, the following files are
-generated with jinja2 templates with the render-templates script before being pushed to gitlab:
-
- * instance-tdd-enb-input-schema.json
- * instance-fdd-enb-input-schema.json
- * software-fdd.cfg
- * software-tdd.cfg.json
- * instance-fdd-ue-nr-input-schema.json
- * instance-tdd-gnb-input-schema.json
- * instance-tdd-ue-nr-input-schema.json
- * test/testFDD.py
- * test/testTDD.py
- * software-tdd.cfg
- * instance-tdd-ue-lte-input-schema.json
- * instance-fdd-gnb-input-schema.json
- * software-fdd.cfg.json
- * instance-fdd-ue-lte-input-schema.json
-
-These files should not be modified directly, and the render-templates scripts should be run along
-with update-hash before each commit.
-
 ## Services
 
 We run 2 binaries from Amarisoft LTE stack:

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

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "plmn_list": {
+      "title": "PLMN list",
+      "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "plmn": {
+              "default": "00101",
+              "title": "Public Land Mobile Network",
+              "description": "Public Land Mobile Network",
+              "type": "string"
+            },
+            "tac": {
+              "default": 100,
+              "title": "Tracking Area Code",
+              "description": "Integer (range 0 to 16777215)",
+              "type": "number"
+            },
+            "ranac": {
+              "title": "Optional integer (range 0 to 255)",
+              "description": "RAN Area Code",
+              "type": "number"
+            },
+            "reserved": {
+              "default": false,
+              "title": "Reserved",
+              "description": "True if the cell is reserved for operator use.",
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "nssai": {
+      "title": "AMF slices configuration",
+      "description": "AMF slices configuration.",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "sst": {
+              "default": 1,
+              "title": "Slice Service Type",
+              "description": "Integer (range 1 to 255).",
+              "type": "number"
+            },
+            "sd": {
+              "default": "0x000032",
+              "title": "Slice Differentiator",
+              "description": "Optional integer (range 0 to 0xFFFFFE)",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
+    "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 trigger after which NR handover will be triggered if A3 offset is reached",
+      "type": "number",
+      "enum": [
+        0,
+        40,
+        64,
+        80,
+        100,
+        128,
+        160,
+        256,
+        320,
+        480,
+        512,
+        640,
+        1024,
+        1280,
+        2560,
+        5120
+      ],
+      "default": 100
+    }
+  }
+}

software/ors-amarisoft/buildout.hash.cfg

@@ -16,35 +16,39 @@
 
 [template]
 filename = instance.cfg
-md5sum = a9e416eaa3ad7d2ea29cb90ce2c41a60
+md5sum = 883fc0c659b94ad732809db09d4f4665
+
+[template-ors]
+filename = instance-ors.cfg
+md5sum = f5c76c3443b75569eb18503dce38e783
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = c31dffa87765d93327f18ffd89ce36ca
-
-[amarisoft-stats.jinja2.py]
-_update_hash_filename_ = amarisoft-stats.jinja2.py
-md5sum = c4d5e9fcf460d88bc2b4bcfbdfe554f7
-
-[amarisoft-rf-info.jinja2.py]
-_update_hash_filename_ = amarisoft-rf-info.jinja2.py
-md5sum = ab666fdfadbfc7d8a16ace38d295c883
+md5sum = 8c044b28682940fbca62657c16613157
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 6febf4dc601ba5feb30aa402f37265cf
+md5sum = 031805301916a7d17a6a8fb31914cbea
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
-md5sum = c20b620111a4dc4bc2bcae57c2007cbe
+md5sum = b7906ca3a6b17963f78f680fc0842b74
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = abce2deca15b8d7a8c5378e0789f8ce7
+md5sum = 409ab889d75ec260aa0e52548463a38f
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
-md5sum = 0450e9fa50844e4d6e51d608625c57f6
+md5sum = bc5d82b8737b6990674b280ef2774be7
+
+[ru_amarisoft-stats.jinja2.py]
+_update_hash_filename_ = ru/amarisoft-stats.jinja2.py
+md5sum = 674dcc250c0b6bb43d8546624552fc5d
+
+[ru_amarisoft-rf-info.jinja2.py]
+_update_hash_filename_ = ru/amarisoft-rf-info.jinja2.py
+md5sum = d2fe2fbe70c6824c514a7c4034a2ddb3
 
 [ru_lopcomm_ncclient_common.py]
 _update_hash_filename_ = ru/lopcomm/ncclient_common.py
@@ -74,29 +78,29 @@ md5sum = 2b08bb666c5f3ab287cdddbfdb4c9249
 _update_hash_filename_ = ru/tapsplit
 md5sum = 2b8b57c5771b2a2203c0e7767e629e55
 
+[ru_xbuildout.py]
+_update_hash_filename_ = ru/xbuildout.py
+md5sum = b9aa7356ebccfb1e9d2324106ad88485
+
 [ru_capdo.c]
 _update_hash_filename_ = ru/capdo.c
 md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 3b380ac8a44aafc30cc6d87b35860fd6
+md5sum = 143f9b0e9866d37e6527e89f74b4ef1c
 
-[template-gnb]
-_update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = e8e87a50b861d733894eb69e1aefa683
+[template-ors-enb]
+_update_hash_filename_ = instance-ors-enb.jinja2.cfg
+md5sum = 8edc4511be7204d1096e0c1cc00802e4
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
 md5sum = c807be73b9304f5a4c7483a3776bbc17
 
-[template-ue-lte]
-_update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = b444f859248778e18c5eba60f5670f6c
-
-[template-ue-nr]
-_update_hash_filename_ = instance-ue-nr.jinja2.cfg
-md5sum = bc65fdce1c453d92310d53928dcaaa7a
+[template-ue]
+_update_hash_filename_ = instance-ue.jinja2.cfg
+md5sum = aa6b8e50bd8d9c4cc6e23b01a2be5644
 
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg
@@ -108,27 +112,24 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = a961cc1469bd2534645470f914f12905
+md5sum = a8e67b3c9373fe4d97066a64d1ff8a98
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg
-md5sum = 6c8bdb0ce1d2bdd846a87aa6c5204a9c
+md5sum = a11c10066c32900931a51abb4d6b0c45
 
 [drb_nr.jinja2.cfg]
 filename = config/drb_nr.jinja2.cfg
-md5sum = 84d3cef8fc7f1c2aed7c348d500f5636
+md5sum = 328c4760ef188c1cccc2ef3c7b68b7f3
+
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
-md5sum = a1973ba6e43d40e510d61d461c2d13ac
-
-[gnb.jinja2.cfg]
-filename = config/gnb.jinja2.cfg
-md5sum = a4f91c1c9cfd91d000f4845a88cdb38a
+md5sum = cbb893a0dd9de6b8f54bcfc21928bad2
 
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg
-md5sum = 3d7833ddba3242cedcd74c7db52390c6
+md5sum = 44fc9ee5082dd8e0298801f8d4618b06
 
 [dnsmasq-core-network.jinja2.cfg]
 filename = config/dnsmasq-core-network.jinja2.cfg
@@ -136,19 +137,15 @@ md5sum = f167b4be5e327b276b42267e0678f577
 
 [ru_dnsmasq.jinja2.cfg]
 _update_hash_filename_ = ru/dnsmasq.jinja2.cfg
-md5sum = 345e4967d468b00c13d77821bce8a248
+md5sum = ade86715b6121b654552b11d7c756c10
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg
 md5sum = 36281b03597252cf75169417d02fc28c
 
-[ue-lte.jinja2.cfg]
-filename = config/ue-lte.jinja2.cfg
-md5sum = c0313f9d15543361f7c8e19af96c737a
-
-[ue-nr.jinja2.cfg]
-filename = config/ue-nr.jinja2.cfg
-md5sum = 824233ab4d53ec428d358fb67bca8ba2
+[ue.jinja2.cfg]
+filename = config/ue.jinja2.cfg
+md5sum = 9bffa00d88ffa57cf1e3b11a24c494b9
 
 [ru_lopcomm_CreateProcessingEle.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/CreateProcessingEle.jinja2.xml
@@ -156,7 +153,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
 
 [ru_lopcomm_cu_config.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml
-md5sum = 09123ad68c6d8e7e4e201bcc2ab331c6
+md5sum = 274faf246197cbdd4973b772569daa8e
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

software/ors-amarisoft/cell/common.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "Cell. Common properties",
+  "type": "object",
+
+  "required": [
+    "cell_type",
+    "rf_mode",
+    "pci",
+    "cell_id",
+    "bandwidth",
+    "ru"
+  ],
+
+  "properties": {
+    "cell_type": {
+      "type": "string",
+      "options":  { "hidden": true }
+    },
+    "cell_kind": {
+      "type": "string",
+      "const":    "enb",
+      "template": "enb",
+      "options":  { "hidden": true }
+    },
+
+    "rf_mode": {
+      "title": "RF mode",
+      "description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
+      "type": "string",
+      "enum": ["fdd", "tdd"],
+      "propertyOrder": 101
+    },
+    "pci": {
+      "title": "Physical Cell ID",
+      "description": "Physical Cell ID",
+      "type": "integer"
+    },
+    "cell_id": {
+      "title": "Cell ID",
+      "description": "Cell ID",
+      "type": "string"
+    },
+    "bandwidth": {
+      "title": "Bandwidth",
+      "description": "Downlink Bandwidth (in MHz)",
+      "type": "number"
+    },
+    "root_sequence_index": {
+      "title": "Root Sequence Index",
+      "description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
+      "type": "integer",
+      "default": 204
+    },
+    "ru": {
+      "$ref": "#/$defs/ru-of-cell",
+      "propertyOrder": 9999
+    }
+  },
+
+  "$defs": {
+    "ru-of-cell": {
+      "title": "Radio Unit",
+      "oneOf": [
+        {
+          "title": "Shared Radio Unit",
+          "description": "Use radio unit defined in separate shared instance",
+          "type": "object",
+          "required": ["ru_type", "ru_ref"],
+          "properties": {
+            "ru_type": {
+                "const":    "ru_ref",
+                "template": "ru_ref",
+                "options":  { "hidden": true }
+            },
+            "ru_ref": {
+              "title": "RU Reference",
+              "description": "Reference of shared radio unit instance",
+              "type": "string"
+            }
+          }
+        },
+        {
+          "title": "Shared Radio Unit of a Cell",
+          "description": "Use the same radio unit as referenced cell instance does",
+          "type": "object",
+          "required": ["ru_type", "ruincell_ref"],
+          "properties": {
+            "ru_type": {
+                "const":    "ruincell_ref",
+                "template": "ruincell_ref",
+                "options":  { "hidden": true }
+            },
+            "ruincell_ref": {
+              "title": "Cell Reference",
+              "description": "Reference of cell instance whose radio unit to share",
+              "type": "string"
+            }
+          }
+        },
+        { "$ref": "../ru/input-schema.json" }
+      ]
+    }
+  }
+}

software/ors-amarisoft/cell/input-schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "Cell",
+  "type": "object",
+  "oneOf": [
+    { "$ref": "../cell/lte/input-schema.json" },
+    { "$ref": "../cell/nr/input-schema.json" }
+  ]
+}

software/ors-amarisoft/cell/lte/input-schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "LTE Cell",
+  "type": "object",
+
+  "required": [
+    "cell_type",
+    "rf_mode",
+    "pci",
+    "cell_id",
+    "bandwidth",
+    "ru",
+
+    "dl_earfcn",
+    "tac"
+  ],
+  "properties": {
+    "$ref": "../../cell/common.json#/properties",
+
+    "cell_type": {
+      "$ref": "#/properties/cell_type",
+      "const":    "lte",
+      "template": "lte"
+    },
+
+    "tdd_ul_dl_config": {
+      "title": "TDD Configuration",
+      "type": "string",
+      "enum": [
+        "[Configuration 2] 5ms 2UL 6DL (default)",
+        "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
+      ],
+      "default": "[Configuration 2] 5ms 2UL 6DL (default)",
+      "options": {
+        "dependencies": {
+          "rf_mode": "tdd"
+        }
+      }
+    },
+
+    "bandwidth": {
+      "$ref": "#/properties/bandwidth",
+      "enum": [
+        1.4,
+        3,
+        5,
+        10,
+        15,
+        20
+      ]
+    },
+
+    "dl_earfcn": {
+      "title": "DL EARFCN",
+      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
+      "type": "integer"
+    },
+    "ul_earfcn": {
+      "title": "UL EARFCN",
+      "description": "Uplink E-UTRA Absolute Radio Frequency Channel Number of the cell. By default a frequency corresponding to dl_earfcn is chosen.",
+      "type": "integer"
+    },
+    "tac": {
+      "title": "Tracking Area Code",
+      "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
+      "type": "string"
+    }
+  }
+}

software/ors-amarisoft/cell/nr/input-schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "NR Cell",
+  "type": "object",
+
+  "required": [
+    "cell_type",
+    "rf_mode",
+    "pci",
+    "cell_id",
+    "bandwidth",
+    "ru",
+
+    "dl_nr_arfcn",
+    "nr_band"
+  ],
+  "properties": {
+    "$ref": "../../cell/common.json#/properties",
+
+    "cell_type": {
+      "$ref": "#/properties/cell_type",
+      "const":    "nr",
+      "template": "nr"
+    },
+
+    "tdd_ul_dl_config": {
+      "title": "TDD Configuration",
+      "type": "string",
+      "enum": [
+        "5ms 2UL 7DL 4/6 (default)",
+        "2.5ms 1UL 3DL 2/10",
+        "5ms 8UL 1DL 2/10 (maximum uplink)"
+      ],
+      "default": "5ms 2UL 7DL 4/6 (default)",
+      "options": {
+        "dependencies": {
+          "rf_mode": "tdd"
+        }
+      }
+    },
+
+    "bandwidth": {
+      "$ref": "#/properties/bandwidth"
+    },
+
+    "dl_nr_arfcn": {
+      "title": "DL NR ARFCN",
+      "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
+      "type": "integer"
+    },
+    "nr_band": {
+      "title": "NR band",
+      "description": "NR band number",
+      "type": "integer"
+    },
+    "ul_nr_arfcn": {
+      "title": "UL NR ARFCN",
+      "description": "Uplink NR Absolute Radio Frequency Channel Number of the cell. By default a frequency corresponding to dl_nr_arfcn and nr_band is chosen.",
+      "type": "integer"
+    },
+    "ssb_nr_arfcn": {
+      "title": "SSB NR ARFCN",
+      "description": "SSB NR Absolute Radio Frequency Channel Number of the cell. If set it must be an element of global synchronization raster and be at offset from center DL frequency that aligns with SSB subcarrier spacing of selected band. By default a valid frequency nearby dl_nr_arfcn is chosen.",
+      "type": "integer"
+    },
+    "ssb_pos_bitmap": {
+      "title": "SSB Position Bitmap",
+      "description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
+      "type": "string",
+      "default": "10000000"
+    }
+  }
+}

software/ors-amarisoft/cell/schema.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "Values returned by Cell instantiation (stub)",
+  "type": "object",
+  "properties": {}
+}

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

-// DRB configuration for LTE cell.
+// DRB configuration for LTE cell {{ cell_ref }} @ {{ ru_ref }}.
 // DRB configuration vary in beteen FDD and TDD modes.
 
-{%  set T_REORDERING = {'fdd': 35, 'tdd': 65} [rf_mode] %}
-// {{ rf_mode | upper }}  T_REORDERING={{ T_REORDERING }}
+{%  set T_REORDERING = {'fdd': 35, 'tdd': 65} [cell.rf_mode] %}
+// {{ cell.rf_mode | upper }}  T_REORDERING={{ T_REORDERING }}
 
 [
   {

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

-// DRB configuration for NR cell.
+// DRB configuration for NR cell {{ cell_ref }} @ {{ ru_ref }}.
 
 [
   {

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

@@ -2,6 +2,8 @@
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,ngap.level=debug,ngap.max_size=1,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/mme.log",
 
+  com_addr: "127.0.1.2:9000",
+  
 {% if slapparameter_dict.get('external_enb_gnb', '') %}
 {%   if slapparameter_dict.get('use_ipv4', False) %}
   gtp_addr: "{{ gtp_addr_v4 }}",

software/ors-amarisoft/config/out/CELL_a-sib23.asn

+/* SIB2/SIB3 for LTE cell CELL_a @ RU1. */
+{
+  message c1: systemInformation: {
+    criticalExtensions systemInformation-r8: {
+      sib-TypeAndInfo {
+        sib2: {
+          radioResourceConfigCommon {
+            rach-ConfigCommon {
+              preambleInfo {
+                numberOfRA-Preambles n52
+              },
+              powerRampingParameters {
+                powerRampingStep dB2,
+                preambleInitialReceivedTargetPower dBm-104
+              },
+              ra-SupervisionInfo {
+                preambleTransMax n10,
+                ra-ResponseWindowSize sf10,
+                mac-ContentionResolutionTimer sf40
+              },
+              maxHARQ-Msg3Tx 5
+            },
+            bcch-Config {
+              modificationPeriodCoeff n4
+            },
+            pcch-Config {
+              defaultPagingCycle rf128,
+              nB oneT
+            },
+            prach-Config {
+              rootSequenceIndex 0, /* patched by eNB */
+              prach-ConfigInfo {
+                prach-ConfigIndex 4, /* patched by eNB */
+                highSpeedFlag FALSE,
+                zeroCorrelationZoneConfig 11,
+                prach-FreqOffset 4 /* patched by eNB */
+              }
+            },
+            pdsch-ConfigCommon {
+
+              referenceSignalPower -8, /* patched by eNB */
+
+              p-b 1 /* patched by eNB */
+            },
+            pusch-ConfigCommon {
+              pusch-ConfigBasic {
+                n-SB 1,
+                hoppingMode interSubFrame,
+                pusch-HoppingOffset 8, /* patched by eNB */
+                enable64QAM FALSE /* patched by eNB */
+              },
+              ul-ReferenceSignalsPUSCH {
+                groupHoppingEnabled FALSE,
+                groupAssignmentPUSCH 0,
+                sequenceHoppingEnabled FALSE,
+                cyclicShift 0
+              }
+            },
+            pucch-ConfigCommon {
+              deltaPUCCH-Shift ds2,
+              nRB-CQI 4, /* patched by eNB */
+              nCS-AN 0,
+              n1PUCCH-AN 12 /* patched by eNB */
+            },
+            soundingRS-UL-ConfigCommon setup: {
+              srs-BandwidthConfig bw2, /* patched by eNB */
+              srs-SubframeConfig sc3, /* patched by eNB */
+              ackNackSRS-SimultaneousTransmission TRUE
+            },
+            uplinkPowerControlCommon {
+              p0-NominalPUSCH -85,
+              alpha al1,
+              p0-NominalPUCCH -117,
+              deltaFList-PUCCH {
+                deltaF-PUCCH-Format1 deltaF0,
+                deltaF-PUCCH-Format1b deltaF3,
+                deltaF-PUCCH-Format2 deltaF1,
+                deltaF-PUCCH-Format2a deltaF2,
+                deltaF-PUCCH-Format2b deltaF2
+              },
+              deltaPreambleMsg3 4
+            },
+            ul-CyclicPrefixLength len1
+          },
+          ue-TimersAndConstants {
+            t300 ms200,
+            t301 ms200,
+            t310 ms200,
+            n310 n6,
+            t311 ms10000,
+            n311 n5
+          },
+          freqInfo {
+            additionalSpectrumEmission 1
+          },
+          timeAlignmentTimerCommon infinity
+        },
+        sib3: {
+          cellReselectionInfoCommon {
+            q-Hyst dB2
+          },
+          cellReselectionServingFreqInfo {
+            s-NonIntraSearch 3,
+            threshServingLow 2,
+            cellReselectionPriority 6
+          },
+          intraFreqCellReselectionInfo {
+            q-RxLevMin -61,
+            p-Max 23,
+            s-IntraSearch 5,
+            presenceAntennaPort1 TRUE,
+            neighCellConfig '01'B,
+            t-ReselectionEUTRA 1
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

software/ors-amarisoft/config/out/CELL_b-drb.cfg

+// DRB configuration for NR cell CELL_b @ RU2.
+
+[
+  {
+    qci: 1,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 6,
+      },
+      dl_um: {
+        sn_FieldLength: 6,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+    },
+  },
+  {
+    qci: 2,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 8,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 1,
+    },
+  },
+  {
+    qci: 3,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 2,
+    },
+  },
+  {
+    qci: 4,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 9,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 3,
+    },
+  },
+  {
+    qci: 65,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 12,
+      pdcp_SN_SizeDL: 12,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 6,
+      },
+      dl_um: {
+        sn_FieldLength: 6,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 5,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 66,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 150,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 7,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 67,
+    use_for_mr_dc_scg: false,
+    ims_dedicated_bearer: true,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+  {
+    qci: 5,
+    use_for_mr_dc_scg: false,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 6,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 6,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 10,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+  {
+    qci: 7,
+    pdcp_config: {
+      discardTimer: 100,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: false,
+      outOfOrderDelivery: false,
+      t_Reordering: 0,
+    },
+    rlc_config: {
+      ul_um: {
+        sn_FieldLength: 12,
+      },
+      dl_um: {
+        sn_FieldLength: 12,
+        t_Reassembly: 50,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 0,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 6,
+    },
+  },
+  {
+    qci: 8,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 12,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 7,
+    },
+  },
+  {
+    qci: 9,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 13,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 7,
+    },
+  },
+  {
+    qci: 69,
+    use_for_mr_dc_scg: false,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 4,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 4,
+    },
+  },
+  {
+    qci: 70,
+    pdcp_config: {
+      discardTimer: 0,
+      pdcp_SN_SizeUL: 18,
+      pdcp_SN_SizeDL: 18,
+      statusReportRequired: true,
+      outOfOrderDelivery: false,
+    },
+    rlc_config: {
+      ul_am: {
+        sn_FieldLength: 18,
+        t_PollRetransmit: 80,
+        pollPDU: 64,
+        pollByte: 125,
+        maxRetxThreshold: 4,
+      },
+      dl_am: {
+        sn_FieldLength: 18,
+        t_Reassembly: 80,
+        t_StatusProhibit: 10,
+      },
+    },
+    logical_channel_config: {
+      priority: 11,
+      prioritisedBitRate: 8,
+      bucketSizeDuration: 100,
+      logicalChannelGroup: 5,
+    },
+  },
+]
\ No newline at end of file

software/ors-amarisoft/config/out/CELL_b-sib23.asn

+/* SIB2/SIB3 for NR cell CELL_b @ RU2. */
+{
+  message c1: systemInformation: {
+    criticalExtensions systemInformation-r8: {
+      sib-TypeAndInfo {
+        sib2: {
+          radioResourceConfigCommon {
+            rach-ConfigCommon {
+              preambleInfo {
+                numberOfRA-Preambles n52
+              },
+              powerRampingParameters {
+                powerRampingStep dB2,
+                preambleInitialReceivedTargetPower dBm-104
+              },
+              ra-SupervisionInfo {
+                preambleTransMax n10,
+                ra-ResponseWindowSize sf10,
+                mac-ContentionResolutionTimer sf40
+              },
+              maxHARQ-Msg3Tx 5
+            },
+            bcch-Config {
+              modificationPeriodCoeff n4
+            },
+            pcch-Config {
+              defaultPagingCycle rf128,
+              nB oneT
+            },
+            prach-Config {
+              rootSequenceIndex 0, /* patched by eNB */
+              prach-ConfigInfo {
+                prach-ConfigIndex 4, /* patched by eNB */
+                highSpeedFlag FALSE,
+                zeroCorrelationZoneConfig 11,
+                prach-FreqOffset 4 /* patched by eNB */
+              }
+            },
+            pdsch-ConfigCommon {
+
+              referenceSignalPower -8, /* patched by eNB */
+
+              p-b 1 /* patched by eNB */
+            },
+            pusch-ConfigCommon {
+              pusch-ConfigBasic {
+                n-SB 1,
+                hoppingMode interSubFrame,
+                pusch-HoppingOffset 8, /* patched by eNB */
+                enable64QAM FALSE /* patched by eNB */
+              },
+              ul-ReferenceSignalsPUSCH {
+                groupHoppingEnabled FALSE,
+                groupAssignmentPUSCH 0,
+                sequenceHoppingEnabled FALSE,
+                cyclicShift 0
+              }
+            },
+            pucch-ConfigCommon {
+              deltaPUCCH-Shift ds2,
+              nRB-CQI 4, /* patched by eNB */
+              nCS-AN 0,
+              n1PUCCH-AN 12 /* patched by eNB */
+            },
+            soundingRS-UL-ConfigCommon setup: {
+              srs-BandwidthConfig bw2, /* patched by eNB */
+              srs-SubframeConfig sc3, /* patched by eNB */
+              ackNackSRS-SimultaneousTransmission TRUE
+            },
+            uplinkPowerControlCommon {
+              p0-NominalPUSCH -85,
+              alpha al1,
+              p0-NominalPUCCH -117,
+              deltaFList-PUCCH {
+                deltaF-PUCCH-Format1 deltaF0,
+                deltaF-PUCCH-Format1b deltaF3,
+                deltaF-PUCCH-Format2 deltaF1,
+                deltaF-PUCCH-Format2a deltaF2,
+                deltaF-PUCCH-Format2b deltaF2
+              },
+              deltaPreambleMsg3 4
+            },
+            ul-CyclicPrefixLength len1
+          },
+          ue-TimersAndConstants {
+            t300 ms200,
+            t301 ms200,
+            t310 ms200,
+            n310 n6,
+            t311 ms10000,
+            n311 n5
+          },
+          freqInfo {
+            additionalSpectrumEmission 1
+          },
+          timeAlignmentTimerCommon infinity
+        },
+        sib3: {
+          cellReselectionInfoCommon {
+            q-Hyst dB2
+          },
+          cellReselectionServingFreqInfo {
+            s-NonIntraSearch 3,
+            threshServingLow 2,
+            cellReselectionPriority 6
+          },
+          intraFreqCellReselectionInfo {
+            q-RxLevMin -61,
+            p-Max 23,
+            s-IntraSearch 5,
+            presenceAntennaPort1 TRUE,
+            neighCellConfig '01'B,
+            t-ReselectionEUTRA 1
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

software/ors-amarisoft/config/out/ue.cfg

+{
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
+  log_filename: "log/ue.log",
+
+  rue_bind_addr: "::1",
+  com_addr: "[::1]:9002",
+
+
+
+  // Radio Units
+  rf_driver: {
+  // XXX vvv <- ru.txrx_active ?  XXX how to handle txrx_active for SDR ?
+  // (tx_gain=-1000 does not work - it still sets tx_gain to min.possible value 14)
+      name: "sdr",
+      // _UCELL1_ru 2T1R  (sdr)
+      // _UCELL2_ru 2T2R  (sdr)
+      args: "dev0=/dev/sdr0,dev1=/dev/sdr2",
+      rx_antenna:"tx_rx",
+      tdd_tx_mod: 1,
+  },
+  tx_gain: [41, 41, 31, 31],
+  rx_gain: [42, 32, 32],
+
+
+  cell_groups: [{
+    // LTE cells
+    group_type: "lte",
+    multi_ue: true,
+
+    cells: [
+
+        // UCELL1
+        {
+          rf_port:      0,
+          n_antenna_dl: 2,
+          n_antenna_ul: 1,
+
+          dl_earfcn: 38050,
+          ul_earfcn: 38050,
+          bandwidth: 5,
+
+          global_timing_advance: -1,
+        },
+    ],
+    pdcch_decode_opt: false,
+    pdcch_decode_opt_threshold: 0.1,
+
+  }, {
+    // NR cells
+    group_type: "nr",
+    multi_ue: true,
+
+    cells: [
+        // UCELL2
+        {
+          rf_port:      1,
+          n_antenna_dl: 2,
+          n_antenna_ul: 2,
+
+          band:         7,
+          dl_nr_arfcn:  537200,
+          ul_nr_arfcn:  513200,
+          ssb_nr_arfcn: 537170,
+          bandwidth:    5,
+
+          subcarrier_spacing: 15,
+        },
+    ]
+  }],
+
+  ue_list: [
+    // UE1
+    {
+      sim_algo: "milenage",
+      opc: "milenage",
+      amf: 0x9001,
+      sqn: "000000000000",
+      impu: "",
+      impi: "",
+      imsi: "001010123456789",
+      K: "00112233445566778899aabbccddeeff",
+      rue_addr: "host1",
+      as_release: 13,
+      ue_category: 13,
+      tun_setup_script: "ue-ifup",
+      apn: "internet",
+    },
+    // UE2
+    {
+      sim_algo: "milenage",
+      opc: "milenage",
+      amf: 0x9001,
+      sqn: "000000000000",
+      impu: "",
+      impi: "",
+      imsi: "001010123456789",
+      K: "00112233445566778899aabbccddeeff",
+      rue_addr: "host2",
+      as_release: 15,
+      ue_category: "nr",
+      tun_setup_script: "ue-ifup",
+      apn: "internet",
+    },
+  ],
+}
\ No newline at end of file

software/ors-amarisoft/config/sib23.jinja2.asn

+/* SIB2/SIB3 for {{ cell.cell_type | upper }} cell {{ cell_ref }} @ {{ ru_ref }}. */
 {
   message c1: systemInformation: {
     criticalExtensions systemInformation-r8: {
@@ -36,11 +37,11 @@
               }
             },
             pdsch-ConfigCommon {
-{% if bbu == "ors" %}
-{%- if one_watt == "True" %}
-              referenceSignalPower {{ (tx_gain | int) - 54 }}, /* patched by eNB */
+{% if ors %}
+{%- if ors['one-watt'] %}
+              referenceSignalPower {{ (ru.tx_gain | int) - 54 }}, /* patched by eNB */
 {%- else %}
-              referenceSignalPower {{ (tx_gain | int) - 35 }}, /* patched by eNB */
+              referenceSignalPower {{ (ru.tx_gain | int) - 35 }}, /* patched by eNB */
 {%- endif %}
 {% else %}
               referenceSignalPower -8, /* patched by eNB */

software/ors-amarisoft/config/ue-lte.jinja2.cfg

-{%- if   slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '1.4 MHz' %}
-#define N_RB_DL             6
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '3 MHz' %}
-#define N_RB_DL             15
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '5 MHz' %}
-#define N_RB_DL             25
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '10 MHz' %}
-#define N_RB_DL             50
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '15 MHz' %}
-#define N_RB_DL             75
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '20 MHz' %}
-#define N_RB_DL             100
-{%- endif %}
-{
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
-  log_filename: "{{ directory['log'] }}/ue.log",
-
-  rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}",
-  com_addr: "{{ pub_info['com_addr'] }}",
-
-rf_driver: {
-    name: "sdr",
-    args: "dev0=/dev/sdr0",
-    rx_antenna:"tx_rx",
-},
-  tx_gain: {{ slapparameter_dict.get('tx_gain', 60) }},
-  rx_gain: {{ slapparameter_dict.get('rx_gain', 40) }},
-  cell_groups: [{
-    multi_ue: true,
-    cells: [
-      {
-        bandwidth: N_RB_DL,
-        dl_earfcn: {{ slapparameter_dict.get('dl_earfcn', 0) }},
-        n_antenna_dl: {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }},
-        n_antenna_ul: {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }},
-        global_timing_advance: -1,
-      }
-    ],
-    pdcch_decode_opt: false,
-    pdcch_decode_opt_threshold: 0.1,
-  }],
-  ue_list: [
-    {
-    sim_algo: "{{ slapparameter_dict.get('sim_algo', 'milenage') }}",
-    opc: "{{ slapparameter_dict.get('opc', '') }}",
-    amf: {{ slapparameter_dict.get('amf', '0x9001') }},
-    sqn: "{{ slapparameter_dict.get('sqn', '000000000000') }}",
-    impu: "{{ slapparameter_dict.get('impu', '') }}",
-    impi: "{{ slapparameter_dict.get('impi', '') }}",
-    imsi: "{{ slapparameter_dict.get('imsi', slap_configuration['configuration.default_lte_imsi']) }}",
-    K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_lte_k']) }}",
-    rue_addr: "{{ slapparameter_dict.get('rue_addr', '') }}",
-    ue_category: 12,
-    tun_setup_script: "ue-ifup",
-    apn: "internet",
-    }
-  ],
-}

software/ors-amarisoft/config/ue-nr.jinja2.cfg

-{
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
-  log_filename: "{{ directory['log'] }}/ue.log",
-
-  rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}",
-  com_addr: "{{ pub_info['com_addr'] }}",
-
-rf_driver: {
-    name: "sdr",
-    args: "dev0=/dev/sdr0",
-    rx_antenna:"tx_rx",
-    },
-    tx_gain: {{ slapparameter_dict.get('tx_gain', 60) }},
-    rx_gain: {{ slapparameter_dict.get('rx_gain', 40) }},
-    cell_groups: [{
-      group_type: "nr",
-      multi_ue: false,
-      cells: [{
-        rf_port: 0,
-        bandwidth: {{ slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }},
-        band: {{ slapparameter_dict.get('nr_band', 0) }},
-        dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', 0) }},
-        ssb_nr_arfcn: {{ slapparameter_dict.get('ssb_nr_arfcn', 0) }},
-        subcarrier_spacing: 30,
-        n_antenna_dl: {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }},
-        n_antenna_ul: {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }},
-        }
-      ],
-    }],
-    ue_list: [
-      {
-      sim_algo: "{{ slapparameter_dict.get('sim_algo', 'milenage') }}",
-      opc: "{{ slapparameter_dict.get('opc', '') }}",
-      amf: {{ slapparameter_dict.get('amf', '0x9001') }},
-      sqn: "{{ slapparameter_dict.get('sqn', '000000000000') }}",
-      impu: "{{ slapparameter_dict.get('impu', '') }}",
-      impi: "{{ slapparameter_dict.get('impi', '') }}",
-      imsi: "{{ slapparameter_dict.get('imsi', slap_configuration['configuration.default_nr_imsi']) }}",
-      K: "{{ slapparameter_dict.get('k', slap_configuration['configuration.default_nr_k']) }}",
-      rue_addr: "{{ slapparameter_dict.get('rue_addr', '') }}",
-      as_release: 15,
-      ue_category: "nr",
-      tun_setup_script: "ue-ifup",
-      apn: "internet",
-      }
-    ]
-}

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

+{%- import 'slaplte.jinja2' as slaplte  with context %}
+{%- set J               = slaplte.J %}
+{%- set jcell_ru_ref    = slaplte.jcell_ru_ref %}
+
+{#- for standalone testing via slapos-render-config.py
+    NOTE: keep in sync with instance-ue.jinja2.cfg and ru/libinstance.jinja2.cfg   #}
+{%- if _standalone is defined                                                 %}
+{%-   set iru_dict   = {}                                                     %}
+{%-   set icell_dict = {}                                                     %}
+{%-   set iue_dict   = {}                                                     %}
+{%-   do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind='ue')    %}
+{%-   do slaplte.load_iue(iue_dict)                                           %}
+{%-   do slaplte.check_loaded_everything()                                    %}
+{%- endif                                                                     %}
+
+
+{#- start of the config -#}
+{
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
+  log_filename: "{{ directory['log'] }}/ue.log",
+
+  rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}",
+  com_addr: "{{ pub_info['com_addr'] }}",
+
+{# instantiate radio units #}
+{{ slaplte.ru_config(iru_dict, slapparameter_dict) }}
+
+
+  cell_groups: [{
+    // LTE cells
+    group_type: "lte",
+    multi_ue: true,
+
+    cells: [
+{%- for cell_ref, icell in icell_dict|dictsort  %}
+{%-   set cell = icell['_']                     %}
+{%-   if cell.cell_type == 'lte'                %}
+{%-     set ru_ref = J(jcell_ru_ref(icell))     %}
+{%-     set iru = iru_dict[ru_ref]              %}
+{%-     set ru = iru['_']                       %}
+
+        // {{ cell_ref }}
+        {
+          rf_port:      {{ ru._rf_port }},
+          n_antenna_dl: {{ ru.n_antenna_dl }},
+          n_antenna_ul: {{ ru.n_antenna_ul }},
+
+          dl_earfcn: {{ cell.dl_earfcn }},
+          ul_earfcn: {{ cell.ul_earfcn }},
+          bandwidth: {{ cell.bandwidth }},
+
+          global_timing_advance: -1,
+        },
+{%-   endif %}
+{%- endfor %}
+    ],
+    pdcch_decode_opt: false,
+    pdcch_decode_opt_threshold: 0.1,
+
+  }, {
+    // NR cells
+    group_type: "nr",
+    multi_ue: true,
+
+    cells: [
+{%- for cell_ref, icell in icell_dict|dictsort  %}
+{%-   set cell = icell['_']                     %}
+{%-   if cell.cell_type == 'nr'                 %}
+{%-     set ru_ref = J(jcell_ru_ref(icell))     %}
+{%-     set iru = iru_dict[ru_ref]              %}
+{%-     set ru = iru['_']                       %}
+        // {{ cell_ref }}
+        {
+          rf_port:      {{ ru._rf_port }},
+          n_antenna_dl: {{ ru.n_antenna_dl }},
+          n_antenna_ul: {{ ru.n_antenna_ul }},
+
+          band:         {{ cell.nr_band }},
+          dl_nr_arfcn:  {{ cell.dl_nr_arfcn }},
+          ul_nr_arfcn:  {{ cell.ul_nr_arfcn }},
+          ssb_nr_arfcn: {{ cell.ssb_nr_arfcn }},
+          bandwidth:    {{ cell.bandwidth }},
+
+          subcarrier_spacing: {{ cell.subcarrier_spacing }},
+        },
+{%-   endif %}
+{%- endfor %}
+    ]
+  }],
+
+  ue_list: [
+{%- for ue_ref, iue in iue_dict|dictsort  %}
+{%-   set ue = iue['_']                   %}
+    // {{ ue_ref }}
+    {
+      sim_algo: "{{ ue.sim_algo }}",
+      opc: "{{ ue.opc }}",
+      amf: {{ ue.amf }},
+      sqn: "{{ ue.sqn }}",
+      impu: "{{ ue.impu }}",
+      impi: "{{ ue.impi }}",
+      imsi: "{{ ue.imsi }}",
+      K: "{{ ue.k }}",
+      rue_addr: "{{ ue.rue_addr }}",
+{%-   if ue.ue_type == 'lte'            %}
+      as_release: 13,
+      ue_category: 13,
+{%-   elif ue.ue_type == 'nr'           %}
+      as_release: 15,
+      ue_category: "nr",
+{%-   else                              %}
+{%-     do bug('unreachable')   %}
+{%-   endif                             %}
+      tun_setup_script: "ue-ifup",
+      apn: "internet",
+    },
+{%- endfor %}
+  ],
+}

software/ors-amarisoft/instance-core-network-schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "description": "Values returned by Core Network instantiation (stub)",
+  "type": "object",
+  "properties": {}
+}

software/ors-amarisoft/instance-fdd-ors-enb-input-schema.json → software/ors-amarisoft/instance-enb-input-schema.json

@@ -3,76 +3,10 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
-    "bandwidth": {
-      "title": "Bandwidth",
-      "description": "Downlink Bandwidth",
-      "type": "string",
-      "enum": [
-        "1.4 MHz",
-        "3 MHz",
-        "5 MHz",
-        "10 MHz",
-        "15 MHz",
-        "20 MHz"
-      ],
-      "default": "20 MHz"
-    },
-    "n_antenna_dl": {
-      "title": "Number of DL antennas",
-      "description": "1 or 2. Number of DL antennas.",
-      "type": "number",
-      "default": 2
-    },
-    "n_antenna_ul": {
-      "title": "Number of UL antennas",
-      "description": "1 or 2. Number of UL antennas.",
-      "type": "number",
-      "default": 2
-    },
-    "dl_earfcn": {
-      "title": "DL EARFCN",
-      "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
-      "type": "number"
-    },
-    "pci": {
-      "title": "Physical Cell ID",
-      "description": "Physical Cell ID",
-      "type": "number",
-      "default": 1
-    },
-    "cell_id": {
-      "title": "Cell ID",
-      "description": "Cell ID",
-      "type": "string",
-      "default": "0x01"
-    },
-    "tac": {
-      "title": "Tracking Area Code",
-      "description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
-      "default": "0x0001",
-      "type": "string"
-    },
-    "root_sequence_index": {
-      "title": "Root Sequence Index",
-      "description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
-      "type": "number",
-      "default": 204
-    },
-    "tx_gain": {
-      "title": "Tx gain",
-      "description": "Tx gain (in dB)",
-      "type": "number"
-    },
-    "rx_gain": {
-      "title": "Rx gain",
-      "description": "Rx gain (in dB)",
-      "type": "number"
-    },
     "enb_id": {
       "title": "eNB ID",
-      "description": "eNB ID",
-      "type": "string",
-      "default": "0x1A2D0"
+      "description": "eNB ID. (must be set if there are LTE cells)",
+      "type": "string"
     },
     "gtp_addr": {
       "title": "GTP Address",
@@ -82,7 +16,7 @@
     },
     "mme_list": {
       "title": "MME list",
-      "description": "Optionnal. List of MME to which the gNodeB is connected",
+      "description": "Optional. List of MME to which the gNodeB is connected",
       "patternProperties": {
         ".*": {
           "properties": {
@@ -98,6 +32,35 @@
       "type": "object",
       "default": {}
     },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID. (must set if there are NR cells)",
+      "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
+    },
+    "amf_list": {
+      "title": "AMF list",
+      "description": "Optional. List of AMF to which the gNodeB is connected",
+      "patternProperties": {
+        ".*": {
+          "properties": {
+            "amf_addr": {
+              "title": "AMF Address",
+              "description": "IP address (and optional port) of NGAP SCTP connection to the AMF. The default port is 38412.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object",
+      "default": {}
+    },
     "plmn_list": {
       "title": "PLMN list",
       "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
@@ -137,7 +100,7 @@
     },
     "lte_handover_time_to_trigger": {
       "title": "Time to Trigger for LTE handover",
-      "description": "Time to triger after which LTE handover will be triggered if A3 offset is reached",
+      "description": "Time to trigger after which LTE handover will be triggered if A3 offset is reached",
       "type": "number",
       "enum": [
         0,
@@ -159,46 +122,13 @@
       ],
       "default": 480
     },
-    "ncell_list": {
-      "title": "Neighbour Cell Info",
-      "description": "Neighbour Cell Info",
-      "patternProperties": {
-        ".*": {
-          "properties": {
-            "dl_earfcn": {
-              "title": "DL EARFCN",
-              "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
-              "type": "number"
-            },
-            "pci": {
-              "title": "Physical Cell ID",
-              "description": "Physical Cell ID of the neighbour cell",
-              "type": "number"
-            },
-            "cell_id": {
-              "title": "Cell ID",
-              "description": "Concatenation of enb_id and cell_id of the neighbour cell",
-              "type": "string"
-            },
-            "tac": {
-              "title": "Tracking Area Code",
-              "description": "Integer (range 0 to 16777215)",
-              "type": "number"
-            }
-          },
-          "type": "object"
-        }
-      },
-      "type": "object",
-      "default": {}
-    },
     "websocket_password": {
       "title": "Websocket password",
       "description": "Activates websocket for remote control and sets password",
       "type": "string"
     },
     "inactivity_timer": {
-      "title": "Inactivity Timer",
+      "title": "Inactivity Timer  XXX",
       "description": "Send RRC connection release after this time (in ms) of network inactivity.",
       "type": "number",
       "default": 10000
@@ -217,7 +147,7 @@
     },
     "disable_sdr": {
       "default": false,
-      "title": "Disable SDR",
+      "title": "Disable SDR  XXX kill ?",
       "description": "Disables radio",
       "type": "boolean"
     },
@@ -228,14 +158,14 @@
       "type": "boolean"
     },
     "enb_stats_fetch_period": {
-      "title": "eNB statistics fetch period (seconds)",
-      "description": "Describes how often a call to Amarisoft remote API is made to get eNB statistics",
+      "title": "eNB/gNB statistics fetch period (seconds)",
+      "description": "Describes how often a call to Amarisoft remote API is made to get eNB/gNB statistics",
       "type": "number",
       "default": 60
     },
     "enb_drb_stats_enabled": {
-      "title": "Enable eNB drb statistics",
-      "description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
+      "title": "Enable eNB/gNB drb statistics",
+      "description": "Enable eNB/gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
       "type": "boolean",
       "default": true
     },

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

+{
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "description": "Values returned by eNB/gNB instantiation (stub)",
+  "type": "object",
+  "properties": {}
+}

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

+# instance-enb implements eNB/gNB service.
+
 [buildout]
 parts =
   directory
@@ -7,15 +9,8 @@ parts =
 {% if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
   xlog-fluentbit-service
 {% endif %}
-  amarisoft-stats-service
-  amarisoft-rf-info-service
-{% if ru == "lopcomm" %}
-  sshd-service
-  sshd-add-authorized-key
-  sshd-promise
-{% endif %}
+
   check-baseband-latency.py
-  check-amarisoft-stats-log.py
   monitor-base
   publish-connection-information
 
@@ -25,8 +20,15 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
+{%- set icell_kind='enb'                                        %}
 {%- import 'slaplte.jinja2'            as slaplte with context  %}
 {%- import 'ru_libinstance.jinja2.cfg' as rulib   with context  %}
+{%- set ipeer_dict = {}                                         %}
+{%- set ipeercell_dict = {}                                     %}
+{%- do slaplte.load_ipeer(ipeer_dict)                           %}
+{%- do slaplte.load_ipeercell(ipeercell_dict)                   %}
+{%- do slaplte.check_loaded_everything()                        %}
+
 {{ rulib.buildout() }}
 
 
@@ -55,11 +57,8 @@ cert = {{ slap_connection['cert-file'] }}
 configuration.com_ws_port = 9001
 configuration.com_addr = 127.0.1.2
 configuration.mme_addr = 127.0.1.100
+configuration.amf_addr = 127.0.1.100
 configuration.gtp_addr = 127.0.1.1
-configuration.default_lte_bandwidth = {{ default_lte_bandwidth }}
-configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
-configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
-configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -150,7 +149,7 @@ logfile = ${xamari-xlog-script:logfile}
 forward-host = {{ slapparameter_dict.get('xlog_fluentbit_forward_host', '') }}
 forward-port = {{ slapparameter_dict.get('xlog_fluentbit_forward_port', '') }}
 forward-shared-key = {{ slapparameter_dict.get('xlog_fluentbit_forward_shared_key', '') }}
-forward-self-hostname = {{ ors_id['ors-id'] }}
+forward-self-hostname = {{ comp_id['comp-id'] }}
 inline =
   [SERVICE]
       flush           5
@@ -179,143 +178,20 @@ wrapper-path = ${directory:service}/${:_buildout_section_name_}
 hash-files = ${:fluentbit-config}
 {% endif %}
 
-[amarisoft-stats-template]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-log-output = ${directory:var}/log/amarisoft-stats.json.log
-context =
-  section directory directory
-  key slapparameter_dict slap-configuration:configuration
-  key log_file :log-output
-  raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-  raw testing {{ slapparameter_dict.get("testing", False) }}
-  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-mode = 0775
-url = {{ amarisoft_stats_template }}
-output = ${directory:bin}/amarisoft-stats.py
-
-[amarisoft-rf-info-template]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-log-output = ${directory:var}/log/amarisoft-rf-info.json.log
-context =
-  section directory directory
-  key slapparameter_dict slap-configuration:configuration
-  key log_file :log-output
-  raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
-  raw testing {{ slapparameter_dict.get("testing", False) }}
-  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-mode = 0775
-url = {{ amarisoft_rf_info_template }}
-output = ${directory:bin}/amarisoft-rf-info.py
-
-[amarisoft-stats-service]
-recipe = slapos.cookbook:wrapper
-command-line = ${amarisoft-stats-template:output}
-wrapper-path = ${directory:service}/amarisoft-stats
-mode = 0775
-hash-files =
-  ${amarisoft-stats-template:output}
-
-[amarisoft-rf-info-service]
-recipe = slapos.cookbook:wrapper
-command-line = ${amarisoft-rf-info-template:output}
-wrapper-path = ${directory:service}/amarisoft-rf-info
-mode = 0775
-hash-files =
-  ${amarisoft-rf-info-template:output}
-
-[user-info]
-recipe = slapos.cookbook:userinfo
-
-# Deploy openssh-server
-[sshd-port]
-recipe = slapos.cookbook:free_port
-minimum = 22222
-maximum = 22231
-ip = ${slap-configuration:ipv6-random}
-
-[sshd-config]
-recipe = slapos.recipe.template:jinja2
-output = ${directory:etc}/sshd.conf
-path_pid = ${directory:run}/sshd.pid
-inline =
-  PidFile ${:path_pid}
-  Port ${sshd-port:port}
-  ListenAddress ${slap-configuration:ipv6-random}
-  Protocol 2
-  HostKey ${sshd-ssh-host-rsa-key:output}
-  HostKey ${sshd-ssh-host-ecdsa-key:output}
-  PasswordAuthentication no
-  PubkeyAuthentication yes
-  HostKeyAlgorithms ssh-rsa,ssh-dss,rsa-sha2-512,rsa-sha2-256,ecdsa-sha2-nistp521
-  AuthorizedKeysFile ${buildout:directory}/.ssh/authorized_keys
-  Subsystem sftp {{ openssh_location }}/libexec/sftp-server
-
-[sshd-service]
-recipe = slapos.cookbook:wrapper
-command-line = {{ openssh_location }}/sbin/sshd -D -e -f ${sshd-config:output}
-wrapper-path = ${directory:service}/sshd
-hash-files = ${sshd-config:output}
-environment =
-  HOME=${directory:home}
-
-[sshd-add-authorized-key]
-recipe = slapos.cookbook:dropbear.add_authorized_key
-home = ${buildout:directory}
-key = {{ slapparameter_dict.get("user-authorized-key", '') }}
-
-[sshd-ssh-keygen-base]
-recipe = plone.recipe.command
-output = ${directory:etc}/${:_buildout_section_name_}
-command = {{ openssh_output_keygen }} -f ${:output} -N '' ${:extra-args}
-
-[sshd-ssh-host-rsa-key]
-<=sshd-ssh-keygen-base
-extra-args=-t rsa
-[sshd-ssh-host-ecdsa-key]
-<=sshd-ssh-keygen-base
-extra-args=-t ecdsa -b 521
-
-[sshd-promise]
-<= monitor-promise-base
-promise = check_socket_listening
-name = sshd.py
-config-host = ${slap-configuration:ipv6-random}
-config-port = ${sshd-port:port}
-
 [config-base]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
 extra-context =
 context =
+  json ors false
   section directory directory
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
   key gtp_addr_v6 slap-configuration:ipv6-random
   raw gtp_addr_v4 {{ lan_ipv4 }}
-  raw one_watt {{ ors_version['one-watt'] }}
-  raw tx_gain {{ ors_version['current-tx-gain'] }}
-  raw rx_gain {{ ors_version['current-rx-gain'] }}
-  raw earfcn  {{ ors_version['current-earfcn'] }}
-  raw software_name {{ software_name }}
-  raw rf_mode {{ rf_mode }}
-  raw trx {{ trx }}
-  raw bbu {{ bbu }}
-  raw ru {{ ru }}
   import  netaddr netaddr
   ${:extra-context}
 
-[sib-config]
-<= config-base
-url = {{ sib23_template }}
-output = ${directory:etc}/sib23.cfg
-
-[drb-config]
-<= config-base
-url = {{ drb_lte_template }}
-output = ${directory:etc}/drb.cfg
-
 [enb-config]
 <= config-base
 {% if slapparameter_dict.get("enb_config_link", None) %}
@@ -325,9 +201,11 @@ url = {{ enb_template }}
 {% endif %}
 output = ${directory:etc}/enb.cfg
 extra-context =
-    json cell_list {{ rulib.cell_list | tojson }}
-    key sib23_file sib-config:output
-    key drb_file   drb-config:output
+    json iru_dict {{ rulib.iru_dict | tojson }}
+    json icell_dict {{ rulib.icell_dict | tojson }}
+    json ipeer_dict {{ ipeer_dict | tojson }}
+    json ipeercell_dict {{ ipeercell_dict | tojson }}
+    import json_module json
 import-list =
     rawfile slaplte.jinja2 {{ slaplte_template }}
 
@@ -340,23 +218,15 @@ websocket_url = ws://[${slap-configuration:ipv6-random}]:9001
 {%- endif %}
 enb-ipv6 = ${slap-configuration:ipv6-random}
 enb-ipv4 = {{ lan_ipv4 }}
-{% if bbu == "ors" %}
-ors-version = {{ ors_version['ors-version'] }}
-frequency-range-rating = {{ ors_version['range'] }}
-current-tx-power-estimate = {{ ors_version['power-estimate'] }}
-current-tx-gain = {{ ors_version['current-tx-gain'] }}
-current-rx-gain = {{ ors_version['current-rx-gain'] }}
-{% endif %}
-current-earfcn  = {{ ors_version['current-earfcn'] }}
 amarisoft-version = {{ lte_version }}
 license-expiration = {{ lte_expiration }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
-{% if ru == "lopcomm" %}
-ssh-command = ssh ${user-info:pw-name}@${slap-configuration:ipv6-random} -p ${sshd-port:port}
-ssh-url = ssh://${user-info:pw-name}@[${slap-configuration:ipv6-random}]:${sshd-port:port}
-ru-firmware = {{ru_lopcomm_firmware_filename}}
-ru-ipv6 = ${slap-configuration:tap-ipv6-gateway}
-{% endif %}
+ru-list   = {{ rulib.iru_dict.keys()   | sort | join(', ') }}
+cell-list = {{ rulib.icell_dict.keys() | sort | join(', ') }}
+# TODO peer-list peer-cell-list
+peer-list = XXX
+peer-cell-list = XXX
+
 
 [monitor-instance-parameter]
 {% if slapparameter_dict.get("name", None) %}
@@ -374,14 +244,6 @@ name = ${:_buildout_section_name_}
 <= macro.promise
 promise = check_baseband_latency
 config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
+config-amarisoft-stats-log = ${ru_amarisoft-stats-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 config-min-rxtx-delay = {{ slapparameter_dict.get("min_rxtx_delay", 0) }}
-
-[check-amarisoft-stats-log.py]
-<= macro.promise
-promise = check_amarisoft_stats_log
-output = ${directory:plugins}/check-amarisoft-stats-log.py
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
-config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}