Changing rmr-data to rmrdata

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

diff --git a/pkg/xapp/db.go b/pkg/xapp/db.go
old mode 100644 (file)
new mode 100755 (executable)
index 495239f..e422cfd
--- a/pkg/xapp/db.go
+++ b/pkg/xapp/db.go
@@ -66,12 +66,16 @@ type RNIBServedNRCellInformation = rnibentities.ServedNRCellInformation
 type RNIBNrNeighbourInformation = rnibentities.NrNeighbourInformation
 
 type RNIBClient struct {
+       db     *sdl.SdlInstance
        reader rnibreader.RNibReader
        writer rnibwriter.RNibWriter
 }
 
 // NewSDLClient returns a new SDLClient.
 func NewSDLClient(ns string) *SDLClient {
+       if ns == "" {
+               ns = "sdl"
+       }
        return &SDLClient{
                db:    sdl.NewSdlInstance(ns, sdl.NewDatabase()),
                stat:  Metric.RegisterCounterGroup(SDLCounterOpts, "SDL"),
@@ -164,47 +168,55 @@ func (c *SDLClient) GetStat() (t SDLStatistics) {
        return
 }
 
-func NewRNIBClient(ns string) *RNIBClient {
-       rnibreader.Init("e2Manager", 1)
-       rnibwriter.InitWriter("e2Manager", 1)
+func NewRNIBClient() *RNIBClient {
+       s := sdl.NewSdlInstance("e2Manager", sdl.NewDatabase())
        return &RNIBClient{
+               db:     s,
                reader: nil,
                writer: nil,
        }
 }
 
+func (r *RNIBClient) Subscribe(cb func(string, ...string), channel string) error {
+       return r.db.SubscribeChannel(cb, channel)
+}
+
+func (r *RNIBClient) StoreAndPublish(channel string, event string, pairs ...interface{}) error {
+       return r.db.SetAndPublish([]string{channel, event}, pairs...)
+}
+
 func (r *RNIBClient) GetNodeb(invName string) (*RNIBNodebInfo, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetNodeb(invName)
+       return rnibreader.GetRNibReader(r.db).GetNodeb(invName)
 }
 
 func (r *RNIBClient) GetNodebByGlobalNbId(t RNIBNodeType, gid *RNIBGlobalNbId) (*RNIBNodebInfo, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetNodebByGlobalNbId(t, gid)
+       return rnibreader.GetRNibReader(r.db).GetNodebByGlobalNbId(t, gid)
 }
 
 func (r *RNIBClient) GetCellList(invName string) (*RNIBCells, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetCellList(invName)
+       return rnibreader.GetRNibReader(r.db).GetCellList(invName)
 }
 
 func (r *RNIBClient) GetListGnbIds() ([]*RNIBNbIdentity, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetListGnbIds()
+       return rnibreader.GetRNibReader(r.db).GetListGnbIds()
 }
 
 func (r *RNIBClient) GetListEnbIds() ([]*RNIBNbIdentity, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetListEnbIds()
+       return rnibreader.GetRNibReader(r.db).GetListEnbIds()
 }
 
 func (r *RNIBClient) GetCountGnbList() (int, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetCountGnbList()
+       return rnibreader.GetRNibReader(r.db).GetCountGnbList()
 }
 
 func (r *RNIBClient) GetCell(invName string, pci uint32) (*RNIBCell, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetCell(invName, pci)
+       return rnibreader.GetRNibReader(r.db).GetCell(invName, pci)
 }
 
 func (r *RNIBClient) GetCellById(cellType RNIBCellType, cellId string) (*RNIBCell, RNIBIRNibError) {
-       return rnibreader.GetRNibReader().GetCellById(cellType, cellId)
+       return rnibreader.GetRNibReader(r.db).GetCellById(cellType, cellId)
 }
 
 func (r *RNIBClient) SaveNodeb(nbIdentity *RNIBNbIdentity, entity *RNIBNodebInfo) RNIBIRNibError {
-       return rnibwriter.GetRNibWriter().SaveNodeb(nbIdentity, entity)
+       return rnibwriter.GetRNibWriter(r.db).SaveNodeb(nbIdentity, entity)
 }