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
[RIC-434] Update gNB Cells
[ric-plt/e2mgr.git]
/
E2Manager
/
rNibWriter
/
rNibWriter.go
diff --git
a/E2Manager/rNibWriter/rNibWriter.go
b/E2Manager/rNibWriter/rNibWriter.go
index
4c84d49
..
3069258
100644
(file)
--- a/
E2Manager/rNibWriter/rNibWriter.go
+++ b/
E2Manager/rNibWriter/rNibWriter.go
@@
-69,6
+69,10
@@
func GetRNibWriter(sdl common.ISdlInstance, rnibWriterConfig configuration.RnibW
return &rNibWriterInstance{sdl: sdl, rnibWriterConfig: rnibWriterConfig}
}
return &rNibWriterInstance{sdl: sdl, rnibWriterConfig: rnibWriterConfig}
}
+func getChannelsAndEventsPair(channel string, ranName string, event string) []string {
+ return []string{channel, fmt.Sprintf("%s_%s", ranName, event)}
+}
+
func (w *rNibWriterInstance) AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error {
nbIdData, err := proto.Marshal(nbIdentity)
func (w *rNibWriterInstance) AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error {
nbIdData, err := proto.Marshal(nbIdentity)
@@
-163,7
+167,8
@@
func (w *rNibWriterInstance) SaveNodeb(nodebInfo *entities.NodebInfo) error {
}
if nodebInfo.GetNodeType() == entities.Node_ENB {
}
if nodebInfo.GetNodeType() == entities.Node_ENB {
- err = w.sdl.SetAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", nodebInfo.RanName, RanAddedEvent)}, pairs)
+ channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanAddedEvent)
+ err = w.sdl.SetAndPublish(channelsAndEvents, pairs)
} else {
err = w.sdl.Set(pairs)
}
} else {
err = w.sdl.Set(pairs)
}
@@
-189,7
+194,8
@@
func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, serve
return err
}
return err
}
- err = w.sdl.Set(pairs)
+ channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent)
+ err = w.sdl.SetAndPublish(channelsAndEvents, pairs)
if err != nil {
return common.NewInternalError(err)
if err != nil {
return common.NewInternalError(err)
@@
-452,7
+458,8
@@
func (w *rNibWriterInstance) RemoveEnb(nodebInfo *entities.NodebInfo) error {
return err
}
return err
}
- err = w.sdl.RemoveAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", nodebInfo.RanName, RanDeletedEvent)}, keysToRemove)
+ channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanDeletedEvent)
+ err = w.sdl.RemoveAndPublish(channelsAndEvents, keysToRemove)
if err != nil {
return common.NewInternalError(err)
if err != nil {
return common.NewInternalError(err)
@@
-475,7
+482,8
@@
func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCell
return err
}
return err
}
- err = w.sdl.SetAndPublish([]string{w.rnibWriterConfig.RanManipulationMessageChannel, fmt.Sprintf("%s_%s", nodebInfo.RanName, RanUpdatedEvent)}, pairs)
+ channelsAndEvents := getChannelsAndEventsPair(w.rnibWriterConfig.RanManipulationMessageChannel, nodebInfo.RanName, RanUpdatedEvent)
+ err = w.sdl.SetAndPublish(channelsAndEvents, pairs)
if err != nil {
return common.NewInternalError(err)
if err != nil {
return common.NewInternalError(err)
@@
-531,4
+539,4
@@
func appendGnbCells(inventoryName string, cells []*entities.ServedNRCell, pairs
pairs = append(pairs, key, cellData)
}
return pairs, nil
pairs = append(pairs, key, cellData)
}
return pairs, nil
-}
\ No newline at end of file
+}