From db6e3782b706e0f94f71f324623649e36aee8059 Mon Sep 17 00:00:00 2001 From: ns019t Date: Mon, 19 Aug 2019 12:45:35 +0300 Subject: [PATCH] [1890] - E2M: Get all nodes fail after a couple of tries Change-Id: I262c43af3af43f04a9affb8761ca7bf74dfea62d Signed-off-by: ns019t --- E2Manager/controllers/nodeb_controller.go | 4 ++-- E2Manager/services/rnib_reader_service.go | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go index d0448aa..a3286f8 100644 --- a/E2Manager/controllers/nodeb_controller.go +++ b/E2Manager/controllers/nodeb_controller.go @@ -141,7 +141,7 @@ func (rc NodebController) HandleRequest(writer http.ResponseWriter, request *htt func (rc NodebController) GetNodebIdList (writer http.ResponseWriter, request *http.Request, params httprouter.Params) { startTime := time.Now() - rnibReaderService := services.NewRnibReaderService(rc.rnibReaderProvider()) + rnibReaderService := services.NewRnibReaderService(rc.rnibReaderProvider) nodebIdList, rnibError := rnibReaderService.GetNodebIdList() if rnibError != nil { @@ -169,7 +169,7 @@ func (rc NodebController) GetNodeb(writer http.ResponseWriter, request *http.Req startTime := time.Now() ranName := params.ByName("ranName") // WAS: respondingNode, rnibError := reader.GetRNibReader().GetNodeb(ranName) - rnibReaderService := services.NewRnibReaderService(rc.rnibReaderProvider()); + rnibReaderService := services.NewRnibReaderService(rc.rnibReaderProvider); respondingNode, rnibError := rnibReaderService.GetNodeb(ranName) if rnibError != nil { rc.Logger.Errorf("%v", rnibError) diff --git a/E2Manager/services/rnib_reader_service.go b/E2Manager/services/rnib_reader_service.go index 1c310a1..a598243 100644 --- a/E2Manager/services/rnib_reader_service.go +++ b/E2Manager/services/rnib_reader_service.go @@ -24,27 +24,25 @@ import ( ) type RnibReaderService struct { - rnibReaderInstance reader.RNibReader + rnibReaderProvider func() reader.RNibReader } -func NewRnibReaderService(rnibReaderInstance reader.RNibReader) *RnibReaderService{ - return &RnibReaderService{rnibReaderInstance} +func NewRnibReaderService(rnibReaderProvider func() reader.RNibReader) *RnibReaderService{ + return &RnibReaderService{rnibReaderProvider} } - - func (s RnibReaderService) GetNodeb(ranName string) (*entities.NodebInfo, common.IRNibError) { - return s.rnibReaderInstance.GetNodeb(ranName) + return s.rnibReaderProvider().GetNodeb(ranName) } func (s RnibReaderService) GetNodebIdList()(*[]*entities.NbIdentity, common.IRNibError) { - enbIdList, err := s.rnibReaderInstance.GetListEnbIds() + enbIdList, err := s.rnibReaderProvider().GetListEnbIds() if (err != nil) { return nil, err } - gnbIdList, err := s.rnibReaderInstance.GetListGnbIds() + gnbIdList, err := s.rnibReaderProvider().GetListGnbIds() if (err != nil) { return nil, err -- 2.16.6