From: jinwei.fan <jinwei.fan@samsung.com>
Date: Tue, 1 Dec 2020 03:59:22 +0000 (+0800)
Subject: Set "UE ID" field in Ue Metrics.
X-Git-Tag: 1.0.0~2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=scp%2Fric-app%2Fkpimon.git;a=commitdiff_plain;h=3557f23287ead88d87934e2df4d0b31e27d15b3f

Set "UE ID" field in Ue Metrics.

Signed-off-by: jinwei.fan <jinwei.fan@samsung.com>
Change-Id: Id789316a0a7abd14a17ee112e1a6bbc6d71f48ef
---

diff --git a/control/control.go b/control/control.go
index 4b8b90d..969ef90 100644
--- a/control/control.go
+++ b/control/control.go
@@ -649,6 +649,8 @@ func (c *Control) handleIndication(params *xapp.RMRParams) (err error) {
 								json.Unmarshal([]byte(ueJsonStr), &ueMetrics)
 							}
 
+							ueMetrics.UeID = ueID
+							log.Printf("UeID: %d", ueMetrics.UeID)
 							ueMetrics.ServingCellID = servingCellID
 							log.Printf("ServingCellID: %s", ueMetrics.ServingCellID)
 
@@ -719,6 +721,8 @@ func (c *Control) handleIndication(params *xapp.RMRParams) (err error) {
 								json.Unmarshal([]byte(ueJsonStr), &ueMetrics)
 							}
 
+							ueMetrics.UeID = ueID
+							log.Printf("UeID: %d", ueMetrics.UeID)
 							ueMetrics.ServingCellID = servingCellID
 							log.Printf("ServingCellID: %s", ueMetrics.ServingCellID)
 
@@ -797,6 +801,8 @@ func (c *Control) handleIndication(params *xapp.RMRParams) (err error) {
 								json.Unmarshal([]byte(ueJsonStr), &ueMetrics)
 							}
 
+							ueMetrics.UeID = ueID
+							log.Printf("UeID: %d", ueMetrics.UeID)
 							ueMetrics.ServingCellID = servingCellID
 							log.Printf("ServingCellID: %s", ueMetrics.ServingCellID)
 
diff --git a/control/types.go b/control/types.go
index 387c137..d7c5938 100644
--- a/control/types.go
+++ b/control/types.go
@@ -360,7 +360,7 @@ type NeighborCellRFType struct {
 }
 
 type UeMetricsEntry struct {
-	UeID                   string    `json:"UE ID"`
+	UeID                   int64     `json:"UE ID"`
 	ServingCellID          string    `json:"Serving Cell ID"`
 	MeasTimestampPDCPBytes Timestamp `json:"Meas-Timestamp-PDCP-Bytes"`
 	PDCPBytesDL            int64     `json:"PDCP-Bytes-DL"`