X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fmanagers%2Fupdate_enb_manager.go;h=0e8ed7ef21ad917c6853c29c315c84412b7c6458;hb=d2f1a29d3f1cc779045148a82729f644e6110776;hp=cb3e4bc29aa676ff543d6f7f9d4d59cce810aa0a;hpb=5208a1cf953edf958444d41352815073e9ebaf29;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/update_enb_manager.go b/E2Manager/managers/update_enb_manager.go index cb3e4bc..0e8ed7e 100755 --- a/E2Manager/managers/update_enb_manager.go +++ b/E2Manager/managers/update_enb_manager.go @@ -52,7 +52,6 @@ func (h *UpdateEnbManager) Validate(request models.Request) error { h.logger.Errorf("#UpdateEnbManager.Validate - validation failure: %s is a mandatory field and cannot be empty", err) return err } - return nil } @@ -82,7 +81,11 @@ func (h *UpdateEnbManager) RemoveNodebCells(nodeb *entities.NodebInfo) error { func (h *UpdateEnbManager) SetNodeb(nodeb *entities.NodebInfo, request models.Request) { updateEnbRequest := request.(*models.UpdateEnbRequest) - updateEnbRequest.Enb.EnbType = nodeb.GetEnb().GetEnbType() + + if nodeb.SetupFromNetwork { + updateEnbRequest.Enb.EnbType = nodeb.GetEnb().GetEnbType() + } + nodeb.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb} } @@ -108,9 +111,17 @@ func (h *UpdateEnbManager) validateRequestBody(request *models.UpdateEnbRequest) return err } - if h.nodebValidator.IsNgEnbType(request.Enb.GetEnbType()){ - return errors.New("enb.enbType") - } + return nil +} + +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 } +