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=2e2df47c2adf829fc8dfcd57362061b1a09e1125;hp=46cd8028917ff5a35c5ab0366692fa93aca211f7;hpb=a269db89a144d3f041eb265c9aa2e7633142429f;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 46cd802..bfcced5 100644
--- a/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
@@ -59,6 +59,12 @@ func (h *AddEnbRequestHandler) Handle(request models.Request) (models.IResponse,
 		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()
+	}
+
 	_, err = h.rNibDataService.GetNodeb(addEnbRequest.RanName)
 
 	if err == nil {
@@ -73,10 +79,10 @@ func (h *AddEnbRequestHandler) Handle(request models.Request) (models.IResponse,
 	}
 
 	nodebInfo := h.createNodebInfo(addEnbRequest)
-	err = h.rNibDataService.SaveNodeb(nodebInfo)
+	err = h.rNibDataService.AddEnb(nodebInfo)
 
 	if err != nil {
-		h.logger.Errorf("#AddEnbRequestHandler.Handle - RAN name: %s - failed to save nodeb entity in RNIB. Error: %s", addEnbRequest.RanName, err)
+		h.logger.Errorf("#AddEnbRequestHandler.Handle - RAN name: %s - failed to add eNB entity in RNIB. Error: %s", addEnbRequest.RanName, err)
 		return nil, e2managererrors.NewRnibDbError()
 	}
 
@@ -99,6 +105,7 @@ func (h *AddEnbRequestHandler) createNodebInfo(addEnbRequest *models.AddEnbReque
 		Configuration:    &entities.NodebInfo_Enb{Enb: addEnbRequest.Enb},
 		NodeType:         entities.Node_ENB,
 		ConnectionStatus: entities.ConnectionStatus_DISCONNECTED,
+		SetupFromNetwork: false,
 	}
 
 	return &nodebInfo