Updating the rmr version and included new message types

[ric-plt/xapp-frame.git] / pkg / xapp / db.go

diff --git a/pkg/xapp/db.go b/pkg/xapp/db.go
old mode 100755 (executable)
new mode 100644 (file)
index 779e2cd..495239f
--- a/pkg/xapp/db.go
+++ b/pkg/xapp/db.go
@@ -20,13 +20,9 @@
 package xapp
 
 import (
-       rnibcommon "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        rnibentities "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        rnibreader "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
        sdl "gerrit.o-ran-sc.org/r/ric-plt/sdlgo"
-       uenibprotobuf "gerrit.o-ran-sc.org/r/ric-plt/ue-nib/uernibprotobuf"
-       uenibreader "gerrit.o-ran-sc.org/r/ric-plt/ue-nib/uernibreader"
-       uenibwriter "gerrit.o-ran-sc.org/r/ric-plt/ue-nib/uernibwriter"
        rnibwriter "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/rnib"
        "sync"
        "time"
@@ -47,24 +43,11 @@ type SDLClient struct {
        ready bool
 }
 
-// Alias
-type EventCategory = uenibreader.EventCategory
-type EventCallback = uenibreader.EventCallback
-type MeasResultNR = uenibprotobuf.MeasResultNR
-type MeasQuantityResults = uenibprotobuf.MeasResultNR_MeasQuantityResults
-type MeasResultServMO = uenibprotobuf.MeasResults_MeasResultServMO
-type MeasResults = uenibprotobuf.MeasResults
-
-type UENIBClient struct {
-       reader *uenibreader.Reader
-       writer *uenibwriter.Writer
-}
-
 // Alias
 type RNIBNodeType = rnibentities.Node_Type
 type RNIBGlobalNbId = rnibentities.GlobalNbId
 type RNIBNodebInfo = rnibentities.NodebInfo
-type RNIBIRNibError = rnibcommon.IRNibError
+type RNIBIRNibError = error
 type RNIBCells = rnibentities.Cells
 type RNIBNbIdentity = rnibentities.NbIdentity
 type RNIBCellType = rnibentities.Cell_Type
@@ -159,6 +142,10 @@ func (s *SDLClient) MStoreAndPublish(channelsAndEvents []string, pairs ...interf
        return s.db.SetAndPublish(channelsAndEvents, pairs...)
 }
 
+func (s *SDLClient) Delete(keys []string) (err error) {
+       return s.db.Remove(keys)
+}
+
 func (s *SDLClient) Clear() {
        s.db.RemoveAll()
 }
@@ -177,36 +164,9 @@ func (c *SDLClient) GetStat() (t SDLStatistics) {
        return
 }
 
-func NewUENIBClient() *UENIBClient {
-       return &UENIBClient{
-               reader: uenibreader.NewReader(),
-               writer: uenibwriter.NewWriter(),
-       }
-}
-
-func (u *UENIBClient) StoreUeMeasurement(gNbId string, gNbUeX2ApId string, data *uenibprotobuf.MeasResults) error {
-       return u.writer.UpdateUeMeasurement(gNbId, gNbUeX2ApId, data)
-}
-
-func (u *UENIBClient) CreateUeContext(gNbId string, gNbUeX2ApId string) error {
-       return u.writer.UeContextAddComplete(gNbId, gNbUeX2ApId)
-}
-
-func (u *UENIBClient) ReleaseUeContext(gNbId string, gNbUeX2ApId string) error {
-       return u.writer.RemoveUeContext(gNbId, gNbUeX2ApId)
-}
-
-func (u *UENIBClient) ReadUeMeasurement(gNbId string, gNbUeX2ApId string) (*uenibprotobuf.MeasResults, error) {
-       return u.reader.GetUeMeasurement(gNbId, gNbUeX2ApId)
-}
-
-func (u *UENIBClient) SubscribeEvents(gNbIDs []string, eventCategories []EventCategory, cb EventCallback) error {
-       return u.reader.SubscribeEvents(gNbIDs, eventCategories, cb)
-}
-
 func NewRNIBClient(ns string) *RNIBClient {
-       rnibreader.Init("rnib", 1)
-       rnibwriter.InitWriter("rnib", 1)
+       rnibreader.Init("e2Manager", 1)
+       rnibwriter.InitWriter("e2Manager", 1)
        return &RNIBClient{
                reader: nil,
                writer: nil,
@@ -225,11 +185,11 @@ func (r *RNIBClient) GetCellList(invName string) (*RNIBCells, RNIBIRNibError) {
        return rnibreader.GetRNibReader().GetCellList(invName)
 }
 
-func (r *RNIBClient) GetListGnbIds() (*[]*RNIBNbIdentity, RNIBIRNibError) {
+func (r *RNIBClient) GetListGnbIds() ([]*RNIBNbIdentity, RNIBIRNibError) {
        return rnibreader.GetRNibReader().GetListGnbIds()
 }
 
-func (r *RNIBClient) GetListEnbIds() (*[]*RNIBNbIdentity, RNIBIRNibError) {
+func (r *RNIBClient) GetListEnbIds() ([]*RNIBNbIdentity, RNIBIRNibError) {
        return rnibreader.GetRNibReader().GetListEnbIds()
 }