X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fx2_setup_failure_response_manager.go;h=faaa89229b79f8711ee8ae4f78ad0f6570acb134;hb=0249b5fc410b6c6814906b185dfdf25b27621148;hp=77098eb3cde7e52dbadc13cf298b517d419d3401;hpb=1ec13d4076e7c7abefac6176462c1fee31229213;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/x2_setup_failure_response_manager.go b/E2Manager/managers/x2_setup_failure_response_manager.go
index 77098eb..faaa892 100644
--- a/E2Manager/managers/x2_setup_failure_response_manager.go
+++ b/E2Manager/managers/x2_setup_failure_response_manager.go
@@ -1,30 +1,54 @@
+//
+// Copyright 2019 AT&T Intellectual Property
+// Copyright 2019 Nokia
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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 managers
 
 import (
 	"e2mgr/converters"
-	"e2mgr/e2pdus"
 	"e2mgr/logger"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 )
 
-type X2SetupFailureResponseManager struct{}
+type X2SetupFailureResponseManager struct {
+	converter converters.IX2SetupFailureResponseConverter
+}
 
-func NewX2SetupFailureResponseManager() *X2SetupFailureResponseManager {
-	return &X2SetupFailureResponseManager{}
+func NewX2SetupFailureResponseManager(converter converters.IX2SetupFailureResponseConverter) *X2SetupFailureResponseManager {
+	return &X2SetupFailureResponseManager{
+		converter: converter,
+	}
 }
 
-func (m *X2SetupFailureResponseManager) SetNodeb(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error {
+func (m *X2SetupFailureResponseManager) PopulateNodebByPdu(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error {
 
-	failureResponse, err := converters.UnpackX2SetupFailureResponseAndExtract(logger, e2pdus.MaxAsn1CodecAllocationBufferSize, len(payload), payload, e2pdus.MaxAsn1CodecMessageBufferSize)
+	failureResponse, err := m.converter.UnpackX2SetupFailureResponseAndExtract(payload)
 
 	if err != nil {
-		logger.Errorf("#x2Setup_failure_response_notification_handler.Handle - unpack failed. Error: %v", err)
+		logger.Errorf("#X2SetupFailureResponseManager.PopulateNodebByPdu - RAN name: %s - Unpack and extract failed. Error: %v", nodebInfo.RanName, err)
 		return err
 	}
 
+	logger.Infof("#X2SetupFailureResponseManager.PopulateNodebByPdu - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName)
+
 	nodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED_SETUP_FAILED
-	nodebInfo.E2ApplicationProtocol = entities.E2ApplicationProtocol_X2_SETUP_REQUEST
 	nodebInfo.SetupFailure = failureResponse
 	nodebInfo.FailureType = entities.Failure_X2_SETUP_FAILURE
 	return nil
-}
\ No newline at end of file
+}