From 85f45dfb650d026a83e17fc7a2f1fc5f277e8e5a Mon Sep 17 00:00:00 2001 From: is005q Date: Tue, 10 Sep 2019 18:45:50 +0300 Subject: [PATCH] [RICPLT-1854] Change SetNodeb to PopulateNodebByPdu Change-Id: I22aa320958abdac3ac0acff1c078351c1a25786f Signed-off-by: is005q --- .../handlers/rmrmsghandlers/setup_response_notification_handler.go | 2 +- E2Manager/managers/endc_setup_failure_response_manager.go | 6 +++--- E2Manager/managers/endc_setup_response_manager.go | 6 +++--- E2Manager/managers/i_setup_response_manager.go | 2 +- E2Manager/managers/x2_setup_failure_response_manager.go | 6 +++--- E2Manager/managers/x2_setup_response_manager.go | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go index fc21cc7..3595741 100644 --- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go @@ -60,7 +60,7 @@ func (h SetupResponseNotificationHandler) Handle(logger *logger.Logger, request nodebInfo.ConnectionAttempts = 0 nbIdentity := &entities.NbIdentity{InventoryName: inventoryName} - err := h.setupResponseManager.SetNodeb(logger, nbIdentity, nodebInfo, request.Payload) + err := h.setupResponseManager.PopulateNodebByPdu(logger, nbIdentity, nodebInfo, request.Payload) if err != nil { return diff --git a/E2Manager/managers/endc_setup_failure_response_manager.go b/E2Manager/managers/endc_setup_failure_response_manager.go index 98f500a..012ef96 100644 --- a/E2Manager/managers/endc_setup_failure_response_manager.go +++ b/E2Manager/managers/endc_setup_failure_response_manager.go @@ -13,16 +13,16 @@ func NewEndcSetupFailureResponseManager() *EndcSetupFailureResponseManager { return &EndcSetupFailureResponseManager{} } -func (m *EndcSetupFailureResponseManager) SetNodeb(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error { +func (m *EndcSetupFailureResponseManager) PopulateNodebByPdu(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error { failureResponse, err := converters.UnpackEndcX2SetupFailureResponseAndExtract(logger, e2pdus.MaxAsn1CodecAllocationBufferSize, len(payload), payload, e2pdus.MaxAsn1CodecMessageBufferSize) if err != nil { - logger.Errorf("#EndcSetupFailureResponseManager.SetNodeb - RAN name: %s - Unpack & extract failed. Error: %v", nodebInfo.RanName, err) + logger.Errorf("#EndcSetupFailureResponseManager.PopulateNodebByPdu - RAN name: %s - Unpack and extract failed. Error: %v", nodebInfo.RanName, err) return err } - logger.Infof("#EndcSetupFailureResponseManager.SetNodeb - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) + logger.Infof("#EndcSetupFailureResponseManager.PopulateNodebByPdu - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) nodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED_SETUP_FAILED nodebInfo.SetupFailure = failureResponse diff --git a/E2Manager/managers/endc_setup_response_manager.go b/E2Manager/managers/endc_setup_response_manager.go index 70da301..a88eadb 100644 --- a/E2Manager/managers/endc_setup_response_manager.go +++ b/E2Manager/managers/endc_setup_response_manager.go @@ -13,16 +13,16 @@ func NewEndcSetupResponseManager() *EndcSetupResponseManager { return &EndcSetupResponseManager{} } -func (m *EndcSetupResponseManager) SetNodeb(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error { +func (m *EndcSetupResponseManager) PopulateNodebByPdu(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error { gnbId, gnb, err := converters.UnpackEndcX2SetupResponseAndExtract(logger, e2pdus.MaxAsn1CodecAllocationBufferSize, len(payload), payload, e2pdus.MaxAsn1CodecMessageBufferSize) if err != nil { - logger.Errorf("#EndcSetupResponseManager.SetNodeb - RAN name: %s - Unpack & extract failed. Error: %v", nodebInfo.RanName, err) + logger.Errorf("#EndcSetupResponseManager.PopulateNodebByPdu - RAN name: %s - Unpack and extract failed. Error: %v", nodebInfo.RanName, err) return err } - logger.Infof("#EndcSetupResponseManager.SetNodeb - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) + logger.Infof("#EndcSetupResponseManager.PopulateNodebByPdu - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) nbIdentity.GlobalNbId = gnbId nodebInfo.GlobalNbId = gnbId diff --git a/E2Manager/managers/i_setup_response_manager.go b/E2Manager/managers/i_setup_response_manager.go index 665c584..8c69f82 100644 --- a/E2Manager/managers/i_setup_response_manager.go +++ b/E2Manager/managers/i_setup_response_manager.go @@ -6,5 +6,5 @@ import ( ) type ISetupResponseManager interface { - SetNodeb(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error + PopulateNodebByPdu(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error } diff --git a/E2Manager/managers/x2_setup_failure_response_manager.go b/E2Manager/managers/x2_setup_failure_response_manager.go index dc03eaa..7b9d7d6 100644 --- a/E2Manager/managers/x2_setup_failure_response_manager.go +++ b/E2Manager/managers/x2_setup_failure_response_manager.go @@ -13,16 +13,16 @@ func NewX2SetupFailureResponseManager() *X2SetupFailureResponseManager { return &X2SetupFailureResponseManager{} } -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) if err != nil { - logger.Errorf("#X2SetupFailureResponseManager.SetNodeb - RAN name: %s - Unpack & extract failed. Error: %v", nodebInfo.RanName, err) + logger.Errorf("#X2SetupFailureResponseManager.PopulateNodebByPdu - RAN name: %s - Unpack and extract failed. Error: %v", nodebInfo.RanName, err) return err } - logger.Infof("#X2SetupFailureResponseManager.SetNodeb - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) + logger.Infof("#X2SetupFailureResponseManager.PopulateNodebByPdu - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) nodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED_SETUP_FAILED nodebInfo.SetupFailure = failureResponse diff --git a/E2Manager/managers/x2_setup_response_manager.go b/E2Manager/managers/x2_setup_response_manager.go index 948ec11..4c68b19 100644 --- a/E2Manager/managers/x2_setup_response_manager.go +++ b/E2Manager/managers/x2_setup_response_manager.go @@ -13,16 +13,16 @@ func NewX2SetupResponseManager() *X2SetupResponseManager { return &X2SetupResponseManager{} } -func (m *X2SetupResponseManager) SetNodeb(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error { +func (m *X2SetupResponseManager) PopulateNodebByPdu(logger *logger.Logger, nbIdentity *entities.NbIdentity, nodebInfo *entities.NodebInfo, payload []byte) error { enbId, enb, err := converters.UnpackX2SetupResponseAndExtract(logger, e2pdus.MaxAsn1CodecAllocationBufferSize, len(payload), payload, e2pdus.MaxAsn1CodecMessageBufferSize) if err != nil { - logger.Errorf("#X2SetupResponseManager.SetNodeb - RAN name: %s - Unpack & extract failed. Error: %v", nodebInfo.RanName, err) + logger.Errorf("#X2SetupResponseManager.PopulateNodebByPdu - RAN name: %s - Unpack and extract failed. %v", nodebInfo.RanName, err) return err } - logger.Infof("#X2SetupResponseManager.SetNodeb - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) + logger.Infof("#X2SetupResponseManager.PopulateNodebByPdu - RAN name: %s - Unpacked payload and extracted protobuf successfully", nodebInfo.RanName) nbIdentity.GlobalNbId = enbId nodebInfo.GlobalNbId = enbId -- 2.16.6