X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Frmrmsghandlers%2Fsetup_response_notification_handler.go;h=695a09f815b581243f3d102627a1cda2bce870d6;hb=3ae760f4378ea43575eca6e83ccc01084566e7cf;hp=fc21cc7e664606592c000da90f28a7120979385a;hpb=ffd085dd7f0654b84b163a7bfedd3fa89e7b8a71;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
index fc21cc7..695a09f 100644
--- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
@@ -13,69 +13,94 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
+
 package rmrmsghandlers
 
 import (
+	"e2mgr/enums"
 	"e2mgr/logger"
 	"e2mgr/managers"
 	"e2mgr/models"
-	"e2mgr/rNibWriter"
+	"e2mgr/rmrCgo"
+	"e2mgr/services"
+	"e2mgr/utils"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 )
 
 type SetupResponseNotificationHandler struct {
-	rnibReaderProvider   func() reader.RNibReader
-	rnibWriterProvider   func() rNibWriter.RNibWriter
-	setupResponseManager managers.ISetupResponseManager
-	notificationType     string
+	logger                 *logger.Logger
+	rnibDataService        services.RNibDataService
+	setupResponseManager   managers.ISetupResponseManager
+	ranStatusChangeManager managers.IRanStatusChangeManager
+	msgType                int
 }
 
-func NewSetupResponseNotificationHandler(rnibReaderProvider func() reader.RNibReader, rnibWriterProvider func() rNibWriter.RNibWriter, setupResponseManager managers.ISetupResponseManager, notificationType string) SetupResponseNotificationHandler {
+var msgTypeToMsgName = map[int]string{
+	rmrCgo.RIC_X2_SETUP_RESP:         "X2 Setup Response",
+	rmrCgo.RIC_X2_SETUP_FAILURE:      "X2 Setup Failure Response",
+	rmrCgo.RIC_ENDC_X2_SETUP_RESP:    "ENDC Setup Response",
+	rmrCgo.RIC_ENDC_X2_SETUP_FAILURE: "ENDC Setup Failure Response",
+}
+
+func NewSetupResponseNotificationHandler(logger *logger.Logger, rnibDataService services.RNibDataService, setupResponseManager managers.ISetupResponseManager, ranStatusChangeManager managers.IRanStatusChangeManager, msgType int) SetupResponseNotificationHandler {
 	return SetupResponseNotificationHandler{
-		rnibReaderProvider:   rnibReaderProvider,
-		rnibWriterProvider:   rnibWriterProvider,
-		setupResponseManager: setupResponseManager,
-		notificationType:     notificationType,
+		logger: logger,
+		rnibDataService:        rnibDataService,
+		setupResponseManager:   setupResponseManager,
+		ranStatusChangeManager: ranStatusChangeManager,
+		msgType:                msgType,
 	}
 }
 
-func (h SetupResponseNotificationHandler) Handle(logger *logger.Logger, request *models.NotificationRequest, messageChannel chan<- *models.NotificationResponse) {
-	logger.Infof("#SetupResponseNotificationHandler - RAN name: %s - Received %s notification", request.RanName, h.notificationType)
+func (h SetupResponseNotificationHandler) Handle(request *models.NotificationRequest) {
+	msgName := msgTypeToMsgName[h.msgType]
+	h.logger.Infof("#SetupResponseNotificationHandler - RAN name: %s - Received %s notification", request.RanName, msgName)
 
 	inventoryName := request.RanName
 
-	nodebInfo, rnibErr := h.rnibReaderProvider().GetNodeb(inventoryName)
+	nodebInfo, rnibErr := h.rnibDataService.GetNodeb(inventoryName)
 
 	if rnibErr != nil {
-		logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Error fetching RAN from rNib: %v", request.RanName, rnibErr)
+		h.logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Error fetching RAN from rNib: %v", request.RanName, rnibErr)
 		return
 	}
 
 	if !isConnectionStatusValid(nodebInfo.ConnectionStatus) {
-		logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Invalid RAN connection status: %s", request.RanName, nodebInfo.ConnectionStatus)
+		h.logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Invalid RAN connection status: %s", request.RanName, nodebInfo.ConnectionStatus)
 		return
 	}
 
-	nodebInfo.ConnectionAttempts = 0
 	nbIdentity := &entities.NbIdentity{InventoryName: inventoryName}
-	err := h.setupResponseManager.SetNodeb(logger, nbIdentity, nodebInfo, request.Payload)
+	err := h.setupResponseManager.PopulateNodebByPdu(h.logger, nbIdentity, nodebInfo, request.Payload)
 
 	if err != nil {
 		return
 	}
 
-	rnibErr = h.rnibWriterProvider().SaveNodeb(nbIdentity, nodebInfo)
+	rnibErr = h.rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
 
 	if rnibErr != nil {
-		logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Error saving RAN to rNib: %v", request.RanName, rnibErr)
+		h.logger.Errorf("#SetupResponseNotificationHandler - RAN name: %s - Error saving RAN to rNib: %v", request.RanName, rnibErr)
 		return
 	}
 
-	logger.Infof("#SetupResponseNotificationHandler - RAN name: %s - Successfully saved RAN to rNib", request.RanName)
+	h.logger.Infof("#SetupResponseNotificationHandler - RAN name: %s - Successfully saved RAN to rNib", request.RanName)
+	h.logger.Infof("#SetupResponseNotificationHandler - Summary: elapsed time for receiving and handling setup response message from E2 terminator: %f ms", utils.ElapsedTime(request.StartTime))
+
+	if !isSuccessSetupResponseMessage(h.msgType) {
+		return
+	}
+
+	_ = h.ranStatusChangeManager.Execute(rmrCgo.RAN_CONNECTED, enums.RIC_TO_RAN, nodebInfo)
 }
 
 func isConnectionStatusValid(connectionStatus entities.ConnectionStatus) bool {
 	return connectionStatus == entities.ConnectionStatus_CONNECTING || connectionStatus == entities.ConnectionStatus_CONNECTED
 }
+
+func isSuccessSetupResponseMessage(msgType int) bool {
+	return msgType == rmrCgo.RIC_X2_SETUP_RESP || msgType == rmrCgo.RIC_ENDC_X2_SETUP_RESP
+}