h.logger.Infof("#UpdateEnbManager.Validate - Validate incoming request, ran name: %s", updateEnbRequest.RanName)
-
if err := h.validateRequestBody(updateEnbRequest); err != nil {
h.logger.Errorf("#UpdateEnbManager.Validate - validation failure: %s is a mandatory field and cannot be empty", err)
return err
}
-
return nil
}
return e2managererrors.NewRequestValidationError()
}
- err := h.rnibDataService.RemoveServedCells(nodeb.GetRanName(), nodeb.GetEnb().GetServedCells())
+ servedCells := nodeb.GetEnb().GetServedCells()
+
+ if len(servedCells) == 0 {
+ h.logger.Infof("#UpdateGnbManager.RemoveNodebCells - RAN name: %s - eNB cells are nil or empty - no cells to remove", nodeb.GetRanName())
+ return nil
+ }
+
+ err := h.rnibDataService.RemoveServedCells(nodeb.GetRanName(), servedCells)
if err != nil {
h.logger.Errorf("#UpdateEnbManager.RemoveNodebCells - RAN name: %s - Failed removing eNB served cells", nodeb.GetRanName())
return e2managererrors.NewRnibDbError()
return nil
}
-func (h *UpdateEnbManager) SetNodeb(nodeb *entities.NodebInfo, request models.Request) error {
-
+func (h *UpdateEnbManager) SetNodeb(nodeb *entities.NodebInfo, request models.Request) {
updateEnbRequest := request.(*models.UpdateEnbRequest)
- nodeb.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb}
+ if nodeb.SetupFromNetwork {
+ updateEnbRequest.Enb.EnbType = nodeb.GetEnb().GetEnbType()
+ }
- return nil
+ nodeb.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb}
}
func (h *UpdateEnbManager) UpdateNodeb(nodeb *entities.NodebInfo) error {
}
return nil
-}
\ No newline at end of file
+}
+
+func (h *UpdateEnbManager) ValidateNodeb(nodeb *entities.NodebInfo) error{
+
+ enbType := nodeb.GetEnb().GetEnbType()
+
+ if h.nodebValidator.IsNgEnbType(enbType) {
+ h.logger.Errorf("#UpdateEnbManager.ValidateNodeb - validation failure: current enb type is not supported. enb type: %s", enbType)
+ return errors.New("")
+ }
+ return nil
+}
+