X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=mc-core%2Fmc%2Fqueries%2Fadmitted_erabs.gsql;h=19887e35f0412a4ec87270865d78a2c42229e837;hb=6d6450ecce1ee0f937dd7f90f83451154abdf118;hp=4ce30f2e95a92692e699ecc573809f541be59ce2;hpb=31d238a2cba18b87e05a7d9b4820db2c5186c658;p=ric-app%2Fmc.git

diff --git a/mc-core/mc/queries/admitted_erabs.gsql b/mc-core/mc/queries/admitted_erabs.gsql
index 4ce30f2..19887e3 100644
--- a/mc-core/mc/queries/admitted_erabs.gsql
+++ b/mc-core/mc/queries/admitted_erabs.gsql
@@ -1,32 +1,40 @@
 
+
 // join interval should be 10 seconds
 // Compromise between ensuring that most add_req_ack-recon_complete pairs
 // are caught while avoiding duplicates due to short sessions
 //	NB: $window should be a multiple of 10.
-DEFINE{query_name 'erab_stats_join';}
+DEFINE{query_name 'erab_stats_join';
+	max_lfta_disorder '1'; max_hfta_disorder '1';
+}
 PARAM{ window uint; }
 select e.timestamp_ms/10000 as TB10, e.id_SgNB_UE_X2AP_ID, e.e_RAB_ID, e.qCI
+	, e.gnb_id
 INNER_JOIN from SGNB_ADDITION_REQ_ACK.eRABs_acked_for_admit_for_ue e,
 	RECONCOMPLETE.reconfig_success r
-where r.schemaId = 101 and e.schemaId = 502
-and r.id_SgNB_UE_X2AP_ID = e.id_SgNB_UE_X2AP_ID
+where 
+ r.id_SgNB_UE_X2AP_ID = e.id_SgNB_UE_X2AP_ID
 and r.timestamp_ms/10000 = e.timestamp_ms/10000
 ;
 
-DEFINE{query_name 'erab_stats';}
+
+DEFINE{query_name 'erab_stats';
+	max_lfta_disorder '1'; max_hfta_disorder '1';
+	comment 'number of admitted bearers and the distribution of their qCI';
+}
 PARAM{ window uint; }
-Select (TB*$window)/1000 as TS, 
+Select (TB*$window)/1000 as TS, gnb_id as GNB_ID,
 	$window/1000.0 as measurementInterval,
 	count(*) as total_erabs,
-	sum(EQ(UINT(qCI),1)) as qCI_1,
-	sum(EQ(UINT(qCI),2)) as qCI_2,
-	sum(EQ(UINT(qCI),3)) as qCI_3,
-	sum(EQ(UINT(qCI),4)) as qCI_4,
-	sum(EQ(UINT(qCI),5)) as qCI_5,
-	sum(EQ(UINT(qCI),6)) as qCI_6,
-	sum(EQ(UINT(qCI),7)) as qCI_7,
-	sum(EQ(UINT(qCI),8)) as qCI_8,
-	sum(EQ(UINT(qCI),9)) as qCI_9,
-	sum(LEQ(UINT(qCI),0))+sum(GEQ(UINT(qCI),10)) as qCI_other
+	sum( EQ(UINT(qCI),1) ) as qCI_1,
+	sum( EQ(UINT(qCI),2) ) as qCI_2,
+	sum( EQ(UINT(qCI),3) ) as qCI_3,
+	sum( EQ(UINT(qCI),4) ) as qCI_4,
+	sum( EQ(UINT(qCI),5) ) as qCI_5,
+	sum( EQ(UINT(qCI),6) ) as qCI_6,
+	sum( EQ(UINT(qCI),7) ) as qCI_7,
+	sum( EQ(UINT(qCI),8) ) as qCI_8,
+	sum( EQ(UINT(qCI),9) ) as qCI_9,
+	sum( LEQ(UINT(qCI),0)| GEQ(UINT(qCI),10) ) as qCI_other
 from erab_stats_join
-group by (10000*TB10)/$window as TB
+group by (10000*TB10)/$window as TB, gnb_id