X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrNibWriter%2FrNibWriter.go;h=bbf485bdbb5458b9aff49dbe930973be5eb27cf6;hb=3d2b421d8ff9e2a6de7c7e64d51b9e292b05e7c2;hp=670ee6b59feab5b054350d09dc3282c6e4be030c;hpb=f37908ead01e7d9e3a64ab84e88878b58b3e3c42;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go index 670ee6b..bbf485b 100644 --- a/E2Manager/rNibWriter/rNibWriter.go +++ b/E2Manager/rNibWriter/rNibWriter.go @@ -61,8 +61,8 @@ type RNibWriter interface { AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error RemoveNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error AddEnb(nodebInfo *entities.NodebInfo) error + UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error } - /* GetRNibWriter returns reference to RNibWriter */ @@ -217,6 +217,31 @@ func (w *rNibWriterInstance) AddEnb(nodebInfo *entities.NodebInfo) error { return nil } +func (w *rNibWriterInstance) UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error { + + nbIdIdentitiesToRemove, err := w.buildNbIdentitiesMembers(oldNbIdentities) + if err != nil { + return err + } + + err = w.sdl.RemoveMember(nodeType.String(), nbIdIdentitiesToRemove[:]...) + if err != nil { + return err + } + + nbIdIdentitiesToAdd, err := w.buildNbIdentitiesMembers(newNbIdentities) + if err != nil { + return err + } + + err = w.sdl.AddMember(nodeType.String(), nbIdIdentitiesToAdd[:]...) + if err != nil { + return err + } + + return nil +} + func (w *rNibWriterInstance) UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error { pairs, err := buildUpdateNodebInfoPairs(nodebInfo) @@ -546,6 +571,20 @@ func (w *rNibWriterInstance) UpdateEnb(nodebInfo *entities.NodebInfo, servedCell return nil } +func (w *rNibWriterInstance) buildNbIdentitiesMembers(nbIdentities []*entities.NbIdentity) ([]interface{}, error) { + + var nbIdIdentitiesMembers []interface{} + for _, nbIdentity := range nbIdentities { + + nbIdData, err := proto.Marshal(nbIdentity) + if err != nil { + return nil, common.NewInternalError(err) + } + nbIdIdentitiesMembers = append(nbIdIdentitiesMembers, nbIdData) + } + + return nbIdIdentitiesMembers, nil +} /* Close the writer */