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

Change-Id: I6225dba06870dc1195c1c2911802aad1792abc3a
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>

diff --git a/E2Manager/container-tag.yaml b/E2Manager/container-tag.yaml
index 5fe01f6..d7ddab7 100644 (file)
--- a/E2Manager/container-tag.yaml
+++ b/E2Manager/container-tag.yaml
@@ -1,4 +1,4 @@
 # The Jenkins job requires a tag to build the Docker image.
 # Global-JJB script assumes this file is in the repo root.
 ---
-tag: 5.4.6
+tag: 5.4.7

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
 }