X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fadd_enb_request_handler.go;h=bfcced568511f6e056430cdc73b406e5034253a4;hb=b1b65ff8cbf6dd3ee8d6dec19908ed1b1db07de0;hp=0b86627a6aaa2c76b1553fe543c8c7d421c472a1;hpb=2decf8d474ed5554802eba53e963e1bd3ea87e74;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go b/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
index 0b86627..bfcced5 100644
--- 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
 }