[RIC-584] - Improve logging when enb type in add enb request is not valid

[ric-plt/e2mgr.git] / E2Manager / handlers / httpmsghandlers / add_enb_request_handler.go

diff --git a/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go b/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
index 0b86627..bfcced5 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
@@ -55,7 +55,13 @@ func (h *AddEnbRequestHandler) Handle(request models.Request) (models.IResponse,
        err := h.validateRequestBody(addEnbRequest)
 
        if err != nil {
-               h.logger.Errorf("#AddEnbRequestHandler.Handle - validation failure: %s is a mandatory field and cannot be empty or includes invalid value", err)
+               h.logger.Errorf("#AddEnbRequestHandler.Handle - validation failure: %s is a mandatory field and cannot be empty", err)
+               return nil, e2managererrors.NewRequestValidationError()
+       }
+
+       enbType := addEnbRequest.Enb.GetEnbType()
+       if h.nodebValidator.IsNgEnbType(enbType){
+               h.logger.Errorf("#AddEnbRequestHandler.Handle - validation failure: enb type is not supported. enb type: %s", enbType)
                return nil, e2managererrors.NewRequestValidationError()
        }
 
@@ -135,10 +141,6 @@ func (h *AddEnbRequestHandler) validateRequestBody(addEnbRequest *models.AddEnbR
                return err
        }
 
-       if h.nodebValidator.IsNgEnbType(addEnbRequest.Enb.GetEnbType()){
-               return errors.New("enb.enbType")
-       }
-
        return nil
 }