Code Review
/
ric-plt
/
e2mgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[RICPLT-2165] Add rnibDataService to support retries
[ric-plt/e2mgr.git]
/
E2Manager
/
controllers
/
nodeb_controller.go
diff --git
a/E2Manager/controllers/nodeb_controller.go
b/E2Manager/controllers/nodeb_controller.go
index
cdb76a9
..
28b713e
100644
(file)
--- a/
E2Manager/controllers/nodeb_controller.go
+++ b/
E2Manager/controllers/nodeb_controller.go
@@
-20,12
+20,10
@@
package controllers
import (
"e2mgr/logger"
"e2mgr/models"
import (
"e2mgr/logger"
"e2mgr/models"
- "e2mgr/rNibWriter"
"e2mgr/services"
"e2mgr/utils"
"encoding/json"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
"e2mgr/services"
"e2mgr/utils"
"encoding/json"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
- "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
"github.com/golang/protobuf/jsonpb"
"github.com/gorilla/mux"
"net/http"
"github.com/golang/protobuf/jsonpb"
"github.com/gorilla/mux"
"net/http"
@@
-53,25
+51,22
@@
type INodebController interface {
type NodebController struct {
rmrService *services.RmrService
Logger *logger.Logger
type NodebController struct {
rmrService *services.RmrService
Logger *logger.Logger
- rnibReaderProvider func() reader.RNibReader
- rnibWriterProvider func() rNibWriter.RNibWriter
+ rnibDataService services.RNibDataService
}
}
-func NewNodebController(logger *logger.Logger, rmrService *services.RmrService, rnib
ReaderProvider func() reader.RNibReader, rnibWriterProvider func() rNibWriter.RNibWriter
) *NodebController {
+func NewNodebController(logger *logger.Logger, rmrService *services.RmrService, rnib
DataService services.RNibDataService
) *NodebController {
messageChannel = make(chan *models.E2RequestMessage)
errorChannel = make(chan error)
return &NodebController{
rmrService: rmrService,
Logger: logger,
messageChannel = make(chan *models.E2RequestMessage)
errorChannel = make(chan error)
return &NodebController{
rmrService: rmrService,
Logger: logger,
- rnibReaderProvider: rnibReaderProvider,
- rnibWriterProvider: rnibWriterProvider,
+ rnibDataService: rnibDataService,
}
}
func (rc NodebController) GetNodebIdList (writer http.ResponseWriter, request *http.Request) {
startTime := time.Now()
}
}
func (rc NodebController) GetNodebIdList (writer http.ResponseWriter, request *http.Request) {
startTime := time.Now()
- rnibReaderService := services.NewRnibReaderService(rc.rnibReaderProvider)
- nodebIdList, rnibError := rnibReaderService.GetNodebIdList()
+ nodebIdList, rnibError := rc.rnibDataService.GetListNodebIds()
if rnibError != nil {
rc.Logger.Errorf("%v", rnibError);
if rnibError != nil {
rc.Logger.Errorf("%v", rnibError);
@@
-98,9
+93,7
@@
func (rc NodebController) GetNodeb(writer http.ResponseWriter, request *http.Req
startTime := time.Now()
vars := mux.Vars(request)
ranName := vars["ranName"]
startTime := time.Now()
vars := mux.Vars(request)
ranName := vars["ranName"]
- // WAS: respondingNode, rnibError := reader.GetRNibReader().GetNodeb(ranName)
- rnibReaderService := services.NewRnibReaderService(rc.rnibReaderProvider)
- respondingNode, rnibError := rnibReaderService.GetNodeb(ranName)
+ respondingNode, rnibError := rc.rnibDataService.GetNodeb(ranName)
if rnibError != nil {
rc.Logger.Errorf("%v", rnibError)
httpStatusCode, errorCode, errorMessage := rnibErrorToHttpError(rnibError)
if rnibError != nil {
rc.Logger.Errorf("%v", rnibError)
httpStatusCode, errorCode, errorMessage := rnibErrorToHttpError(rnibError)