X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fdb.go;h=495239f1ada41d05d25f3a1fa98506e6587419c3;hb=refs%2Fchanges%2F20%2F2920%2F1;hp=fc250f0feff3efa2e73cc2bc6d38e9d1098b6054;hpb=6267dc15ca7ec6b3030b89b79e3a14317a687815;p=ric-plt%2Fxapp-frame.git diff --git a/pkg/xapp/db.go b/pkg/xapp/db.go old mode 100755 new mode 100644 index fc250f0..495239f --- a/pkg/xapp/db.go +++ b/pkg/xapp/db.go @@ -23,9 +23,6 @@ import ( 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/uenibprotobuf" - uenibreader "gerrit.o-ran-sc.org/r/ric-plt/ue-nib/uenibreader" - uenibwriter "gerrit.o-ran-sc.org/r/ric-plt/ue-nib/uenibwriter" rnibwriter "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/rnib" "sync" "time" @@ -46,19 +43,6 @@ 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 @@ -180,33 +164,6 @@ 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("e2Manager", 1) rnibwriter.InitWriter("e2Manager", 1)