X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fdb.go;h=0a37caa2172a70367c97307edb52ce14d440fcfe;hb=79f0680fd7bbf1c8a8c6e2a842cb18020e387a47;hp=542c755768f5a5fc4ff7263d3050e48568646dd5;hpb=192518d79ebcffe17bf569bf9037321a6fd26d44;p=ric-plt%2Fxapp-frame.git diff --git a/pkg/xapp/db.go b/pkg/xapp/db.go index 542c755..0a37caa 100755 --- a/pkg/xapp/db.go +++ b/pkg/xapp/db.go @@ -20,7 +20,11 @@ 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" + rnibwriter "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/rnib" "sync" "time" ) @@ -33,30 +37,60 @@ var SDLCounterOpts = []CounterOpts{ {Name: "StoreError", Help: "The total number of SDL store errors"}, } -type SDLClient struct { - db *sdl.SdlInstance +type SDLStorage struct { + db *sdl.SyncStorage stat map[string]Counter mux sync.Mutex ready bool } +//Deprecated: Will be removed in a future release, please use SDLStorage type +type SDLClient struct { + db *SDLStorage + nameSpace string +} + +// Alias +type RNIBNodeType = rnibentities.Node_Type +type RNIBGlobalNbId = rnibentities.GlobalNbId +type RNIBNodebInfo = rnibentities.NodebInfo +type RNIBIRNibError = error +type RNIBCells = rnibentities.Cells +type RNIBNbIdentity = rnibentities.NbIdentity +type RNIBCellType = rnibentities.Cell_Type +type RNIBCell = rnibentities.Cell +type RNIBEnb = rnibentities.Enb +type RNIBGnb = rnibentities.Gnb + +const RNIBNodeENB = rnibentities.Node_ENB +const RNIBNodeGNB = rnibentities.Node_GNB + +type RNIBServedCellInfo = rnibentities.ServedCellInfo +type RNIBNodebInfoEnb = rnibentities.NodebInfo_Enb +type RNIBNodebInfoGnb = rnibentities.NodebInfo_Gnb +type RNIBServedNRCell = rnibentities.ServedNRCell +type RNIBServedNRCellInformation = rnibentities.ServedNRCellInformation +type RNIBNrNeighbourInformation = rnibentities.NrNeighbourInformation + type RNIBClient struct { - db *sdl.SdlInstance + db rnibcommon.ISdlSyncStorage + reader rnibreader.RNibReader + writer rnibwriter.RNibWriter } -// NewSDLClient returns a new SDLClient. -func NewSDLClient(ns string) *SDLClient { - return &SDLClient{ - db: sdl.NewSdlInstance(ns, sdl.NewDatabase()), +// NewSdlStorage returns a new instance of SDLStorage type. +func NewSdlStorage() *SDLStorage { + return &SDLStorage{ + db: sdl.NewSyncStorage(), stat: Metric.RegisterCounterGroup(SDLCounterOpts, "SDL"), ready: false, } } -func (s *SDLClient) TestConnection() { +func (s *SDLStorage) TestConnection(namespace string) { // Test DB connection, and wait until ready! for { - if _, err := s.db.GetAll(); err == nil { + if _, err := s.db.GetAll(namespace); err == nil { break } Logger.Warn("Database connection not ready, waiting ...") @@ -66,12 +100,12 @@ func (s *SDLClient) TestConnection() { Logger.Info("Connection to database established!") } -func (s *SDLClient) IsReady() bool { +func (s *SDLStorage) IsReady() bool { return s.ready } -func (s *SDLClient) doSet(pairs ...interface{}) (err error) { - err = s.db.Set(pairs) +func (s *SDLStorage) doSet(namespace string, pairs ...interface{}) (err error) { + err = s.db.Set(namespace, pairs) if err != nil { s.UpdateStatCounter("StoreError") } else { @@ -80,93 +114,213 @@ func (s *SDLClient) doSet(pairs ...interface{}) (err error) { return } +func (s *SDLStorage) Store(namespace string, key string, value interface{}) (err error) { + return s.doSet(namespace, key, value) +} + +func (s *SDLStorage) MStore(namespace string, pairs ...interface{}) (err error) { + return s.doSet(namespace, pairs) +} + +func (s *SDLStorage) Read(namespace string, key string) (value map[string]interface{}, err error) { + return s.db.Get(namespace, []string{key}) +} + +func (s *SDLStorage) MRead(namespace string, key []string) (value map[string]interface{}, err error) { + return s.db.Get(namespace, key) +} + +func (s *SDLStorage) ReadAllKeys(namespace string) (value []string, err error) { + return s.db.GetAll(namespace) +} + +func (s *SDLStorage) Subscribe(namespace string, cb func(string, ...string), channel string) error { + return s.db.SubscribeChannel(namespace, cb, channel) +} + +func (s *SDLStorage) MSubscribe(namespace string, cb func(string, ...string), channels ...string) error { + return s.db.SubscribeChannel(namespace, cb, channels...) +} + +func (s *SDLStorage) StoreAndPublish(namespace string, channel string, event string, pairs ...interface{}) error { + return s.db.SetAndPublish(namespace, []string{channel, event}, pairs...) +} + +func (s *SDLStorage) MStoreAndPublish(namespace string, channelsAndEvents []string, pairs ...interface{}) error { + return s.db.SetAndPublish(namespace, channelsAndEvents, pairs...) +} + +func (s *SDLStorage) Delete(namespace string, keys []string) (err error) { + return s.db.Remove(namespace, keys) +} + +func (s *SDLStorage) Clear(namespace string) { + s.db.RemoveAll(namespace) +} + +func (s *SDLStorage) RegisterMetrics() { + s.stat = Metric.RegisterCounterGroup(SDLCounterOpts, "SDL") +} + +func (s *SDLStorage) UpdateStatCounter(name string) { + s.mux.Lock() + s.stat[name].Inc() + s.mux.Unlock() +} + +func (s *SDLStorage) GetStat() (t SDLStatistics) { + return +} + +//NewSDLClient returns a new SDLClient. +//Deprecated: Will be removed in a future release, please use NewSdlStorage +func NewSDLClient(ns string) *SDLClient { + if ns == "" { + ns = "sdl" + } + return &SDLClient{ + db: NewSdlStorage(), + nameSpace: ns, + } +} + +//Deprecated: Will be removed in a future release, please use the TestConnection Receiver function of the SDLStorage type. +func (s *SDLClient) TestConnection() { + s.db.TestConnection(s.nameSpace) +} + +func (s *SDLClient) IsReady() bool { + return s.db.ready +} + +//Deprecated: Will be removed in a future release, please use the Store Receiver function of the SDLStorage type. func (s *SDLClient) Store(key string, value interface{}) (err error) { - return s.doSet(key, value) + return s.db.Store(s.nameSpace, key, value) } +//Deprecated: Will be removed in a future release, please use the MStore Receiver function of the SDLStorage type. func (s *SDLClient) MStore(pairs ...interface{}) (err error) { - return s.doSet(pairs) + return s.db.MStore(s.nameSpace, pairs) } +//Deprecated: Will be removed in a future release, please use the Read Receiver function of the SDLStorage type. func (s *SDLClient) Read(key string) (value map[string]interface{}, err error) { - return s.db.Get([]string{key}) + return s.db.Read(s.nameSpace, key) } +//Deprecated: Will be removed in a future release, please use the MRead Receiver function of the SDLStorage type. func (s *SDLClient) MRead(key []string) (value map[string]interface{}, err error) { - return s.db.Get(key) + return s.db.MRead(s.nameSpace, key) } +//Deprecated: Will be removed in a future release, please use the ReadAllKeys Receiver function of the SDLStorage type. func (s *SDLClient) ReadAllKeys(key string) (value []string, err error) { - return s.db.GetAll() + return s.db.ReadAllKeys(s.nameSpace) } +//Deprecated: Will be removed in a future release, please use the Subscribe Receiver function of the SDLStorage type. func (s *SDLClient) Subscribe(cb func(string, ...string), channel string) error { - return s.db.SubscribeChannel(cb, channel) + return s.db.Subscribe(s.nameSpace, cb, channel) } +//Deprecated: Will be removed in a future release, please use the MSubscribe Receiver function of the SDLStorage type. func (s *SDLClient) MSubscribe(cb func(string, ...string), channels ...string) error { - return s.db.SubscribeChannel(cb, channels...) + return s.db.MSubscribe(s.nameSpace, cb, channels...) } +//Deprecated: Will be removed in a future release, please use the StoreAndPublish Receiver function of the SDLStorage type. func (s *SDLClient) StoreAndPublish(channel string, event string, pairs ...interface{}) error { - return s.db.SetAndPublish([]string{channel, event}, pairs...) + return s.db.StoreAndPublish(s.nameSpace, channel, event, pairs...) } +//Deprecated: Will be removed in a future release, please use the MStoreAndPublish Receiver function of the SDLStorage type. func (s *SDLClient) MStoreAndPublish(channelsAndEvents []string, pairs ...interface{}) error { - return s.db.SetAndPublish(channelsAndEvents, pairs...) + return s.db.MStoreAndPublish(s.nameSpace, channelsAndEvents, pairs...) } +//Deprecated: Will be removed in a future release, please use the Delete Receiver function of the SDLStorage type. +func (s *SDLClient) Delete(keys []string) (err error) { + return s.db.Delete(s.nameSpace, keys) +} + +//Deprecated: Will be removed in a future release, please use the Clear Receiver function of the SDLStorage type. func (s *SDLClient) Clear() { - s.db.RemoveAll() + s.db.Clear(s.nameSpace) } +//Deprecated: Will be removed in a future release, please use the RegisterMetrics Receiver function of the SDLStorage type. func (s *SDLClient) RegisterMetrics() { - s.stat = Metric.RegisterCounterGroup(SDLCounterOpts, "SDL") + s.db.RegisterMetrics() } +//Deprecated: Will be removed in a future release, please use the UpdateStatCounter Receiver function of the SDLStorage type. func (s *SDLClient) UpdateStatCounter(name string) { - s.mux.Lock() - s.stat[name].Inc() - s.mux.Unlock() + s.db.UpdateStatCounter(name) } +//Deprecated: Will be removed in a future release, please use the GetStat Receiver function of the SDLStorage type. func (c *SDLClient) GetStat() (t SDLStatistics) { - return + return c.db.GetStat() } -// To be removed ... -func NewRNIBClient(ns string) *RNIBClient { +func GetNewRnibClient(sdlStorage rnibcommon.ISdlSyncStorage) *RNIBClient { return &RNIBClient{ - db: sdl.NewSdlInstance(ns, sdl.NewDatabase()), + db: sdlStorage, + reader: rnibreader.GetNewRNibReader(sdlStorage), + writer: rnibwriter.GetNewRNibWriter(sdlStorage), } } -func (r *RNIBClient) GetgNBList() (values map[string]interface{}, err error) { - keys, err := r.db.GetAll() - if err == nil { - values = make(map[string]interface{}) - for _, key := range keys { - v, err := r.db.Get([]string{key}) - if err == nil { - values[key] = v[key] - } - } +//Deprecated: Will be removed in a future release, please use GetNewRnibClient instead. +func NewRNIBClient() *RNIBClient { + s := sdl.NewSyncStorage() + return &RNIBClient{ + db: s, + reader: rnibreader.GetNewRNibReader(s), + writer: rnibwriter.GetNewRNibWriter(s), } - return } -func (r *RNIBClient) GetNRCellList(key string) (value map[string]interface{}, err error) { - return r.db.Get([]string{key}) +func (r *RNIBClient) Subscribe(cb func(string, ...string), channel string) error { + return r.db.SubscribeChannel(rnibcommon.GetRNibNamespace(), cb, channel) +} + +func (r *RNIBClient) StoreAndPublish(channel string, event string, pairs ...interface{}) error { + return r.db.SetAndPublish(rnibcommon.GetRNibNamespace(), []string{channel, event}, pairs...) +} + +func (r *RNIBClient) GetNodeb(invName string) (*RNIBNodebInfo, RNIBIRNibError) { + return r.reader.GetNodeb(invName) +} + +func (r *RNIBClient) GetNodebByGlobalNbId(t RNIBNodeType, gid *RNIBGlobalNbId) (*RNIBNodebInfo, RNIBIRNibError) { + return r.reader.GetNodebByGlobalNbId(t, gid) +} + +func (r *RNIBClient) GetCellList(invName string) (*RNIBCells, RNIBIRNibError) { + return r.reader.GetCellList(invName) +} + +func (r *RNIBClient) GetListGnbIds() ([]*RNIBNbIdentity, RNIBIRNibError) { + return r.reader.GetListGnbIds() +} + +func (r *RNIBClient) GetListEnbIds() ([]*RNIBNbIdentity, RNIBIRNibError) { + return r.reader.GetListEnbIds() +} + +func (r *RNIBClient) GetCountGnbList() (int, RNIBIRNibError) { + return r.reader.GetCountGnbList() } -func (r *RNIBClient) GetUE(key1, key2 string) (value map[string]interface{}, err error) { - return r.db.Get([]string{key1 + key2}) +func (r *RNIBClient) GetCell(invName string, pci uint32) (*RNIBCell, RNIBIRNibError) { + return r.reader.GetCell(invName, pci) } -func (r *RNIBClient) Store(key string, value interface{}) (err error) { - return r.db.Set(key, value) +func (r *RNIBClient) GetCellById(cellType RNIBCellType, cellId string) (*RNIBCell, RNIBIRNibError) { + return r.reader.GetCellById(cellType, cellId) } -func (r *RNIBClient) Clear() { - r.db.RemoveAll() +func (r *RNIBClient) SaveNodeb(nbIdentity *RNIBNbIdentity, entity *RNIBNodebInfo) RNIBIRNibError { + return r.writer.SaveNodeb(nbIdentity, entity) }