Code Review
/
ric-plt
/
e2mgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change version after creation of r2 branch
[ric-plt/e2mgr.git]
/
E2Manager
/
rNibWriter
/
rNibWriter.go
diff --git
a/E2Manager/rNibWriter/rNibWriter.go
b/E2Manager/rNibWriter/rNibWriter.go
index
1a0b60b
..
702c7a0
100644
(file)
--- a/
E2Manager/rNibWriter/rNibWriter.go
+++ b/
E2Manager/rNibWriter/rNibWriter.go
@@
-18,7
+18,6
@@
package rNibWriter
import (
package rNibWriter
import (
- "errors"
"fmt"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
"fmt"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
@@
-37,9
+36,9
@@
type rNibWriterInstance struct {
RNibWriter interface allows saving data to the redis DB
*/
type RNibWriter interface {
RNibWriter interface allows saving data to the redis DB
*/
type RNibWriter interface {
- SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo)
common.IRNibE
rror
- UpdateNodebInfo(nodebInfo *entities.NodebInfo)
common.IRNibE
rror
- SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation)
common.IRNibE
rror
+ SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo)
e
rror
+ UpdateNodebInfo(nodebInfo *entities.NodebInfo)
e
rror
+ SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation)
e
rror
}
/*
}
/*
@@
-62,23
+61,21
@@
InitPool initializes the writer's instances pool
func initPool(poolSize int, newObj func() interface{}, destroyObj func(interface{})) {
writerPool = common.NewPool(poolSize, newObj, destroyObj)
}
func initPool(poolSize int, newObj func() interface{}, destroyObj func(interface{})) {
writerPool = common.NewPool(poolSize, newObj, destroyObj)
}
-
/*
/*
-GetRNibWriter returns
RNibWriter instance from the pool
+GetRNibWriter returns
reference to RNibWriter
*/
func GetRNibWriter() RNibWriter {
*/
func GetRNibWriter() RNibWriter {
- return
writerPool.Get().(RNibWriter)
+ return
&rNibWriterInstance{}
}
}
-
/*
SaveNodeb saves nodeB entity data in the redis DB according to the specified data model
*/
/*
SaveNodeb saves nodeB entity data in the redis DB according to the specified data model
*/
-func (
w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *entities.NodebInfo) common.IRNibE
rror {
-
+func (
*rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *entities.NodebInfo) e
rror {
+ w := writerPool.Get().(*rNibWriterInstance)
isNotEmptyIdentity := isNotEmpty(nbIdentity)
if isNotEmptyIdentity && entity.GetNodeType() == entities.Node_UNKNOWN {
isNotEmptyIdentity := isNotEmpty(nbIdentity)
if isNotEmptyIdentity && entity.GetNodeType() == entities.Node_UNKNOWN {
- return common.NewValidationError(
errors.New(fmt.Sprintf("#rNibWriter.saveNodeB - Unknown responding node type, entity: %v", entity)
))
+ return common.NewValidationError(
fmt.Sprintf("#rNibWriter.saveNodeB - Unknown responding node type, entity: %v", entity
))
}
defer writerPool.Put(w)
data, err := proto.Marshal(entity)
}
defer writerPool.Put(w)
data, err := proto.Marshal(entity)
@@
-146,8
+143,8
@@
func (w *rNibWriterInstance) SaveNodeb(nbIdentity *entities.NbIdentity, entity *
/*
UpdateNodebInfo...
*/
/*
UpdateNodebInfo...
*/
-func (
w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) common.IRNibE
rror {
-
+func (
*rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) e
rror {
+ w := writerPool.Get().(*rNibWriterInstance)
defer writerPool.Put(w)
nodebNameKey, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.GetRanName())
defer writerPool.Put(w)
nodebNameKey, rNibErr := common.ValidateAndBuildNodeBNameKey(nodebInfo.GetRanName())
@@
-156,11
+153,7
@@
func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
return rNibErr
}
return rNibErr
}
- nodebIdKey, rNibErr := common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId())
-
- if rNibErr != nil {
- return rNibErr
- }
+ nodebIdKey, buildNodebIdKeyError := common.ValidateAndBuildNodeBIdKey(nodebInfo.GetNodeType().String(), nodebInfo.GlobalNbId.GetPlmnId(), nodebInfo.GlobalNbId.GetNbId())
data, err := proto.Marshal(nodebInfo)
data, err := proto.Marshal(nodebInfo)
@@
-169,7
+162,12
@@
func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
}
var pairs []interface{}
}
var pairs []interface{}
- pairs = append(pairs, nodebNameKey, data, nodebIdKey, data)
+ pairs = append(pairs, nodebNameKey, data)
+
+ if buildNodebIdKeyError == nil {
+ pairs = append(pairs, nodebIdKey, data)
+ }
+
err = (*w.sdl).Set(pairs)
if err != nil {
err = (*w.sdl).Set(pairs)
if err != nil {
@@
-182,8
+180,8
@@
func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
/*
SaveRanLoadInformation stores ran load information for the provided ran
*/
/*
SaveRanLoadInformation stores ran load information for the provided ran
*/
-func (
w *rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) common.IRNibE
rror {
-
+func (
*rNibWriterInstance) SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) e
rror {
+ w := writerPool.Get().(*rNibWriterInstance)
defer writerPool.Put(w)
key, rnibErr := common.ValidateAndBuildRanLoadInformationKey(inventoryName)
defer writerPool.Put(w)
key, rnibErr := common.ValidateAndBuildRanLoadInformationKey(inventoryName)
@@
-217,7
+215,7
@@
func Close() {
writerPool.Close()
}
writerPool.Close()
}
-func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCellInfo, pairs []interface{}) ([]interface{},
common.IRNibE
rror) {
+func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCellInfo, pairs []interface{}) ([]interface{},
e
rror) {
for _, cell := range cells {
cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: cell}}
cellData, err := proto.Marshal(&cellEntity)
for _, cell := range cells {
cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: cell}}
cellData, err := proto.Marshal(&cellEntity)
@@
-238,7
+236,7
@@
func appendEnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedCel
return pairs, nil
}
return pairs, nil
}
-func appendGnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedNRCell, pairs []interface{}) ([]interface{},
common.IRNibE
rror) {
+func appendGnbCells(nbIdentity *entities.NbIdentity, cells []*entities.ServedNRCell, pairs []interface{}) ([]interface{},
e
rror) {
for _, cell := range cells {
cellEntity := entities.Cell{Type: entities.Cell_NR_CELL, Cell: &entities.Cell_ServedNrCell{ServedNrCell: cell}}
cellData, err := proto.Marshal(&cellEntity)
for _, cell := range cells {
cellEntity := entities.Cell{Type: entities.Cell_NR_CELL, Cell: &entities.Cell_ServedNrCell{ServedNrCell: cell}}
cellData, err := proto.Marshal(&cellEntity)