Merge remote-tracking branch 'origin/e2-setup' into integration_2024_w14

openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_kpm.c

@@ -420,26 +420,29 @@ bool read_kpm_sm(void* data)
 }
 
 static const char* kpm_meas_du[] = {
-  "DRB.RlcSduDelayDl", 
-  "DRB.UEThpDl", 
-  "DRB.UEThpUl", 
-  "RRU.PrbTotDl", 
+  "DRB.RlcSduDelayDl",
+  "DRB.UEThpDl",
+  "DRB.UEThpUl",
+  "RRU.PrbTotDl",
   "RRU.PrbTotUl",
+  NULL,
 };
 
 static const char* kpm_meas_gnb[] = {
-  "DRB.PdcpSduVolumeDL", 
-  "DRB.PdcpSduVolumeUL", 
-  "DRB.RlcSduDelayDl", 
-  "DRB.UEThpDl", 
-  "DRB.UEThpUl", 
-  "RRU.PrbTotDl", 
+  "DRB.PdcpSduVolumeDL",
+  "DRB.PdcpSduVolumeUL",
+  "DRB.RlcSduDelayDl",
+  "DRB.UEThpDl",
+  "DRB.UEThpUl",
+  "RRU.PrbTotDl",
   "RRU.PrbTotUl",
+  NULL,
 };
 
 static const char* kpm_meas_cuup[] = {
-  "DRB.PdcpSduVolumeDL", 
-  "DRB.PdcpSduVolumeUL", 
+  "DRB.PdcpSduVolumeDL",
+  "DRB.PdcpSduVolumeUL",
+  NULL,
 };
 
 typedef const char** meas_list;

openair2/E2AP/README.md

@@ -100,7 +100,7 @@ By default, FlexRIC will build the nearRT-RIC with E2AP v2 and KPM v2. If you wa
 ```bash
 git clone https://gitlab.eurecom.fr/mosaic5g/flexric flexric
 cd flexric/
-git checkout 34d6810f9ab435ac3a4023d5e1917669e24341da
+git checkout f1c08ed2b9b1eceeda7941dd7bf435db0168dd56
 ```
 
 ### 2.2.2 Build FlexRIC

flexric @ f1c08ed2

-Subproject commit 34d6810f9ab435ac3a4023d5e1917669e24341da
+Subproject commit f1c08ed2b9b1eceeda7941dd7bf435db0168dd56