"e2mgr/logger"
"e2mgr/managers"
"e2mgr/models"
- "e2mgr/rNibWriter"
"e2mgr/rnibBuilders"
+ "e2mgr/services"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
- "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
"github.com/go-ozzo/ozzo-validation"
"github.com/go-ozzo/ozzo-validation/is"
)
)
type SetupRequestHandler struct {
- readerProvider func() reader.RNibReader
- writerProvider func() rNibWriter.RNibWriter
+ rNibDataService services.RNibDataService
logger *logger.Logger
ranSetupManager *managers.RanSetupManager
protocol entities.E2ApplicationProtocol
}
-func NewSetupRequestHandler(logger *logger.Logger, writerProvider func() rNibWriter.RNibWriter, readerProvider func() reader.RNibReader,
+func NewSetupRequestHandler(logger *logger.Logger, rNibDataService services.RNibDataService,
ranSetupManager *managers.RanSetupManager, protocol entities.E2ApplicationProtocol) *SetupRequestHandler {
return &SetupRequestHandler{
logger: logger,
- readerProvider: readerProvider,
- writerProvider: writerProvider,
+ rNibDataService: rNibDataService,
ranSetupManager: ranSetupManager,
protocol: protocol,
}
}
-func (handler *SetupRequestHandler) Handle(request models.Request) error {
+func (handler *SetupRequestHandler) Handle(request models.Request) (models.IResponse, error) {
setupRequest := request.(models.SetupRequest)
err := handler.validateRequestDetails(setupRequest)
if err != nil {
- return err
+ return nil, err
}
- nodebInfo, err := handler.readerProvider().GetNodeb(setupRequest.RanName)
+ nodebInfo, err := handler.rNibDataService.GetNodeb(setupRequest.RanName)
if err != nil {
_, ok := err.(*common.ResourceNotFoundError)
if !ok {
handler.logger.Errorf("#SetupRequestHandler.Handle - failed to get nodeB entity for ran name: %v from RNIB. Error: %s",
setupRequest.RanName, err.Error())
- return e2managererrors.NewRnibDbError()
+ return nil, e2managererrors.NewRnibDbError()
}
result := handler.connectNewRan(&setupRequest, handler.protocol)
- return result
+ return nil, result
}
result := handler.connectExistingRan(nodebInfo)
- return result
+ return nil, result
}
func (handler *SetupRequestHandler) connectExistingRan(nodebInfo *entities.NodebInfo) error {
nodebInfo, nodebIdentity := rnibBuilders.CreateInitialNodeInfo(request, protocol)
- rNibErr := handler.writerProvider().SaveNodeb(nodebIdentity, nodebInfo)
+ rNibErr := handler.rNibDataService.SaveNodeb(nodebIdentity, nodebInfo)
if rNibErr != nil {
handler.logger.Errorf("#SetupRequestHandler.connectNewRan - failed to initial nodeb entity for ran name: %v in RNIB. Error: %s", request.RanName, rNibErr.Error())
return e2managererrors.NewRnibDbError()