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=3f93c58df5bae9b8efc2ac45dd13749e9307dfbe;hb=refs%2Fchanges%2F66%2F12566%2F1;hp=8f4aacde9e81077dd7d33b7cc35c9b29ebd97f4c;hpb=0f06f71ca88aeedf1239fdc0f3f4cb7fa0ab9823;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 8f4aacd..3f93c58 100644
--- a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go
@@ -2,6 +2,7 @@
 // Copyright 2019 AT&T Intellectual Property
 // Copyright 2019 Nokia
 // Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.
+// Copyright 2023 Capgemini
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,13 +37,17 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 )
 
+const cleanUpDurationNanoSec uint64 = 10000000000 // cleanUpDuration = 10sec (value in nanoSecond=10000000000)
+
 var (
 	emptyTagsToReplaceToSelfClosingTags = []string{"reject", "ignore", "transport-resource-unavailable", "om-intervention", "request-id-unknown",
+		"unspecified", "message-not-compatible-with-receiver-state", "control-processing-overload",
 		"v60s", "v20s", "v10s", "v5s", "v2s", "v1s", "ng", "xn", "e1", "f1", "w1", "s1", "x2", "success", "failure"}
 	gnbTypesMap = map[string]entities.GnbType{
 		"gnb":    entities.GnbType_GNB,
@@ -85,6 +90,7 @@ func NewE2SetupRequestNotificationHandler(logger *logger.Logger, config *configu
 
 func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationRequest) {
 	ranName := request.RanName
+	models.UpdateProcedureType(ranName, models.E2SetupProcedureNotInitiated)
 	h.logger.Infof("#E2SetupRequestNotificationHandler.Handle - RAN name: %s - received E2_SETUP_REQUEST. Payload: %x", ranName, request.Payload)
 
 	generalConfiguration, err := h.rNibDataService.GetGeneralConfiguration()
@@ -108,6 +114,7 @@ func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationR
 	if !generalConfiguration.EnableRic {
 		cause := models.Cause{Misc: &models.CauseMisc{OmIntervention: &struct{}{}}}
 		h.handleUnsuccessfulResponse(ranName, request, cause, setupRequest)
+		models.UpdateProcedureType(ranName, models.E2SetupProcedureFailure)
 		return
 	}
 
@@ -133,6 +140,7 @@ func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationR
 			if _, ok := err.(*e2managererrors.UnknownSetupRequestRanNameError); ok {
 				cause := models.Cause{RicRequest: &models.CauseRic{RequestIdUnknown: &struct{}{}}}
 				h.handleUnsuccessfulResponse(ranName, request, cause, setupRequest)
+				models.UpdateProcedureType(ranName, models.E2SetupProcedureFailure)
 			}
 			return
 		}
@@ -142,9 +150,12 @@ func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationR
 		functionsModified, err = h.handleExistingRan(ranName, nodebInfo, setupRequest)
 
 		if err != nil {
+			h.fillCauseAndSendUnsuccessfulResponse(nodebInfo, request, setupRequest)
+			models.UpdateProcedureType(ranName, models.E2SetupProcedureFailure)
 			return
 		}
 	}
+	models.UpdateProcedureType(ranName, models.E2SetupProcedureOngoing)
 
 	ranStatusChangePublished, err := h.e2tAssociationManager.AssociateRan(e2tIpAddress, nodebInfo)
 
@@ -159,6 +170,7 @@ func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationR
 
 			cause := models.Cause{Transport: &models.CauseTransport{TransportResourceUnavailable: &struct{}{}}}
 			h.handleUnsuccessfulResponse(nodebInfo.RanName, request, cause, setupRequest)
+			models.UpdateProcedureType(ranName, models.E2SetupProcedureFailure)
 		}
 		return
 	}
@@ -168,6 +180,8 @@ func (h *E2SetupRequestNotificationHandler) Handle(request *models.NotificationR
 	}
 
 	h.handleSuccessfulResponse(ranName, request, setupRequest)
