X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fe2_setup_request_notification_handler.go;h=55655134fe793a3304652d072413ad15721dd3d7;hb=c0d6030bc5eb1994b4fb1e30a52d9e53eb947e69;hp=d229e8c9383322d8f92e4a2e80a8778e04d2573e;hpb=197657e0e814c871b903ef779ad654b13347e430;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go
index d229e8c..5565513 100644
--- a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go
@@ -39,8 +39,21 @@ import (
 )
 
 var (
-	emptyTagsToReplaceToSelfClosingTags = []string{"reject", "ignore", "transport-resource-unavailable", "om-intervention",
+	emptyTagsToReplaceToSelfClosingTags = []string{"reject", "ignore", "transport-resource-unavailable", "om-intervention", "request-id-unknown",
 		"v60s", "v20s", "v10s", "v5s", "v2s", "v1s"}
+	gnbTypesMap = map[string]entities.GnbType{
+		"gnb":entities.GnbType_GNB,
+		"en_gnb":entities.GnbType_EN_GNB,
+	}
+	enbTypesMap = map[string]entities.EnbType{
+		"enB_macro":entities.EnbType_MACRO_ENB,
+		"enB_home":entities.EnbType_HOME_ENB,
+		"enB_shortmacro":entities.EnbType_SHORT_MACRO_ENB,
+		"enB_longmacro":entities.EnbType_LONG_MACRO_ENB,
+		"ng_enB_macro":entities.EnbType_MACRO_NG_ENB,
+		"ng_enB_shortmacro":entities.EnbType_SHORT_MACRO_NG_ENB,
+		"ng_enB_longmacro":entities.EnbType_LONG_MACRO_NG_ENB,
+	}
 )
 
 type E2SetupRequestNotificationHandler struct {
@@ -51,9 +64,10 @@ type E2SetupRequestNotificationHandler struct {
 	rNibDataService               services.RNibDataService
 	e2tAssociationManager         *managers.E2TAssociationManager
 	ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager
+	ranListManager managers.RanListManager
 }
 
-func NewE2SetupRequestNotificationHandler(logger *logger.Logger, config *configuration.Configuration, e2tInstancesManager managers.IE2TInstancesManager, rmrSender *rmrsender.RmrSender, rNibDataService services.RNibDataService, e2tAssociationManager *managers.E2TAssociationManager, ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager) *E2SetupRequestNotificationHandler {
+func NewE2SetupRequestNotificationHandler(logger *logger.Logger, config *configuration.Configuration, e2tInstancesManager managers.IE2TInstancesManager, rmrSender *rmrsender.RmrSender, rNibDataService services.RNibDataService, e2tAssociationManager *managers.E2TAssociationManager, ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager, ranListManager managers.RanListManager) *E2SetupRequestNotificationHandler {
 	return &E2SetupRequestNotificationHandler{
 		logger:                        logger,
 		config:                        config,
@@ -62,6 +76,7 @@ func NewE2SetupRequestNotificationHandler(logger *logger.Logger, config *configu
 		rNibDataService:               rNibDataService,
 		e2tAssociationManager:         e2tAssociationManager,
 		ranConnectStatusChangeManager: ranConnectStatusChangeManager,
+		ranListManager: ranListManager,
 	}
 }
 
@@ -111,6 +126,10 @@ func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationR
 		}
 
 		if nodebInfo, err = h.handleNewRan(ranName, e2tIpAddress, setupRequest); err != nil {
+			if _, ok := err.(*e2managererrors.UnknownSetupRequestRanNameError); ok {
+				cause := models.Cause{RicRequest: &models.CauseRic{RequestIdUnknown: &struct{}{}}}
+				h.handleUnsuccessfulResponse(ranName, request, cause)
+			}
 			return
 		}
 
@@ -138,21 +157,20 @@ func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationR
 func (h *E2SetupRequestNotificationHandler) handleNewRan(ranName string, e2tIpAddress string, setupRequest *models.E2SetupRequestMessage) (*entities.NodebInfo, error) {
 
 	nodebInfo, err := h.buildNodebInfo(ranName, e2tIpAddress, setupRequest)
-
 	if err != nil {
-		h.logger.Errorf("#E2SetupRequestNotificationHandler.handleNewRan - RAN name: %s - failed to build nodebInfo entity. Error: %s", ranName, err)
+		h.logger.Errorf("#E2SetupRequestNotificationHandler.handleNewRan - RAN name: %s - failed building nodebInfo. Error: %s", ranName, err)
 		return nil, err
 	}
 
-	nbIdentity := h.buildNbIdentity(ranName, setupRequest)
-	err = h.rNibDataService.SaveNodeb(nbIdentity, nodebInfo)
-
+	err = h.rNibDataService.SaveNodeb(nodebInfo)
 	if err != nil {
-		h.logger.Errorf("#E2SetupRequestNotificationHandler.handleNewRan - RAN name: %s - failed to save nodebInfo entity. Error: %s", ranName, err)
+		h.logger.Errorf("#E2SetupRequestNotificationHandler.handleNewRan - RAN name: %s - failed saving nodebInfo. Error: %s", ranName, err)
 		return nil, err
 	}
 
-	err = h.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_CONNECTED)
+	nbIdentity := h.buildNbIdentity(ranName, setupRequest)
+
+	err = h.ranListManager.AddNbIdentity(nodebInfo.GetNodeType(), nbIdentity)
 
 	if err != nil {
 		return nil, err
@@ -162,8 +180,11 @@ func (h *E2SetupRequestNotificationHandler) handleNewRan(ranName string, e2tIpAd
 }
 
 func (h *E2SetupRequestNotificationHandler) setGnbFunctions(nodebInfo *entities.NodebInfo, setupRequest *models.E2SetupRequestMessage) {
-	ranFunctions := setupRequest.ExtractRanFunctionsList()
+	if nodebInfo.GetNodeType() == entities.Node_ENB {
+		return
+	}
 
+	ranFunctions := setupRequest.ExtractRanFunctionsList()
 	if ranFunctions != nil {
 		nodebInfo.GetGnb().RanFunctions = ranFunctions
 	}
@@ -293,18 +314,37 @@ func normalizeXml(payload []byte) []byte {
 }
 
 func (h *E2SetupRequestNotificationHandler) buildNodebInfo(ranName string, e2tAddress string, request *models.E2SetupRequestMessage) (*entities.NodebInfo, error) {
-
-	var err error
 	nodebInfo := &entities.NodebInfo{
 		AssociatedE2TInstanceAddress: e2tAddress,
 		RanName:                      ranName,
-		NodeType:                     entities.Node_GNB,
-		Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
 		GlobalNbId:                   h.buildGlobalNbId(request),
+		SetupFromNetwork: 			  true,
+	}
+	err := h.setNodeTypeAndConfiguration(nodebInfo)
+	if err != nil {
+		return nil, err
 	}
-
 	h.setGnbFunctions(nodebInfo, request)
-	return nodebInfo, err
+	return nodebInfo, nil
+}
+
+func (h *E2SetupRequestNotificationHandler) setNodeTypeAndConfiguration(nodebInfo *entities.NodebInfo) error {
+	for k, v := range gnbTypesMap {
+		if strings.HasPrefix(nodebInfo.RanName, k) {
+			nodebInfo.NodeType = entities.Node_GNB
+			nodebInfo.Configuration = &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{GnbType: v}}
+			return nil
+		}
+	}
+	for k, v := range enbTypesMap {
+		if strings.HasPrefix(nodebInfo.RanName, k) {
+			nodebInfo.NodeType = entities.Node_ENB
+			nodebInfo.Configuration = &entities.NodebInfo_Enb{Enb: &entities.Enb{EnbType: v}}
+			return nil
+		}
+	}
+
+	return e2managererrors.NewUnknownSetupRequestRanNameError(nodebInfo.RanName)
 }
 
 func (h *E2SetupRequestNotificationHandler) buildGlobalNbId(setupRequest *models.E2SetupRequestMessage) *entities.GlobalNbId {