[RICPLT-1853] Couple of adjustments.........

[ric-plt/e2mgr.git] / E2Manager / rNibWriter / rNibWriter.go

diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go
index 1a0b60b..72f9eb8 100644 (file)
--- a/E2Manager/rNibWriter/rNibWriter.go
+++ b/E2Manager/rNibWriter/rNibWriter.go
@@ -156,11 +156,7 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
                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)
 
@@ -169,7 +165,12 @@ func (w *rNibWriterInstance) UpdateNodebInfo(nodebInfo *entities.NodebInfo) comm
        }
 
        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 {