+	models.UpdateProcedureType(ranName, models.E2SetupProcedureCompleted)
+	h.logger.Debugf("#E2SetupRequestNotificationHandler.Handle - updating the enum value to e2setup request completed")
 }
 
 func (h *E2SetupRequestNotificationHandler) handleUpdateAndPublishNodebInfo(functionsModified bool, ranStatusChangePublished bool, nodebInfo *entities.NodebInfo) error {
@@ -214,7 +228,15 @@ func (h *E2SetupRequestNotificationHandler) handleNewRan(ranName string, e2tIpAd
 }
 
 func (h *E2SetupRequestNotificationHandler) handleExistingRan(ranName string, nodebInfo *entities.NodebInfo, setupRequest *models.E2SetupRequestMessage) (bool, error) {
-	if nodebInfo.GetConnectionStatus() == entities.ConnectionStatus_SHUTTING_DOWN {
+	if nodebInfo.GetConnectionStatus() == entities.ConnectionStatus_DISCONNECTED {
+		delta_in_nano := uint64(time.Now().UnixNano()) - nodebInfo.StatusUpdateTimeStamp
+		//The duration from last Disconnection for which a new request is to be rejected (currently 10 sec)
+		if delta_in_nano < cleanUpDurationNanoSec {
+			h.logger.Errorf("#E2SetupRequestNotificationHandler.Handle - RAN name: %s, connection status: %s - nodeB entity disconnection in progress", ranName, nodebInfo.ConnectionStatus)
+			return false, errors.New("nodeB entity disconnection in progress")
+		}
+		h.logger.Infof("#E2SetupRequestNotificationHandler.Handle - RAN name: %s, connection status: %s - nodeB entity in disconnected state", ranName, nodebInfo.ConnectionStatus)
+	} else if nodebInfo.GetConnectionStatus() == entities.ConnectionStatus_SHUTTING_DOWN {
 		h.logger.Errorf("#E2SetupRequestNotificationHandler.Handle - RAN name: %s, connection status: %s - nodeB entity in incorrect state", ranName, nodebInfo.ConnectionStatus)
 		return false, errors.New("nodeB entity in incorrect state")
 	}
@@ -372,6 +394,18 @@ func (h *E2SetupRequestNotificationHandler) buildNodebInfo(ranName string, e2tAd
 	}
 	nodebInfo.GetGnb().NodeConfigs = e2NodeConfig
 
+	if nodebInfo.NodeType == entities.Node_GNB {
+		h.logger.Debugf("#E2SetupRequestNotificationHandler buildNodebInfo - entities.Node_GNB %d", entities.Node_GNB)
+
+		gnbNodetype := h.setGnbNodeType(request)
+		h.logger.Debugf("#E2SetupRequestNotificationHandler buildNodebInfo -gnbNodetype %s", gnbNodetype)
+		nodebInfo.GnbNodeType = gnbNodetype
+		nodebInfo.CuUpId = request.GetCuupId()
+		nodebInfo.DuId = request.GetDuId()
+		h.logger.Debugf("#E2SetupRequestNotificationHandler buildNodebInfo -cuupid%s", request.GetCuupId())
+		h.logger.Debugf("#E2SetupRequestNotificationHandler buildNodebInfo -duid %s", request.GetDuId())
+	}
+
 	ranFuncs := request.ExtractRanFunctionsList()
 
 	if ranFuncs != nil {
@@ -381,6 +415,24 @@ func (h *E2SetupRequestNotificationHandler) buildNodebInfo(ranName string, e2tAd
 	return nodebInfo, nil
 }
 
+
+func (h *E2SetupRequestNotificationHandler) setGnbNodeType(setupRequest *models.E2SetupRequestMessage) string {
+	gnbNodetype := "gNB"
+          /*Note: Deployment where CU-UP and DU are combined
+	  (but do not include the CP-CP) and have a single E2 connection
+	   is not supported. The combination of CU-CP, CU-UP, and DU will be
+	   treated as a single gNB and expect it to have only the
+	   global gNB ID in its E2 Setup ID*/
+	if setupRequest.GetCuupId() != "" && setupRequest.GetDuId() != "" {
+		gnbNodetype = "gNB"
+	} else if setupRequest.GetCuupId() != "" {
+		gnbNodetype = "gNB_CU_UP"
+	} else if setupRequest.GetDuId() != "" {
+		gnbNodetype = "gNB_DU"
+	}
+	return gnbNodetype
+}
+
 func (h *E2SetupRequestNotificationHandler) setNodeTypeAndConfiguration(nodebInfo *entities.NodebInfo) error {
 	for k, v := range gnbTypesMap {
 		if strings.HasPrefix(nodebInfo.RanName, k) {
@@ -413,3 +465,12 @@ func (h *E2SetupRequestNotificationHandler) buildNbIdentity(ranName string, setu
 		GlobalNbId:    h.buildGlobalNbId(setupRequest),
 	}
 }
+
+func (h *E2SetupRequestNotificationHandler) fillCauseAndSendUnsuccessfulResponse(nodebInfo *entities.NodebInfo, request *models.NotificationRequest, setupRequest *models.E2SetupRequestMessage) {
+	ranName := request.RanName
+	if nodebInfo.GetConnectionStatus() == entities.ConnectionStatus_DISCONNECTED {
+		cause := models.Cause{Misc: &models.CauseMisc{ControlProcessingOverload: &struct{}{}}}
+		h.handleUnsuccessfulResponse(nodebInfo.RanName, request, cause, setupRequest)
+		models.UpdateProcedureType(ranName, models.E2SetupProcedureFailure)
+	}
+}